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

Merge "Lighten bubble scrim" into rvc-dev am: e3f751c42c am: bbf5c579a3

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11924521

Change-Id: I307d41f9b880c17be3ea39cd31123dd7df7621d4
This commit is contained in:
Lyn Han
2020-06-19 17:11:09 +00:00
committed by Automerger Merge Worker
parent 7cdf70c372 bbf5c579a3
commit 03737d7536
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -113,6 +113,12 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, OnCo
* Scrim opacity when the phone is about to wake-up. * Scrim opacity when the phone is about to wake-up.
*/ */
public static final float WAKE_SENSOR_SCRIM_ALPHA = 0.6f; 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. * The default scrim under the shade and dialogs.
* This should not be lower than 0.54, otherwise we won't pass GAR. * This should not be lower than 0.54, otherwise we won't pass GAR.

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

@@ -235,7 +235,7 @@ public enum ScrimState {
mFrontAlpha = 0f; mFrontAlpha = 0f;
mBehindAlpha = mDefaultScrimAlpha; mBehindAlpha = mDefaultScrimAlpha;
mBubbleAlpha = mDefaultScrimAlpha; mBubbleAlpha = ScrimController.BUBBLE_SCRIM_ALPHA;
mAnimationDuration = ScrimController.ANIMATION_DURATION; mAnimationDuration = ScrimController.ANIMATION_DURATION;
mBlankScreen = false; mBlankScreen = false;