Merge SP1A.210709.002

Change-Id: I4610885d5d770d858895057cdd9fea387a5e33dd

1 files changed, 4 insertions, 1 deletions

diff --git a/packages/SystemUI/src/com/android/keyguard/AnimatableClockController.java b/packages/SystemUI/src/com/android/keyguard/AnimatableClockController.java
index 08076c17dc3a..fcf4e4703ed3 100644
--- a/packages/SystemUI/src/com/android/keyguard/AnimatableClockController.java
+++ b/packages/SystemUI/src/com/android/keyguard/AnimatableClockController.java
@@ -94,7 +94,9 @@ public class AnimatableClockController extends ViewController<AnimatableClockVie
         @Override
         public void onBatteryLevelChanged(int level, boolean pluggedIn, boolean charging) {
             if (mKeyguardShowing && !mIsCharging && charging) {
-                mView.animateCharge(mIsDozing);
+                mView.animateCharge(() -> {
+                    return mStatusBarStateController.isDozing();
+                });
             }
             mIsCharging = charging;
         }
@@ -210,6 +212,7 @@ public class AnimatableClockController extends ViewController<AnimatableClockVie
             } else {
                 mView.setLineSpacingScale(mDefaultLineSpacing);
             }
+            mView.refreshFormat();
         }
     }