Merge "Fix issue where clock scale would be wrong in AOD" into oc-mr1-dev am: 3edfdf345e (2cec8160) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardClockPositionAlgorithm.java

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -151,7 +151,7 @@ public class KeyguardClockPositionAlgorithm {
	progress = Math.max(0.0f, Math.min(progress, 1.0f));		progress = Math.max(0.0f, Math.min(progress, 1.0f));
	progress = mAccelerateInterpolator.getInterpolation(progress);		progress = mAccelerateInterpolator.getInterpolation(progress);
	progress *= Math.pow(1 + mEmptyDragAmount / mDensity / 300, 0.3f);		progress *= Math.pow(1 + mEmptyDragAmount / mDensity / 300, 0.3f);
	return progress;		return interpolate(progress, 1, mDarkAmount);
	}		}

	private int getClockNotificationsPadding() {		private int getClockNotificationsPadding() {