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

Merge "Re-add dividers when expanding notifications." into sc-dev

Browse Source
This commit is contained in:
Jeff DeCew
2021-06-21 14:28:25 +00:00
committed by Android (Google) Code Review
parent d6f7eb33e3 b051354de5
commit e6b421ae73
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -21,8 +21,8 @@
It's fine to override this color since at that point the shade was dark. --> It's fine to override this color since at that point the shade was dark. -->
<color name="notification_legacy_background_color">@color/GM2_grey_900</color> <color name="notification_legacy_background_color">@color/GM2_grey_900</color>
<!-- The color of the dividing line between grouped notifications while . --> <!-- The color of the dividing line between grouped notifications. -->
<color name="notification_divider_color">#212121</color> <color name="notification_divider_color">@*android:color/background_device_default_dark</color>
<!-- The color of the gear shown behind a notification --> <!-- The color of the gear shown behind a notification -->
<color name="notification_gear_color">@color/GM2_grey_500</color> <color name="notification_gear_color">@color/GM2_grey_500</color>

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

@@ -93,7 +93,7 @@
<color name="notification_material_background_dark_color">#ff333333</color> <color name="notification_material_background_dark_color">#ff333333</color>
<!-- The color of the dividing line between grouped notifications. --> <!-- The color of the dividing line between grouped notifications. -->
<color name="notification_divider_color">#FF616161</color> <color name="notification_divider_color">@*android:color/background_device_default_light</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>

2
packages/SystemUI/res/values/dimens.xml
View File

@@ -685,7 +685,7 @@
<dimen name="notification_shadow_radius">0dp</dimen> <dimen name="notification_shadow_radius">0dp</dimen>
<!-- The alpha of the dividing line between child notifications of a notification group. --> <!-- The alpha of the dividing line between child notifications of a notification group. -->
<item name="notification_divider_alpha" format="float" type="dimen">0.5</item> <item name="notification_divider_alpha" format="float" type="dimen">1</item>
<!-- The height of the divider between the individual notifications in a notification <!-- The height of the divider between the individual notifications in a notification
group. --> group. -->

6
packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationChildrenContainer.java
View File

@@ -725,7 +725,7 @@ public class NotificationChildrenContainer extends ViewGroup {
tmpState.yTranslation = viewState.yTranslation - mDividerHeight; tmpState.yTranslation = viewState.yTranslation - mDividerHeight;
float alpha = mChildrenExpanded && viewState.alpha != 0 ? mDividerAlpha : 0; float alpha = mChildrenExpanded && viewState.alpha != 0 ? mDividerAlpha : 0;
if (mUserLocked && !showingAsLowPriority() && viewState.alpha != 0) { if (mUserLocked && !showingAsLowPriority() && viewState.alpha != 0) {
alpha = NotificationUtils.interpolate(0, 0.5f, alpha = NotificationUtils.interpolate(0, mDividerAlpha,
Math.min(viewState.alpha, expandFraction)); Math.min(viewState.alpha, expandFraction));
} }
tmpState.hidden = !dividersVisible; tmpState.hidden = !dividersVisible;
@@ -802,9 +802,9 @@ public class NotificationChildrenContainer extends ViewGroup {
View divider = mDividers.get(i); View divider = mDividers.get(i);
tmpState.initFrom(divider); tmpState.initFrom(divider);
tmpState.yTranslation = viewState.yTranslation - mDividerHeight; tmpState.yTranslation = viewState.yTranslation - mDividerHeight;
float alpha = mChildrenExpanded && viewState.alpha != 0 ? 0.5f : 0; float alpha = mChildrenExpanded && viewState.alpha != 0 ? mDividerAlpha : 0;
if (mUserLocked && !showingAsLowPriority() && viewState.alpha != 0) { if (mUserLocked && !showingAsLowPriority() && viewState.alpha != 0) {
alpha = NotificationUtils.interpolate(0, 0.5f, alpha = NotificationUtils.interpolate(0, mDividerAlpha,
Math.min(viewState.alpha, expandFraction)); Math.min(viewState.alpha, expandFraction));
} }
tmpState.hidden = !dividersVisible; tmpState.hidden = !dividersVisible;