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

Commit eddc1000 authored by Hawkwood Glazier's avatar Hawkwood Glazier
Browse files

Capture and delay string building in KeyguardClockPositionAlgorithm 

Flag: N/A
Bug: 324631115
Test: Manually checked output
Change-Id: I85987966ba51e1b1970433d353d9ee9327de564e
parent 6a4c96f6

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

+20 −17
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ import javax.inject.Inject; 
 */

public class KeyguardClockPositionAlgorithm {

    private static final String TAG = "KeyguardClockPositionAlgorithm";

    private static final boolean DEBUG = false;



    /**

     * Margin between the bottom of the status view and the notification shade.
@@ -318,24 +319,26 @@ public class KeyguardClockPositionAlgorithm { 
        }



        float fullyDarkBurnInOffset = burnInPreventionOffsetY(burnInPreventionOffsetY);

        float clockYDark = clockY

                + fullyDarkBurnInOffset

                + shift;

        float clockYDark = clockY + fullyDarkBurnInOffset + shift;

        mCurrentBurnInOffsetY = MathUtils.lerp(0, fullyDarkBurnInOffset, darkAmount);

        final String inputs = "panelExpansion: " + panelExpansion + " darkAmount: " + darkAmount;



        if (DEBUG) {

            final float finalShift = shift;

            final float finalBurnInPreventionOffsetY = burnInPreventionOffsetY;

            mLogger.i(msg -> {

                final String inputs = "panelExpansion: " + panelExpansion

                        + " darkAmount: " + darkAmount;

                final String outputs = "clockY: " + clockY

                + " burnInPreventionOffsetY: " + burnInPreventionOffsetY

                        + " burnInPreventionOffsetY: " + finalBurnInPreventionOffsetY

                        + " fullyDarkBurnInOffset: " + fullyDarkBurnInOffset

                + " shift: " + shift

                        + " shift: " + finalShift

                        + " mOverStretchAmount: " + mOverStretchAmount

                        + " mCurrentBurnInOffsetY: " + mCurrentBurnInOffsetY;

        mLogger.i(msg -> {

            return msg.getStr1() + " -> " + msg.getStr2();

                return inputs + " -> " + outputs;

            }, msg -> {

            msg.setStr1(inputs);

            msg.setStr2(outputs);

                return kotlin.Unit.INSTANCE;

            });

        }

        return (int) (MathUtils.lerp(clockY, clockYDark, darkAmount) + mOverStretchAmount);

    }

packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/KeyguardClockPositionAlgorithmTest.java

+2 −0
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ import org.junit.runner.RunWith; 
import org.mockito.Mock;

import org.mockito.MockitoAnnotations;

import org.mockito.MockitoSession;

import org.mockito.quality.Strictness;



@SmallTest

@RunWith(AndroidTestingRunner.class)
@@ -80,6 +81,7 @@ public class KeyguardClockPositionAlgorithmTest extends SysuiTestCase { 
    public void setUp() {

        MockitoAnnotations.initMocks(this);

        mStaticMockSession = mockitoSession()

                .strictness(Strictness.WARN)

                .mockStatic(BurnInHelperKt.class)

                .mockStatic(LargeScreenHeaderHelper.class)

                .startMocking();