Merge "Avoid screen edges when moving padlock" (8e7d5673) · Commits · e / os / android_frameworks_base

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

+6 −6

Original line number	Diff line number	Diff line
		@@ -54,6 +54,7 @@ import android.telecom.TelecomManager;
		import android.text.TextUtils;
		import android.util.AttributeSet;
		import android.util.Log;
		import android.util.MathUtils;
		import android.util.TypedValue;
		import android.view.View;
		import android.view.ViewGroup;
		@@ -568,6 +569,7 @@ public class KeyguardBottomAreaView extends FrameLayout implements View.OnClickL
		mDarkAmount = darkAmount;
		mIndicationController.setDarkAmount(darkAmount);
		mLockIcon.setDarkAmount(darkAmount);
		dozeTimeTick();
		}

		private static boolean isSuccessfulLaunch(int result) {
		@@ -840,13 +842,11 @@ public class KeyguardBottomAreaView extends FrameLayout implements View.OnClickL
		}

		public void dozeTimeTick() {
		if (mDarkAmount == 1) {
		// Move views every minute to avoid burn-in
		int burnInYOffset = getBurnInOffset(mBurnInYOffset * 2, false /* xAxis */)
		- mBurnInYOffset;
		int burnInYOffset = -getBurnInOffset(mBurnInYOffset, false /* xAxis */);
		burnInYOffset = (int) MathUtils.lerp(0, burnInYOffset, mDarkAmount);
		mLockIcon.setTranslationY(burnInYOffset);
		}
		}

		public void setBurnInXOffset(int burnInXOffset) {
		if (mBurnInXOffset == burnInXOffset) {