Merge "Only calling finishedwhen all the animations have finished" into qt-qpr1-dev (258f5267) · Commits · e / os / android_frameworks_base

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

+18 −0

Original line number	Diff line number	Diff line
		@@ -754,6 +754,16 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, OnCo
		}

		private void onFinished(Callback callback) {
		if (!hasReachedFinalState(mScrimBehind)
		\|\| !hasReachedFinalState(mScrimInFront)
		\|\| !hasReachedFinalState(mScrimForBubble)) {
		if (callback != null && callback != mCallback) {
		// Since we only notify the callback that we're finished once everything has
		// finished, we need to make sure that any changing callbacks are also invoked
		callback.onFinished();
		}
		return;
		}
		if (mWakeLockHeld) {
		mWakeLock.release(TAG);
		mWakeLockHeld = false;
		@@ -773,7 +783,15 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, OnCo
		mInFrontTint = Color.TRANSPARENT;
		mBehindTint = Color.TRANSPARENT;
		mBubbleTint = Color.TRANSPARENT;
		updateScrimColor(mScrimInFront, mInFrontAlpha, mInFrontTint);
		updateScrimColor(mScrimBehind, mBehindAlpha, mBehindTint);
		updateScrimColor(mScrimForBubble, mBubbleAlpha, mBubbleTint);
		}
		}

		private boolean hasReachedFinalState(ScrimView scrim) {
		return scrim.getViewAlpha() == getCurrentScrimAlpha(scrim)
		&& scrim.getTint() == getCurrentScrimTint(scrim);
		}

		private boolean isAnimating(View scrim) {

+1 −0

Original line number	Diff line number	Diff line
		@@ -431,6 +431,7 @@ public class ScrimControllerTest extends SysuiTestCase {
		TRANSPARENT /* behind */,
		TRANSPARENT /* bubble */);

		// Make sure at the very end of the animation, we're reset to transparent
		assertScrimTint(false /* front */,
		false /* behind */,
		false /* bubble */);