diff options
| -rw-r--r-- | packages/SystemUI/src/com/android/keyguard/KeyguardStatusView.java | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardStatusView.java b/packages/SystemUI/src/com/android/keyguard/KeyguardStatusView.java index 225f7fcc9de9..40149464dff2 100644 --- a/packages/SystemUI/src/com/android/keyguard/KeyguardStatusView.java +++ b/packages/SystemUI/src/com/android/keyguard/KeyguardStatusView.java @@ -199,6 +199,9 @@ public class KeyguardStatusView extends GridLayout implements mClockView.setElegantTextHeight(false); } + /** + * Moves clock and separator, adjusting margins when slice content changes. + */ private void onSliceContentChanged() { boolean smallClock = mKeyguardSlice.hasHeader() || mPulsing; float clockScale = smallClock ? mSmallClockScale : 1; @@ -221,7 +224,7 @@ public class KeyguardStatusView extends GridLayout implements @Override public void onLayoutChange(View view, int left, int top, int right, int bottom, int oldLeft, int oldTop, int oldRight, int oldBottom) { - int heightOffset = mPulsing ? 0 : getHeight() - mLastLayoutHeight; + int heightOffset = mPulsing || mWasPulsing ? 0 : getHeight() - mLastLayoutHeight; boolean hasHeader = mKeyguardSlice.hasHeader(); boolean smallClock = hasHeader || mPulsing; long duration = KeyguardSliceView.DEFAULT_ANIM_DURATION; @@ -457,6 +460,11 @@ public class KeyguardStatusView extends GridLayout implements mWasPulsing = true; } mPulsing = pulsing; + // Animation can look really weird when the slice has a header, let's hide the views + // immediately instead of fading them away. + if (mKeyguardSlice.hasHeader()) { + animate = false; + } mKeyguardSlice.setPulsing(pulsing, animate); updateDozeVisibleViews(); } |