Merge "Enable new shade features in AOSP" into sc-dev

This commit is contained in:
Jeff DeCew
2021-04-28 12:48:27 +00:00
committed by Android (Google) Code Review
3 changed files with 8 additions and 8 deletions

View File

@@ -375,7 +375,7 @@
<bool name="config_showNotificationGear">true</bool>
<!-- Whether or not a background should be drawn behind a notification. -->
<bool name="config_drawNotificationBackground">true</bool>
<bool name="config_drawNotificationBackground">false</bool>
<!-- Whether or the notifications can be shown and dismissed with a drag. -->
<bool name="config_enableNotificationShadeDrag">true</bool>

View File

@@ -157,7 +157,7 @@
<dimen name="notification_max_heads_up_height_increased">188dp</dimen>
<!-- Side padding on the lockscreen on the side of notifications -->
<dimen name="notification_side_paddings">4dp</dimen>
<dimen name="notification_side_paddings">16dp</dimen>
<!-- padding between the heads up and the statusbar -->
<dimen name="heads_up_status_bar_padding">8dp</dimen>
@@ -179,10 +179,10 @@
<dimen name="notification_min_interaction_height">40dp</dimen>
<!-- Radius for notifications corners without adjacent notifications -->
<dimen name="notification_corner_radius">8dp</dimen>
<dimen name="notification_corner_radius">28dp</dimen>
<!-- Radius for notifications corners with adjacent notifications -->
<dimen name="notification_corner_radius_small">0dp</dimen>
<dimen name="notification_corner_radius_small">4dp</dimen>
<!-- the padding of the shelf icon container -->
<dimen name="shelf_icon_container_padding">13dp</dimen>
@@ -667,7 +667,7 @@
<dimen name="z_distance_between_notifications">0.5dp</dimen>
<!-- The height of the divider between the individual notifications. -->
<dimen name="notification_divider_height">1dp</dimen>
<dimen name="notification_divider_height">2dp</dimen>
<!-- The corner radius of the shadow behind the notification. -->
<dimen name="notification_shadow_radius">0dp</dimen>
@@ -680,7 +680,7 @@
<dimen name="notification_children_container_divider_height">0.5dp</dimen>
<!-- The horizontal margin of the content in the notification shade -->
<dimen name="notification_shade_content_margin_horizontal">4dp</dimen>
<dimen name="notification_shade_content_margin_horizontal">16dp</dimen>
<!-- The top margin for the notification children container in its non-expanded form. -->
<dimen name="notification_children_container_margin_top">

View File

@@ -20,9 +20,9 @@
<bool name="flag_notification_pipeline2">true</bool>
<bool name="flag_notification_pipeline2_rendering">false</bool>
<bool name="flag_notif_updates">false</bool>
<bool name="flag_notif_updates">true</bool>
<bool name="flag_shade_is_opaque">false</bool>
<bool name="flag_shade_is_opaque">true</bool>
<bool name="flag_monet">false</bool>
<!-- b/171917882 -->