Merge "Fix issue with transition cancelling" (f7469993) · Commits · e / os / android_frameworks_base

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

+4 −4

Original line number	Diff line number	Diff line
		@@ -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;
		}

+1 −2

Original line number	Diff line number	Diff line
		@@ -661,8 +661,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();
		}
		};