diff options
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java | 8 | ||||
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java | 3 |
2 files changed, 5 insertions, 6 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java index 3a36776304f2..05fcbb0a11b6 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java @@ -204,12 +204,15 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, throw new IllegalArgumentException("Cannot change to UNINITIALIZED."); } + final ScrimState oldState = mState; + mState = state; + if (mCallback != null) { mCallback.onCancelled(); } mCallback = callback; - state.prepare(mState); + state.prepare(oldState); mScreenBlankingCallbackCalled = false; mAnimationDelay = 0; mBlankScreen = state.getBlanksScreen(); @@ -228,8 +231,6 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, mKeyguardFadeoutAnimation.cancel(); } - mState = state; - // Do not let the device sleep until we're done with all animations if (!mWakeLockHeld) { if (mWakeLock != null) { @@ -310,7 +311,6 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, mCurrentInFrontAlpha = 0; } } else { - Log.w(TAG, "Invalid state, cannot set panel expansion when: " + mState); return; } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java index c96742368715..271950b121ac 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java @@ -659,8 +659,7 @@ public class StatusBar extends SystemUI implements DemoMode, @Override public void onCancelled() { - // Transition was cancelled because another one took over. - // Nothing to do in here but wait. + onFinished(); } }; |