Merge "Don't disable animations until screen state is known." into klp-dev (f95c9aa7) · Commits · e / os / android_frameworks_base

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

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -327,7 +327,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode {
	private boolean mAutohideSuspended;		private boolean mAutohideSuspended;
	private int mStatusBarMode;		private int mStatusBarMode;
	private int mNavigationBarMode;		private int mNavigationBarMode;
	private boolean mScreenOn;		private Boolean mScreenOn;

	private final Runnable mAutohide = new Runnable() {		private final Runnable mAutohide = new Runnable() {
	@Override		@Override
	@@ -1925,8 +1925,8 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode {
	private void checkBarMode(int mode, int windowState, BarTransitions transitions) {		private void checkBarMode(int mode, int windowState, BarTransitions transitions) {
	final boolean imeVisible = (mNavigationIconHints & NAVIGATION_HINT_BACK_ALT) != 0;		final boolean imeVisible = (mNavigationIconHints & NAVIGATION_HINT_BACK_ALT) != 0;
	final int finalMode = imeVisible ? MODE_OPAQUE : mode;		final int finalMode = imeVisible ? MODE_OPAQUE : mode;
	final boolean animate = mScreenOn && windowState != WINDOW_STATE_HIDDEN;		final boolean anim = (mScreenOn == null \|\| mScreenOn) && windowState != WINDOW_STATE_HIDDEN;
	transitions.transitionTo(finalMode, animate);		transitions.transitionTo(finalMode, anim);
	}		}

	private final Runnable mCheckBarModes = new Runnable() {		private final Runnable mCheckBarModes = new Runnable() {