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

Commit 75845b36 authored by Michal Brzezinski's avatar Michal Brzezinski
Browse files

Adding tests for dual tone shade in ScrimController 

Also small refactoring of helping testing methods to make them
less commented and more refactoring friendly.

Bug: 183953523
Test: atest ScrimControllerTest
Change-Id: I34a905a409c67cb7b38f848b89b6108500438867
parent bcc5b4c1

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

+3 −3
Original line number Diff line number Diff line
@@ -497,7 +497,7 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, Dump 
            return;

        }

        shiftNotificationsScrim(qsPanelBottomY);

        updateNotificationsScrimAlpha(qsPanelBottomY);

        updateNotificationsScrimAlpha(expansionFraction, qsPanelBottomY);

        if (mQsExpansion != expansionFraction) {

            mQsExpansion = expansionFraction;

            Log.d(TAG, "set qs fraction");
@@ -520,14 +520,14 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, Dump 
        }

    }



    private void updateNotificationsScrimAlpha(int qsPanelBottomY) {

    private void updateNotificationsScrimAlpha(float qsExpansion, int qsPanelBottomY) {

        float newAlpha = 0;

        if (qsPanelBottomY > 0) {

            float interpolator = 0;

            if (mState == ScrimState.UNLOCKED || mState == ScrimState.SHADE_LOCKED) {

                interpolator = getInterpolatedFraction();

            } else {

                interpolator = mQsExpansion;

                interpolator = qsExpansion;

            }

            newAlpha = MathUtils.lerp(0, 1, interpolator);

        }

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

+244 −164

File changed.

Preview size limit exceeded, changes collapsed.