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

Commit 96216120 authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Android (Google) Code Review
Browse files

Merge "Merge "Lighten bubble scrim" into rvc-dev am: e3f751c4 am:... 

Merge "Merge "Lighten bubble scrim" into rvc-dev am: e3f751c4 am: bbf5c579" into rvc-d1-dev-plus-aosp
parents b76e7d4e c6f6f40b

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

+6 −0
Original line number Diff line number Diff line
@@ -113,6 +113,12 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, OnCo 
     * Scrim opacity when the phone is about to wake-up.

     */

    public static final float WAKE_SENSOR_SCRIM_ALPHA = 0.6f;



    /**

     * Scrim opacity when bubbles are expanded.

     */

    public static final float BUBBLE_SCRIM_ALPHA = 0.6f;



    /**

     * The default scrim under the shade and dialogs.

     * This should not be lower than 0.54, otherwise we won't pass GAR.

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

+1 −1
Original line number Diff line number Diff line
@@ -235,7 +235,7 @@ public enum ScrimState { 


            mFrontAlpha = 0f;

            mBehindAlpha = mDefaultScrimAlpha;

            mBubbleAlpha = mDefaultScrimAlpha;

            mBubbleAlpha = ScrimController.BUBBLE_SCRIM_ALPHA;



            mAnimationDuration = ScrimController.ANIMATION_DURATION;

            mBlankScreen = false;