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

Commit e7e04c96 authored by Robert Snoeberger's avatar Robert Snoeberger Committed by android-build-merger
Browse files

Merge "Remove burn in offset on lock screen." into qt-dev 

am: 03b349a1

Change-Id: If00a0d5211dbcc76034258cdc7a8f4f5e7ece283
parents 47f43637 03b349a1

packages/SystemUI/src/com/android/keyguard/clock/AnalogClockController.java

+1 −0
Original line number Original line Diff line number Diff line
@@ -189,6 +189,7 @@ public class AnalogClockController implements ClockPlugin { 
    @Override

    @Override

    public void setDarkAmount(float darkAmount) {

    public void setDarkAmount(float darkAmount) {

        mClockPosition.setDarkAmount(darkAmount);

        mClockPosition.setDarkAmount(darkAmount);

        mBigClockView.setDarkAmount(darkAmount);

    }

    }





    @Override

    @Override

packages/SystemUI/src/com/android/keyguard/clock/BubbleClockController.java

+1 −0
Original line number Original line Diff line number Diff line
@@ -181,6 +181,7 @@ public class BubbleClockController implements ClockPlugin { 
    @Override

    @Override

    public void setDarkAmount(float darkAmount) {

    public void setDarkAmount(float darkAmount) {

        mClockPosition.setDarkAmount(darkAmount);

        mClockPosition.setDarkAmount(darkAmount);

        mView.setDarkAmount(darkAmount);

    }

    }





    @Override

    @Override

packages/SystemUI/src/com/android/keyguard/clock/ClockLayout.java

+17 −4
Original line number Original line Diff line number Diff line
@@ -20,6 +20,7 @@ import static com.android.systemui.doze.util.BurnInHelperKt.getBurnInOffset; 
import android.content.Context;

import android.content.Context;

import android.content.res.Resources;

import android.content.res.Resources;

import android.util.AttributeSet;

import android.util.AttributeSet;

import android.util.MathUtils;

import android.view.View;

import android.view.View;

import android.widget.FrameLayout;

import android.widget.FrameLayout;
@@ -43,6 +44,8 @@ public class ClockLayout extends FrameLayout { 
    private int mBurnInPreventionOffsetX;

    private int mBurnInPreventionOffsetX;

    private int mBurnInPreventionOffsetY;

    private int mBurnInPreventionOffsetY;





    private float mDarkAmount;



    public ClockLayout(Context context) {

    public ClockLayout(Context context) {

        this(context, null);

        this(context, null);

    }

    }
@@ -78,11 +81,21 @@ public class ClockLayout extends FrameLayout { 
        positionChildren();

        positionChildren();

    }

    }





    /**

     * See {@link com.android.systemui.plugins.ClockPlugin#setDarkAmount(float)}.

     */

    void setDarkAmount(float darkAmount) {

        mDarkAmount = darkAmount;

        positionChildren();

    }



    private void positionChildren() {

    private void positionChildren() {

        final float offsetX = getBurnInOffset(mBurnInPreventionOffsetX * 2, true)

        final float offsetX = MathUtils.lerp(0f,

                - mBurnInPreventionOffsetX;

                getBurnInOffset(mBurnInPreventionOffsetX * 2, true) - mBurnInPreventionOffsetX,

        final float offsetY = getBurnInOffset(mBurnInPreventionOffsetY * 2, false)

                mDarkAmount);

                - mBurnInPreventionOffsetY;

        final float offsetY = MathUtils.lerp(0f,

                getBurnInOffset(mBurnInPreventionOffsetY * 2, false) - mBurnInPreventionOffsetY,

                mDarkAmount);





        // Put the analog clock in the middle of the screen.

        // Put the analog clock in the middle of the screen.

        if (mAnalogClock != null) {

        if (mAnalogClock != null) {