Merge "Merge changes I4d34ed4b,Iddfbdf5c into nyc-dev am: 17bc1fd090 am: a24c96986a am: 1d25f5f2ca" (7e440b4a) · Commits · e / os / android_frameworks_base

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

+1 −0

Original line number	Diff line number	Diff line
		@@ -974,6 +974,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
		inflateEmptyShadeView();
		updateEmptyShadeView();
		inflateOverflowContainer();
		mStatusBarKeyguardViewManager.onDensityOrFontScaleChanged();
		}

		private void inflateSignalClusters() {

+9 −1

Original line number	Diff line number	Diff line
		@@ -91,6 +91,7 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener,
		private boolean mSkipFirstFrame;
		private boolean mDontAnimateBouncerChanges;
		private boolean mKeyguardFadingOutInProgress;
		private ValueAnimator mKeyguardFadeoutAnimation;

		public ScrimController(ScrimView scrimBehind, ScrimView scrimInFront, View headsUpScrim) {
		mScrimBehind = scrimBehind;
		@@ -135,6 +136,9 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener,
		if (mPinnedHeadsUpCount != 0) {
		updateHeadsUpScrim(false);
		}
		if (mKeyguardFadeoutAnimation != null) {
		mKeyguardFadeoutAnimation.cancel();
		}
		}
		}

		@@ -345,7 +349,10 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener,
		mOnAnimationFinished.run();
		mOnAnimationFinished = null;
		}
		if (mKeyguardFadingOutInProgress) {
		mKeyguardFadeoutAnimation = null;
		mKeyguardFadingOutInProgress = false;
		}
		scrim.setTag(TAG_KEY_ANIM, null);
		scrim.setTag(TAG_KEY_ANIM_TARGET, null);
		}
		@@ -353,6 +360,7 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener,
		anim.start();
		if (mAnimateKeyguardFadingOut) {
		mKeyguardFadingOutInProgress = true;
		mKeyguardFadeoutAnimation = anim;
		}
		if (mSkipFirstFrame) {
		anim.setCurrentPlayTime(16);

+4 −0

Original line number	Diff line number	Diff line
		@@ -352,6 +352,10 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb
		}
		}

		public void onDensityOrFontScaleChanged() {
		mBouncer.hide(true /* destroyView */);
		}

		private void animateScrimControllerKeyguardFadingOut(long delay, long duration,
		boolean skipFirstFrame) {
		animateScrimControllerKeyguardFadingOut(delay, duration, null /* endRunnable */,