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

Commit 13b869d5 authored by Mady Mellor's avatar Mady Mellor Committed by Android (Google) Code Review
Browse files

Merge "Fix the bubble expanded scrim colour to use the shared constant" into main

parents 6f858135 0863a716

libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/bar/BubbleBarLayerView.java

+2 −3
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package com.android.wm.shell.bubbles.bar; 
import static com.android.wm.shell.shared.animation.Interpolators.ALPHA_IN;

import static com.android.wm.shell.shared.animation.Interpolators.ALPHA_OUT;

import static com.android.wm.shell.bubbles.Bubbles.DISMISS_USER_GESTURE;

import static com.android.wm.shell.shared.bubbles.BubbleConstants.BUBBLE_EXPANDED_SCRIM_ALPHA;



import android.annotation.Nullable;

import android.content.Context;
@@ -66,8 +67,6 @@ public class BubbleBarLayerView extends FrameLayout 


    private static final String TAG = BubbleBarLayerView.class.getSimpleName();



    private static final float SCRIM_ALPHA = 0.2f;



    private final BubbleController mBubbleController;

    private final BubbleData mBubbleData;

    private final BubblePositioner mPositioner;
@@ -386,7 +385,7 @@ public class BubbleBarLayerView extends FrameLayout 
        if (show) {

            mScrimView.animate()

                    .setInterpolator(ALPHA_IN)

                    .alpha(SCRIM_ALPHA)

                    .alpha(BUBBLE_EXPANDED_SCRIM_ALPHA)

                    .start();

        } else {

            mScrimView.animate()