Merge "Always cancel clock animation" into pi-dev (a1cb9733) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/keyguard/KeyguardSliceView.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -328,7 +328,7 @@ public class KeyguardSliceView extends LinearLayout implements View.OnClickListe
		}

		public boolean hasHeader() {
		return mTitle.getVisibility() == VISIBLE;
		return mHasHeader;
		}

		/**

+2 −2

Original line number	Diff line number	Diff line
		@@ -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)