diff options
| author | 2018-06-06 15:24:17 -0700 | |
|---|---|---|
| committer | 2018-06-06 15:24:17 -0700 | |
| commit | 0d6753d1ed8c44064d3110c910e2e0155621123e (patch) | |
| tree | a73040a11fb19a3fa5295aeb0c2638d1031de0ef | |
| parent | 34878a27d7aceda82de52ef8cf463f2a1674ae93 (diff) | |
| parent | a1cb9733665fe2565be70dd3a1e35f1e95cc04d5 (diff) | |
Merge "Always cancel clock animation" into pi-dev
am: a1cb973366
Change-Id: I20406102b51c0dcbbd4a1fc122b89f98e2412607
| -rw-r--r-- | packages/SystemUI/src/com/android/keyguard/KeyguardSliceView.java | 2 | ||||
| -rw-r--r-- | packages/SystemUI/src/com/android/keyguard/KeyguardStatusView.java | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardSliceView.java b/packages/SystemUI/src/com/android/keyguard/KeyguardSliceView.java index bb05caa0739c..67bdd216b13b 100644 --- a/packages/SystemUI/src/com/android/keyguard/KeyguardSliceView.java +++ b/packages/SystemUI/src/com/android/keyguard/KeyguardSliceView.java @@ -328,7 +328,7 @@ public class KeyguardSliceView extends LinearLayout implements View.OnClickListe } public boolean hasHeader() { - return mTitle.getVisibility() == VISIBLE; + return mHasHeader; } /** diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardStatusView.java b/packages/SystemUI/src/com/android/keyguard/KeyguardStatusView.java index 976b45424502..49dba6833a3a 100644 --- a/packages/SystemUI/src/com/android/keyguard/KeyguardStatusView.java +++ b/packages/SystemUI/src/com/android/keyguard/KeyguardStatusView.java @@ -231,9 +231,9 @@ public class KeyguardStatusView extends GridLayout implements if (view == mClockView) { float clockScale = smallClock ? mSmallClockScale : 1; Paint.Style style = smallClock ? Paint.Style.FILL_AND_STROKE : Paint.Style.FILL; + mClockView.animate().cancel(); if (shouldAnimate) { mClockView.setY(oldTop + heightOffset); - mClockView.animate().cancel(); mClockView.animate() .setInterpolator(Interpolators.FAST_OUT_SLOW_IN) .setDuration(duration) @@ -257,10 +257,10 @@ public class KeyguardStatusView extends GridLayout implements } else if (view == mClockSeparator) { boolean hasSeparator = hasHeader && !mPulsing; float alpha = hasSeparator ? 1 : 0; + mClockSeparator.animate().cancel(); if (shouldAnimate) { boolean isAwake = mDarkAmount != 0; mClockSeparator.setY(oldTop + heightOffset); - mClockSeparator.animate().cancel(); mClockSeparator.animate() .setInterpolator(Interpolators.FAST_OUT_SLOW_IN) .setDuration(duration) |