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

Commit e6fee603 authored by Lucas Dupin's avatar Lucas Dupin Committed by Android (Google) Code Review
Browse files

Merge "Make bubble scrim respect opacity flag"

parents 91a6b4a4 2107c581

libs/WindowManager/Shell/res/layout/bubble_expanded_view.xml

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ 
        android:layout_height="wrap_content"

        android:focusable="true"

        android:text="@string/manage_bubbles_text"

        android:textColor="?android:attr/textColorPrimaryInverse"

        android:textColor="?android:attr/textColorPrimary"

    />



</com.android.wm.shell.bubbles.BubbleExpandedView>

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

+2 −5
Original line number Diff line number Diff line
@@ -115,11 +115,6 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, Dump 
     */

    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.
@@ -210,6 +205,8 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, Dump 


        mScrimStateListener = lightBarController::setScrimState;

        mDefaultScrimAlpha = featureFlags.isShadeOpaque() ? BUSY_SCRIM_ALPHA : GAR_SCRIM_ALPHA;

        ScrimState.BUBBLE_EXPANDED.setBubbleAlpha(featureFlags.isShadeOpaque()

                ? BUSY_SCRIM_ALPHA : GAR_SCRIM_ALPHA);

        mBlurUtils = blurUtils;



        mKeyguardStateController = keyguardStateController;

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

+4 −1
Original line number Diff line number Diff line
@@ -248,7 +248,6 @@ public enum ScrimState { 


            mFrontAlpha = 0f;

            mBehindAlpha = mDefaultScrimAlpha;

            mBubbleAlpha = ScrimController.BUBBLE_SCRIM_ALPHA;



            mAnimationDuration = ScrimController.ANIMATION_DURATION;

            mBlankScreen = false;
@@ -359,6 +358,10 @@ public enum ScrimState { 
        mDefaultScrimAlpha = defaultScrimAlpha;

    }



    public void setBubbleAlpha(float alpha) {

        mBubbleAlpha = alpha;

    }



    public void setWallpaperSupportsAmbientMode(boolean wallpaperSupportsAmbientMode) {

        mWallpaperSupportsAmbientMode = wallpaperSupportsAmbientMode;

    }

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

+1 −1
Original line number Diff line number Diff line
@@ -539,7 +539,7 @@ public class ScrimControllerTest extends SysuiTestCase { 
        Assert.assertEquals(ScrimController.BUSY_SCRIM_ALPHA,

                mScrimBehind.getViewAlpha(), 0.0f);

        // Bubble scrim should be visible

        Assert.assertEquals(ScrimController.BUBBLE_SCRIM_ALPHA,

        Assert.assertEquals(ScrimController.BUSY_SCRIM_ALPHA,

                mScrimForBubble.getViewAlpha(), 0.0f);

    }