commit c3056190ae1a6d29ce5943d45ab4711e1e49620c
author Adrian Roos <roosa@google.com> Thu Nov 27 16:25:34 2014 +0100
committer Adrian Roos <roosa@google.com> Tue Dec 02 12:52:07 2014 +0000
tree a256a15fe533bc022bd86c94695cb68ff649f612
parent 8f52135f2c555ae0a13393b60ed0552ee9e149da

Prevent LIGHTS_OUT_TRANSPARENT in vertical nav bar

Bug: 18518939
Bug: 17691219
Change-Id: I90b9afbbb1a550b5328a581b4fb6aadfa3ff2559

packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarTransitions.java

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 15f6dc2..7ec84da 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 @@
     @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);
     }