Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ad3ee36e authored by Filip Gruszczynski's avatar Filip Gruszczynski Committed by Android Git Automerger
Browse files

am 5441a7b3: am 764707f0: am 1bf3d222: Merge "Don\'t animate burn-in return... 

am 5441a7b3: am 764707f0: am 1bf3d222: Merge "Don\'t animate burn-in return when it wasn\'t applied." into cw-e-dev

* commit '5441a7b3':
  Don't animate burn-in return when it wasn't applied.
parents 78e72fde 5441a7b3

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

+8 −1
Original line number Original line Diff line number Diff line
@@ -72,6 +72,9 @@ public class BurnInProtectionHelper implements DisplayManager.DisplayListener, 
    /* 1 means increasing, -1 means decreasing */

    /* 1 means increasing, -1 means decreasing */

    private int mYOffsetDirection = 1;

    private int mYOffsetDirection = 1;





    private int mAppliedBurnInXOffset = 0;

    private int mAppliedBurnInYOffset = 0;



    private final AlarmManager mAlarmManager;

    private final AlarmManager mAlarmManager;

    private final PendingIntent mBurnInProtectionIntent;

    private final PendingIntent mBurnInProtectionIntent;

    private final DisplayManagerInternal mDisplayManagerInternal;

    private final DisplayManagerInternal mDisplayManagerInternal;
@@ -139,6 +142,8 @@ public class BurnInProtectionHelper implements DisplayManager.DisplayListener, 
                mFirstUpdate = false;

                mFirstUpdate = false;

            } else {

            } else {

                adjustOffsets();

                adjustOffsets();

                mAppliedBurnInXOffset = mLastBurnInXOffset;

                mAppliedBurnInYOffset = mLastBurnInYOffset;

                mDisplayManagerInternal.setDisplayOffsets(mDisplay.getDisplayId(),

                mDisplayManagerInternal.setDisplayOffsets(mDisplay.getDisplayId(),

                        mLastBurnInXOffset, mLastBurnInYOffset);

                        mLastBurnInXOffset, mLastBurnInYOffset);

            }

            }
@@ -258,6 +263,8 @@ public class BurnInProtectionHelper implements DisplayManager.DisplayListener, 
    @Override

    @Override

    public void onAnimationEnd(Animator animator) {

    public void onAnimationEnd(Animator animator) {

        if (animator == mCenteringAnimator && !mBurnInProtectionActive) {

        if (animator == mCenteringAnimator && !mBurnInProtectionActive) {

            mAppliedBurnInXOffset = 0;

            mAppliedBurnInYOffset = 0;

            // No matter how the animation finishes, we want to zero the offsets.

            // No matter how the animation finishes, we want to zero the offsets.

            mDisplayManagerInternal.setDisplayOffsets(mDisplay.getDisplayId(), 0, 0);

            mDisplayManagerInternal.setDisplayOffsets(mDisplay.getDisplayId(), 0, 0);

        }

        }
@@ -276,7 +283,7 @@ public class BurnInProtectionHelper implements DisplayManager.DisplayListener, 
        if (!mBurnInProtectionActive) {

        if (!mBurnInProtectionActive) {

            final float value = (Float) valueAnimator.getAnimatedValue();

            final float value = (Float) valueAnimator.getAnimatedValue();

            mDisplayManagerInternal.setDisplayOffsets(mDisplay.getDisplayId(),

            mDisplayManagerInternal.setDisplayOffsets(mDisplay.getDisplayId(),

                    (int) (mLastBurnInXOffset * value), (int) (mLastBurnInYOffset * value));

                    (int) (mAppliedBurnInXOffset * value), (int) (mAppliedBurnInYOffset * value));

        }

        }

    }

    }

}
 
}