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

Commit e88d0c58 authored by William Leshner's avatar William Leshner Committed by Automerger Merge Worker
Browse files

Merge "Reduce the jitter offset in dream overlay." into tm-qpr-dev am: ba3a1233 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18127716



Change-Id: Idcdeb5400148dc43b334d872c9d0560233ad03af
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d1741a15 ba3a1233

packages/SystemUI/res/values/config.xml

+1 −1
Original line number Diff line number Diff line
@@ -690,7 +690,7 @@ 
    <string name="config_communalSourceConnector" translatable="false"></string>



    <!-- How often in milliseconds to jitter the dream overlay in order to avoid burn-in. -->

    <integer name="config_dreamOverlayBurnInProtectionUpdateIntervalMillis">500</integer>

    <integer name="config_dreamOverlayBurnInProtectionUpdateIntervalMillis">1000</integer>



    <!-- How long in milliseconds before full burn-in protection is achieved. -->

    <integer name="config_dreamOverlayMillisUntilFullJitter">240000</integer>

packages/SystemUI/src/com/android/systemui/dreams/DreamOverlayContainerViewController.java

+8 −8
Original line number Diff line number Diff line
@@ -183,22 +183,22 @@ public class DreamOverlayContainerViewController extends ViewController<DreamOve 
    }



    private void updateBurnInOffsets() {

        int burnInOffset = mMaxBurnInOffset;



        // Make sure the offset starts at zero, to avoid a big jump in the overlay when it first

        // appears.

        long millisSinceStart = System.currentTimeMillis() - mJitterStartTimeMillis;

        final long millisSinceStart = System.currentTimeMillis() - mJitterStartTimeMillis;

        final int burnInOffset;

        if (millisSinceStart < mMillisUntilFullJitter) {

            float lerpAmount = (float) millisSinceStart / (float) mMillisUntilFullJitter;

            burnInOffset = Math.round(MathUtils.lerp(0f, burnInOffset, lerpAmount));

            burnInOffset = Math.round(MathUtils.lerp(0f, mMaxBurnInOffset, lerpAmount));

        } else {

            burnInOffset = mMaxBurnInOffset;

        }



        // These translation values change slowly, and the set translation methods are idempotent,

        // so no translation occurs when the values don't change.

        int burnInOffsetX = getBurnInOffset(burnInOffset * 2, true)

                - burnInOffset;

        int burnInOffsetY = getBurnInOffset(burnInOffset * 2, false)

                - burnInOffset;

        final int halfBurnInOffset = burnInOffset / 2;

        final int burnInOffsetX = getBurnInOffset(burnInOffset, true) - halfBurnInOffset;

        final int burnInOffsetY = getBurnInOffset(burnInOffset, false) - halfBurnInOffset;

        mView.setTranslationX(burnInOffsetX);

        mView.setTranslationY(burnInOffsetY);