From c3056190ae1a6d29ce5943d45ab4711e1e49620c Mon Sep 17 00:00:00 2001 From: Adrian Roos Date: Thu, 27 Nov 2014 16:25:34 +0100 Subject: [PATCH] Prevent LIGHTS_OUT_TRANSPARENT in vertical nav bar Bug: 18518939 Bug: 17691219 Change-Id: I90b9afbbb1a550b5328a581b4fb6aadfa3ff2559 --- .../statusbar/phone/NavigationBarTransitions.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarTransitions.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarTransitions.java index 15f6dc2b9c15a..7ec84da3e6c1f 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarTransitions.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarTransitions.java @@ -60,9 +60,13 @@ public final class NavigationBarTransitions extends BarTransitions { @Override public void transitionTo(int mode, boolean animate) { mRequestedMode = mode; - if (mVertical && (mode == MODE_TRANSLUCENT || mode == MODE_TRANSPARENT)) { + if (mVertical) { // translucent mode not allowed when vertical - mode = MODE_OPAQUE; + if (mode == MODE_TRANSLUCENT || mode == MODE_TRANSPARENT) { + mode = MODE_OPAQUE; + } else if (mode == MODE_LIGHTS_OUT_TRANSPARENT) { + mode = MODE_LIGHTS_OUT; + } } super.transitionTo(mode, animate); }