am 1bf3d222: Merge "Don\'t animate burn-in return when it wasn\'t applied." into cw-e-dev (764707f0) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/policy/BurnInProtectionHelper.java

+8 −1

Original line number	Diff line number	Diff line
		@@ -72,6 +72,9 @@ public class BurnInProtectionHelper implements DisplayManager.DisplayListener,
		/* 1 means increasing, -1 means decreasing */
		private int mYOffsetDirection = 1;

		private int mAppliedBurnInXOffset = 0;
		private int mAppliedBurnInYOffset = 0;

		private final AlarmManager mAlarmManager;
		private final PendingIntent mBurnInProtectionIntent;
		private final DisplayManagerInternal mDisplayManagerInternal;
		@@ -139,6 +142,8 @@ public class BurnInProtectionHelper implements DisplayManager.DisplayListener,
		mFirstUpdate = false;
		} else {
		adjustOffsets();
		mAppliedBurnInXOffset = mLastBurnInXOffset;
		mAppliedBurnInYOffset = mLastBurnInYOffset;
		mDisplayManagerInternal.setDisplayOffsets(mDisplay.getDisplayId(),
		mLastBurnInXOffset, mLastBurnInYOffset);
		}
		@@ -258,6 +263,8 @@ public class BurnInProtectionHelper implements DisplayManager.DisplayListener,
		@Override
		public void onAnimationEnd(Animator animator) {
		if (animator == mCenteringAnimator && !mBurnInProtectionActive) {
		mAppliedBurnInXOffset = 0;
		mAppliedBurnInYOffset = 0;
		// No matter how the animation finishes, we want to zero the offsets.
		mDisplayManagerInternal.setDisplayOffsets(mDisplay.getDisplayId(), 0, 0);
		}
		@@ -276,7 +283,7 @@ public class BurnInProtectionHelper implements DisplayManager.DisplayListener,
		if (!mBurnInProtectionActive) {
		final float value = (Float) valueAnimator.getAnimatedValue();
		mDisplayManagerInternal.setDisplayOffsets(mDisplay.getDisplayId(),
		(int) (mLastBurnInXOffset * value), (int) (mLastBurnInYOffset * value));
		(int) (mAppliedBurnInXOffset * value), (int) (mAppliedBurnInYOffset * value));
		}
		}
		}