Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Only animate clock weight if doze is animating" into sc-dev

Browse Source
This commit is contained in:
Beverly Tai
2021-03-12 14:10:35 +00:00
committed by Android (Google) Code Review
parent 92bff6ee07 aadf7bafc5
commit df3a54e1ca
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
packages/SystemUI/src/com/android/keyguard/AnimatableClockController.java
View File

@@ -45,6 +45,7 @@ public class AnimatableClockController extends ViewController<AnimatableClockVie
private int mLockScreenColor;
private boolean mIsDozing;
private float mDozeAmount;
private Locale mLocale;
private final NumberFormat mBurmeseNf = NumberFormat.getInstance(Locale.forLanguageTag("my"));
@@ -59,6 +60,7 @@ public class AnimatableClockController extends ViewController<AnimatableClockVie
super(view);
mStatusBarStateController = statusBarStateController;
mIsDozing = mStatusBarStateController.isDozing();
mDozeAmount = mStatusBarStateController.getDozeAmount();
mBroadcastDispatcher = broadcastDispatcher;
mBurmeseNumerals = mBurmeseNf.format(FORMAT_NUMBER);
@@ -82,6 +84,7 @@ public class AnimatableClockController extends ViewController<AnimatableClockVie
new IntentFilter(Intent.ACTION_LOCALE_CHANGED));
mStatusBarStateController.addCallback(mStatusBarStateListener);
mIsDozing = mStatusBarStateController.isDozing();
mDozeAmount = mStatusBarStateController.getDozeAmount();
refreshTime();
initColors();
}
@@ -136,9 +139,15 @@ public class AnimatableClockController extends ViewController<AnimatableClockVie
private final StatusBarStateController.StateListener mStatusBarStateListener =
new StatusBarStateController.StateListener() {
@Override
public void onDozingChanged(boolean isDozing) {
mIsDozing = isDozing;
mView.animateDoze(mIsDozing, true);
public void onDozeAmountChanged(float linear, float eased) {
boolean noAnimation = (mDozeAmount == 0f && linear == 1f)
|| (mDozeAmount == 1f && linear == 0f);
boolean isDozing = linear > mDozeAmount;
mDozeAmount = linear;
if (mIsDozing != isDozing) {
mIsDozing = isDozing;
mView.animateDoze(mIsDozing, !noAnimation);
}
}
};
}