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

Commit 733c9568 authored by Michał Brzeziński's avatar Michał Brzeziński Committed by Android (Google) Code Review
Browse files

Merge "Adding tests for dual tone shade in ScrimController" into sc-dev

parents 00ae6df1 75845b36

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;

            boolean relevantState = (mState == ScrimState.SHADE_LOCKED
@@ -519,14 +519,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.