Merge "Using the keyguard fading away duration for the scrim" into qt-r1-dev (c28d6232) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/SystemUIFactory.java

+3 −2

Original line number	Diff line number	Diff line
		@@ -66,6 +66,7 @@ import com.android.systemui.statusbar.phone.StatusBar;
		import com.android.systemui.statusbar.phone.StatusBarKeyguardViewManager;
		import com.android.systemui.statusbar.phone.UnlockMethodCache;
		import com.android.systemui.statusbar.policy.DeviceProvisionedController;
		import com.android.systemui.statusbar.policy.KeyguardMonitor;
		import com.android.systemui.util.AsyncSensorManager;
		import com.android.systemui.util.InjectionInflationController;
		import com.android.systemui.util.leak.GarbageMonitor;
		@@ -144,9 +145,9 @@ public class SystemUIFactory {
		LockscreenWallpaper lockscreenWallpaper,
		TriConsumer<ScrimState, Float, GradientColors> scrimStateListener,
		Consumer<Integer> scrimVisibleListener, DozeParameters dozeParameters,
		AlarmManager alarmManager) {
		AlarmManager alarmManager, KeyguardMonitor keyguardMonitor) {
		return new ScrimController(scrimBehind, scrimInFront, scrimStateListener,
		scrimVisibleListener, dozeParameters, alarmManager);
		scrimVisibleListener, dozeParameters, alarmManager, keyguardMonitor);
		}

		public NotificationIconAreaController createNotificationIconAreaController(Context context,

packages/SystemUI/src/com/android/systemui/qs/customize/QSCustomizer.java

+7 −4

Original line number	Diff line number	Diff line
		@@ -296,11 +296,14 @@ public class QSCustomizer extends LinearLayout implements OnMenuItemClickListene
		mY = y - containerLocation[1];
		}

		private final Callback mKeyguardCallback = () -> {
		private final Callback mKeyguardCallback = new Callback() {
		@Override
		public void onKeyguardShowingChanged() {
		if (!isAttachedToWindow()) return;
		if (Dependency.get(KeyguardMonitor.class).isShowing() && !mOpening) {
		hide();
		}
		}
		};

		private final AnimatorListener mExpandAnimationListener = new AnimatorListenerAdapter() {

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

+11 −3

Original line number	Diff line number	Diff line
		@@ -47,6 +47,7 @@ import com.android.systemui.R;
		import com.android.systemui.colorextraction.SysuiColorExtractor;
		import com.android.systemui.statusbar.ScrimView;
		import com.android.systemui.statusbar.notification.stack.ViewState;
		import com.android.systemui.statusbar.policy.KeyguardMonitor;
		import com.android.systemui.util.AlarmTimeout;
		import com.android.systemui.util.wakelock.DelayedWakeLock;
		import com.android.systemui.util.wakelock.WakeLock;
		@@ -177,7 +178,7 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, OnCo
		public ScrimController(ScrimView scrimBehind, ScrimView scrimInFront,
		TriConsumer<ScrimState, Float, GradientColors> scrimStateListener,
		Consumer<Integer> scrimVisibleListener, DozeParameters dozeParameters,
		AlarmManager alarmManager) {
		AlarmManager alarmManager, KeyguardMonitor keyguardMonitor) {
		mScrimBehind = scrimBehind;
		mScrimInFront = scrimInFront;
		mScrimStateListener = scrimStateListener;
		@@ -197,6 +198,13 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, OnCo
		// to make sure that text on top of it is legible.
		mScrimBehindAlpha = mScrimBehindAlphaResValue;
		mDozeParameters = dozeParameters;
		keyguardMonitor.addCallback(new KeyguardMonitor.Callback() {
		@Override
		public void onKeyguardFadingAwayChanged() {
		setKeyguardFadingAway(keyguardMonitor.isKeyguardFadingAway(),
		keyguardMonitor.getKeyguardFadingAwayDuration());
		}
		});

		mColorExtractor = Dependency.get(SysuiColorExtractor.class);
		mColorExtractor.addOnColorsChangedListener(this);
		@@ -948,9 +956,9 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, OnCo
		}
		}

		public void setUnlockIsFading(boolean unlockFading) {
		private void setKeyguardFadingAway(boolean fadingAway, long duration) {
		for (ScrimState state : ScrimState.values()) {
		state.setUnlockIsFading(unlockFading);
		state.setKeyguardFadingAway(fadingAway, duration);
		}
		}

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

+7 −5

Original line number	Diff line number	Diff line
		@@ -156,8 +156,8 @@ public enum ScrimState {
		public void prepare(ScrimState previousState) {
		mCurrentBehindAlpha = 0;
		mCurrentInFrontAlpha = 0;
		mAnimationDuration = mUnlockIsFading
		? KeyguardBypassController.BYPASS_PANEL_FADE_DURATION
		mAnimationDuration = mKeyguardFadingAway
		? mKeyguardFadingAwayDuration
		: StatusBar.FADE_KEYGUARD_DURATION;
		mAnimateChange = !mLaunchingAffordanceWithPreview;

		@@ -209,7 +209,8 @@ public enum ScrimState {
		boolean mHasBackdrop;
		boolean mLaunchingAffordanceWithPreview;
		boolean mWakeLockScreenSensorActive;
		boolean mUnlockIsFading;
		boolean mKeyguardFadingAway;
		long mKeyguardFadingAwayDuration;

		ScrimState(int index) {
		mIndex = index;
		@@ -298,7 +299,8 @@ public enum ScrimState {
		mWakeLockScreenSensorActive = active;
		}

		public void setUnlockIsFading(boolean unlockIsFading) {
		mUnlockIsFading = unlockIsFading;
		public void setKeyguardFadingAway(boolean fadingAway, long duration) {
		mKeyguardFadingAway = fadingAway;
		mKeyguardFadingAwayDuration = duration;
		}
		}
		No newline at end of file

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -938,7 +938,8 @@ public class StatusBar extends SystemUI implements DemoMode,
		mStatusBarWindow.onScrimVisibilityChanged(scrimsVisible);
		}
		}, DozeParameters.getInstance(mContext),
		mContext.getSystemService(AlarmManager.class));
		mContext.getSystemService(AlarmManager.class),
		mKeyguardMonitor);
		mNotificationPanel.initDependencies(this, mGroupManager, mNotificationShelf,
		mHeadsUpManager, mNotificationIconAreaController, mScrimController);
		mDozeScrimController = new DozeScrimController(DozeParameters.getInstance(context));
		@@ -3864,7 +3865,6 @@ public class StatusBar extends SystemUI implements DemoMode,

		public void notifyBiometricAuthModeChanged() {
		updateDozing();
		mScrimController.setUnlockIsFading(mBiometricUnlockController.isUnlockFading());
		updateScrimController();
		mStatusBarWindow.onBiometricAuthModeChanged(mBiometricUnlockController.isWakeAndUnlock(),
		mBiometricUnlockController.isBiometricUnlock());