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

Commit 039951ee authored by Lucas Dupin's avatar Lucas Dupin
Browse files

Move charging indication vertically on time tick 

Before, a new translation was only calculated when the device enters
AOD, and then, during time tick, we would only move it 5px wich isn't
enough.
Now, the translation varies 5dps vertically on every time tick.

Fixes: 110888643
Test: take screenshots for N minutes and compare them
Change-Id: Ia3f239d669b83aad0d97d8d7a7f7374f4890777d
parent 038f1a19

packages/SystemUI/res/values/dimens.xml

+8 −4
Original line number Diff line number Diff line
@@ -922,14 +922,18 @@ 


    <dimen name="global_actions_translate">9dp</dimen>



    <!-- the maximum offset in either direction that elements are moved horizontally to prevent

            burn-in on AOD -->

    <!-- The maximum offset in either direction that elements are moved horizontally to prevent

         burn-in on AOD. -->

    <dimen name="burn_in_prevention_offset_x">8dp</dimen>



    <!-- the maximum offset in either direction that elements are moved vertically to prevent

            burn-in on AOD -->

    <!-- The maximum offset in either direction that elements are moved vertically to prevent

         burn-in on AOD. -->

    <dimen name="burn_in_prevention_offset_y">50dp</dimen>



    <!-- The maximum offset in either direction that the charging indication moves vertically

         to prevent burn-in on AOD. -->

    <dimen name="charging_indication_burn_in_prevention_offset_y">5dp</dimen>



    <dimen name="corner_size">8dp</dimen>

    <dimen name="top_padding">0dp</dimen>

    <dimen name="bottom_padding">48dp</dimen>

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

+8 −8
Original line number Diff line number Diff line
@@ -174,6 +174,7 @@ public class KeyguardBottomAreaView extends FrameLayout implements View.OnClickL 
    private int mIndicationBottomMarginAmbient;

    private float mDarkAmount;

    private int mBurnInXOffset;

    private int mBurnInYOffset;



    public KeyguardBottomAreaView(Context context) {

        this(context, null);
@@ -247,6 +248,8 @@ public class KeyguardBottomAreaView extends FrameLayout implements View.OnClickL 
                R.dimen.keyguard_indication_margin_bottom);

        mIndicationBottomMarginAmbient = getResources().getDimensionPixelSize(

                R.dimen.keyguard_indication_margin_bottom_ambient);

        mBurnInYOffset = getResources().getDimensionPixelSize(

                R.dimen.charging_indication_burn_in_prevention_offset_y);

        updateCameraVisibility();

        mUnlockMethodCache = UnlockMethodCache.getInstance(getContext());

        mUnlockMethodCache.addListener(this);
@@ -319,6 +322,8 @@ public class KeyguardBottomAreaView extends FrameLayout implements View.OnClickL 
                R.dimen.keyguard_indication_margin_bottom);

        mIndicationBottomMarginAmbient = getResources().getDimensionPixelSize(

                R.dimen.keyguard_indication_margin_bottom_ambient);

        mBurnInYOffset = getResources().getDimensionPixelSize(

                R.dimen.charging_indication_burn_in_prevention_offset_y);

        MarginLayoutParams mlp = (MarginLayoutParams) mIndicationArea.getLayoutParams();

        if (mlp.bottomMargin != mIndicationBottomMargin) {

            mlp.bottomMargin = mIndicationBottomMargin;
@@ -562,12 +567,6 @@ public class KeyguardBottomAreaView extends FrameLayout implements View.OnClickL 
            return;

        }

        mDarkAmount = darkAmount;

        // Let's randomize the bottom margin every time we wake up to avoid burn-in.

        if (darkAmount == 0) {

            mIndicationBottomMarginAmbient = getResources().getDimensionPixelSize(

                    R.dimen.keyguard_indication_margin_bottom_ambient)

                    + (int) (Math.random() * mIndicationText.getTextSize());

        }

        mIndicationArea.setAlpha(MathUtils.lerp(1f, 0.7f, darkAmount));

        mIndicationArea.setTranslationY(MathUtils.lerp(0,

                mIndicationBottomMargin - mIndicationBottomMarginAmbient, darkAmount));
@@ -844,8 +843,9 @@ public class KeyguardBottomAreaView extends FrameLayout implements View.OnClickL 
    public void dozeTimeTick() {

        if (mDarkAmount == 1) {

            // Move indication every minute to avoid burn-in

            final int dozeTranslation = mIndicationBottomMargin - mIndicationBottomMarginAmbient;

            mIndicationArea.setTranslationY(dozeTranslation + (float) Math.random() * 5);

            int dozeTranslation = mIndicationBottomMargin - mIndicationBottomMarginAmbient;

            int burnInYOffset = (int) (-mBurnInYOffset + Math.random() * mBurnInYOffset * 2);

            mIndicationArea.setTranslationY(dozeTranslation + burnInYOffset);

        }

    }