am 3590a45e: am c3056190: Prevent LIGHTS_OUT_TRANSPARENT in vertical nav bar

* commit '3590a45ed2891ed0c9aa5d1d92be80774b43c5c7':
  Prevent LIGHTS_OUT_TRANSPARENT in vertical nav bar
This commit is contained in:
Adrian Roos
2014-12-02 13:06:03 +00:00
committed by Android Git Automerger

View File

@@ -60,9 +60,13 @@ public final class NavigationBarTransitions extends BarTransitions {
@Override @Override
public void transitionTo(int mode, boolean animate) { public void transitionTo(int mode, boolean animate) {
mRequestedMode = mode; mRequestedMode = mode;
if (mVertical && (mode == MODE_TRANSLUCENT || mode == MODE_TRANSPARENT)) { if (mVertical) {
// translucent mode not allowed when vertical // 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); super.transitionTo(mode, animate);
} }