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

Merge "Fix notification shade inefficient contrast" into qt-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2019-05-31 01:26:19 +00:00
committed by Android (Google) Code Review
parent 6f574c4d3a 97bc8d592f
commit f185b652bd
3 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/SystemUI/res/values-night/colors.xml
View File

@@ -31,7 +31,10 @@
<color name="notification_divider_color">#212121</color> <color name="notification_divider_color">#212121</color>
<!-- The background color of the notification shade --> <!-- The background color of the notification shade -->
<color name="notification_shade_background_color">#181818</color> <color name="notification_shade_background_color">@color/GM2_grey_900</color>
<!-- The color of the gear shown behind a notification -->
<color name="notification_gear_color">@color/GM2_grey_500</color>
<!-- The color of the ripples on the untinted notifications --> <!-- The color of the ripples on the untinted notifications -->
<color name="notification_ripple_untinted_color">#30ffffff</color> <color name="notification_ripple_untinted_color">#30ffffff</color>

4
packages/SystemUI/res/values/colors.xml
View File

@@ -74,7 +74,7 @@
<color name="notification_divider_color">#FF616161</color> <color name="notification_divider_color">#FF616161</color>
<!-- The background color of the notification shade --> <!-- The background color of the notification shade -->
<color name="notification_shade_background_color">#ffeeeeee</color> <color name="notification_shade_background_color">@color/GM2_grey_200</color>
<!-- The color of the ripples on the untinted notifications --> <!-- The color of the ripples on the untinted notifications -->
<color name="notification_ripple_untinted_color">#28000000</color> <color name="notification_ripple_untinted_color">#28000000</color>
@@ -83,7 +83,7 @@
<color name="notification_ripple_tinted_color">#30ffffff</color> <color name="notification_ripple_tinted_color">#30ffffff</color>
<!-- The color of the gear shown behind a notification --> <!-- The color of the gear shown behind a notification -->
<color name="notification_gear_color">#ff757575</color> <color name="notification_gear_color">@color/GM2_grey_700</color>
<!-- The color of the text inside a notification --> <!-- The color of the text inside a notification -->
<color name="notification_primary_text_color">@*android:color/notification_primary_text_color_light</color> <color name="notification_primary_text_color">@*android:color/notification_primary_text_color_light</color>

9
packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java
View File

@@ -939,18 +939,11 @@ public class NotificationStackScrollLayout extends ViewGroup implements ScrollAd
return; return;
} }
float alpha =
BACKGROUND_ALPHA_DIMMED + (1 - BACKGROUND_ALPHA_DIMMED) * (1.0f - mDimAmount);
alpha *= 1f - mInterpolatedDarkAmount;
// We need to manually blend in the background color.
int scrimColor = mScrimController.getBackgroundColor();
int awakeColor = ColorUtils.blendARGB(scrimColor, mBgColor, alpha);
// Interpolate between semi-transparent notification panel background color // Interpolate between semi-transparent notification panel background color
// and white AOD separator. // and white AOD separator.
float colorInterpolation = MathUtils.smoothStep(0.4f /* start */, 1f /* end */, float colorInterpolation = MathUtils.smoothStep(0.4f /* start */, 1f /* end */,
mLinearDarkAmount); mLinearDarkAmount);
int color = ColorUtils.blendARGB(awakeColor, Color.WHITE, colorInterpolation); int color = ColorUtils.blendARGB(mBgColor, Color.WHITE, colorInterpolation);
if (mCachedBackgroundColor != color) { if (mCachedBackgroundColor != color) {
mCachedBackgroundColor = color; mCachedBackgroundColor = color;