diff options
author | Beverly <beverlyt@google.com> | 2021-04-28 13:29:36 -0400 |
---|---|---|
committer | Beverly <beverlyt@google.com> | 2021-04-28 14:31:27 -0400 |
commit | c8410aa9c2c765c7b8866bf376397e28e7581e33 (patch) | |
tree | 60131fd66469190f9d75d0015a4da739433e7e4f /packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitchController.java | |
parent | 5f82e987a3de4f13fd3619d17fab7dba035d9ad8 (diff) |
Animate clock weight to 0 on bypass face auth
Test: manual
Fixes: 186631254
Change-Id: Ib9ceb4c23c06717404845535ee86987d7f43686f
Diffstat (limited to 'packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitchController.java')
-rw-r--r-- | packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitchController.java | 34 |
1 files changed, 22 insertions, 12 deletions
diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitchController.java b/packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitchController.java index 5559a1818b4b..5b835516625b 100644 --- a/packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitchController.java +++ b/packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitchController.java @@ -51,6 +51,7 @@ import com.android.systemui.statusbar.FeatureFlags; import com.android.systemui.statusbar.notification.AnimatableProperty; import com.android.systemui.statusbar.notification.PropertyAnimator; import com.android.systemui.statusbar.notification.stack.AnimationProperties; +import com.android.systemui.statusbar.phone.KeyguardBypassController; import com.android.systemui.statusbar.phone.NotificationIconAreaController; import com.android.systemui.statusbar.phone.NotificationIconContainer; import com.android.systemui.statusbar.policy.BatteryController; @@ -90,10 +91,11 @@ public class KeyguardClockSwitchController extends ViewController<KeyguardClockS private SmartspaceSession mSmartspaceSession; private SmartspaceSession.OnTargetsAvailableListener mSmartspaceCallback; - private int mWallpaperTextColor; private ConfigurationController mConfigurationController; private ActivityStarter mActivityStarter; private FalsingManager mFalsingManager; + private final KeyguardUpdateMonitor mKeyguardUpdateMonitor; + private final KeyguardBypassController mBypassController; /** * Listener for changes to the color palette. @@ -147,7 +149,9 @@ public class KeyguardClockSwitchController extends ViewController<KeyguardClockS ConfigurationController configurationController, SystemUIFactory systemUIFactory, ActivityStarter activityStarter, - FalsingManager falsingManager) { + FalsingManager falsingManager, + KeyguardUpdateMonitor keyguardUpdateMonitor, + KeyguardBypassController bypassController) { super(keyguardClockSwitch); mStatusBarStateController = statusBarStateController; mColorExtractor = colorExtractor; @@ -162,6 +166,8 @@ public class KeyguardClockSwitchController extends ViewController<KeyguardClockS mSystemUIFactory = systemUIFactory; mActivityStarter = activityStarter; mFalsingManager = falsingManager; + mKeyguardUpdateMonitor = keyguardUpdateMonitor; + mBypassController = bypassController; } /** @@ -185,19 +191,23 @@ public class KeyguardClockSwitchController extends ViewController<KeyguardClockS mLargeClockFrame = mView.findViewById(R.id.lockscreen_clock_view_large); mClockViewController = - new AnimatableClockController( - mView.findViewById(R.id.animatable_clock_view), - mStatusBarStateController, - mBroadcastDispatcher, - mBatteryController); + new AnimatableClockController( + mView.findViewById(R.id.animatable_clock_view), + mStatusBarStateController, + mBroadcastDispatcher, + mBatteryController, + mKeyguardUpdateMonitor, + mBypassController); mClockViewController.init(); mLargeClockViewController = - new AnimatableClockController( - mView.findViewById(R.id.animatable_clock_view_large), - mStatusBarStateController, - mBroadcastDispatcher, - mBatteryController); + new AnimatableClockController( + mView.findViewById(R.id.animatable_clock_view_large), + mStatusBarStateController, + mBroadcastDispatcher, + mBatteryController, + mKeyguardUpdateMonitor, + mBypassController); mLargeClockViewController.init(); mStatusBarStateController.addCallback(mStatusBarStateListener); |