Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d402c0f3 authored by John Spurlock's avatar John Spurlock Committed by Android Git Automerger
Browse files

am f95c9aa7: Merge "Don\'t disable animations until screen state is known." into klp-dev 

* commit 'f95c9aa7':
  Don't disable animations until screen state is known.
parents 035541a1 f95c9aa7

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

+3 −3
Original line number Diff line number Diff line
@@ -327,7 +327,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode { 
    private boolean mAutohideSuspended;

    private int mStatusBarMode;

    private int mNavigationBarMode;

    private boolean mScreenOn;

    private Boolean mScreenOn;



    private final Runnable mAutohide = new Runnable() {

        @Override
@@ -1925,8 +1925,8 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode { 
    private void checkBarMode(int mode, int windowState, BarTransitions transitions) {

        final boolean imeVisible = (mNavigationIconHints & NAVIGATION_HINT_BACK_ALT) != 0;

        final int finalMode = imeVisible ? MODE_OPAQUE : mode;

        final boolean animate = mScreenOn && windowState != WINDOW_STATE_HIDDEN;

        transitions.transitionTo(finalMode, animate);

        final boolean anim = (mScreenOn == null || mScreenOn) && windowState != WINDOW_STATE_HIDDEN;

        transitions.transitionTo(finalMode, anim);

    }



    private final Runnable mCheckBarModes = new Runnable() {