From 69dfda5ef5eba65df20cbe979d0bfa912bd4aaa6 Mon Sep 17 00:00:00 2001 From: Yordan Banev Date: Mon, 9 Sep 2019 21:28:25 +0300 Subject: [PATCH] fix(android): up button flickering when clicked in NavigationWindow (#11003) The Up button disappears before the Window is actually closed when this is done in a NavigationWindow's Windows stack. Fixes TIMOB-27190 --- .../modules/ui/src/java/ti/modules/titanium/ui/WindowProxy.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/modules/ui/src/java/ti/modules/titanium/ui/WindowProxy.java b/android/modules/ui/src/java/ti/modules/titanium/ui/WindowProxy.java index 6d9cb25f2a8..cce70fd9c28 100644 --- a/android/modules/ui/src/java/ti/modules/titanium/ui/WindowProxy.java +++ b/android/modules/ui/src/java/ti/modules/titanium/ui/WindowProxy.java @@ -311,7 +311,7 @@ public void windowCreated(TiBaseActivity activity, Bundle savedInstanceState) // Get a reference to the root window in the NavigationWindow. WindowProxy rootWindowProxy = ((NavigationWindowProxy) this.getNavigationWindow()).getRootWindowProxy(); // If the root window matches this window do not show the Up navigation button. - activity.getSupportActionBar().setDisplayHomeAsUpEnabled(rootWindowProxy != this); + activityProxy.getActionBar().setDisplayHomeAsUp(rootWindowProxy != this); } // Handle barColor property.