From fe836fabd9c6d3a3a7aaa51db7bb9bd6c9239833 Mon Sep 17 00:00:00 2001 From: Adrian Roos Date: Tue, 11 Aug 2015 17:36:43 -0700 Subject: Prevent overlap of color views in landscape Removes overlap from the color views which resulted in subotimal looks when both color views were translucent and the nav bar was on the right edge. Also fixes a bug introduced in I2df7092a91eceeb815367ef917dd7289f4f2b27e where the navigation-bar-on-right-side case got forgotten and caused flickering in landscape when IMMERSIVE_STICKY was set but the navigation bar was visible. Bug: 22876533 Change-Id: I449a82eb3dc3f7b5051f26b37b362a196b4ff63a --- services/core/java/com/android/server/policy/PhoneWindowManager.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'services') diff --git a/services/core/java/com/android/server/policy/PhoneWindowManager.java b/services/core/java/com/android/server/policy/PhoneWindowManager.java index c4ff277..2a79a47 100644 --- a/services/core/java/com/android/server/policy/PhoneWindowManager.java +++ b/services/core/java/com/android/server/policy/PhoneWindowManager.java @@ -3617,7 +3617,8 @@ public class PhoneWindowManager implements WindowManagerPolicy { // We currently want to hide the navigation UI. mNavigationBarController.setBarShowingLw(false); } - if (navVisible && !navTranslucent && !mNavigationBar.isAnimatingLw() + if (navVisible && !navTranslucent && !navAllowedHidden + && !mNavigationBar.isAnimatingLw() && !mNavigationBarController.wasRecentlyTranslucent()) { // If the nav bar is currently requested to be visible, // and not in the process of animating on or off, then -- cgit v1.1