Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make bubble scrim respect opacity flag

Browse Source 
Test: atest ScrimControllerTes
Fixes: 173562716
Change-Id: If815eb75f63078741f2b1104938b223e0a99df31
This commit is contained in:
Lucas Dupin
2021-01-25 16:27:14 -08:00
parent 44765a6ad2
commit 2107c5815f
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libs/WindowManager/Shell/res/layout/bubble_expanded_view.xml
View File

@@ -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>

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

@@ -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;

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

@@ -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;
}

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

@@ -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);
}