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

Update colors for inline controls am: 146e157a69

Browse Source 
Change-Id: I5e3443d49a0541ed1618cf3014f4551c08596ebf
This commit is contained in:
Automerger Merge Worker
2020-02-26 12:44:18 +00:00
parent b9cf869b71 146e157a69
commit 7a1f4df1a4
9 changed files with 8 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/res/color/notification_guts_priority_button_bg_stroke.xml
View File

@@ -16,6 +16,6 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android"> <selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_selected="true" <item android:state_selected="true"
android:color="@color/notification_guts_priority_button_bg_stroke_color_selected" /> android:color="?android:attr/colorAccent" />
<item android:color="@color/notification_guts_priority_button_bg_stroke_color" /> <item android:color="@color/notification_guts_priority_button_bg_stroke_color" />
</selector> </selector>

2
packages/SystemUI/res/color/notification_guts_priority_contents.xml
View File

@@ -16,6 +16,6 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android"> <selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_selected="true" <item android:state_selected="true"
android:color="@color/notification_guts_priority_button_content_color_selected" /> android:color="?android:attr/colorAccent" />
<item android:color="@color/notification_guts_priority_button_content_color" /> <item android:color="@color/notification_guts_priority_button_content_color" />
</selector> </selector>

2
packages/SystemUI/res/drawable/notification_guts_bg.xml
View File

@@ -16,7 +16,7 @@
--> -->
<shape xmlns:android="http://schemas.android.com/apk/res/android"> <shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="@color/notification_guts_bg_color" /> <solid android:color="@color/notification_material_background_color" />
<!--The radius is 1dp smaller than the notification one, to avoid aliasing bugs on the corners --> <!--The radius is 1dp smaller than the notification one, to avoid aliasing bugs on the corners -->
<corners android:radius="1dp" /> <corners android:radius="1dp" />
</shape> </shape>

2
packages/SystemUI/res/layout/app_ops_info.xml
View File

@@ -26,7 +26,7 @@
android:orientation="vertical" android:orientation="vertical"
android:paddingStart="@*android:dimen/notification_content_margin_start" android:paddingStart="@*android:dimen/notification_content_margin_start"
android:paddingEnd="@*android:dimen/notification_content_margin_end" android:paddingEnd="@*android:dimen/notification_content_margin_end"
android:background="@color/notification_guts_bg_color" android:background="@color/notification_material_background_color"
android:theme="@*android:style/Theme.DeviceDefault.Light"> android:theme="@*android:style/Theme.DeviceDefault.Light">
<!-- Package Info --> <!-- Package Info -->

3
packages/SystemUI/res/layout/notification_info.xml
View File

@@ -24,8 +24,7 @@
android:clipChildren="false" android:clipChildren="false"
android:clipToPadding="true" android:clipToPadding="true"
android:orientation="vertical" android:orientation="vertical"
android:paddingStart="@*android:dimen/notification_content_margin_start" android:paddingStart="@*android:dimen/notification_content_margin_start">
android:background="@color/notification_guts_bg_color">
<!-- Package Info --> <!-- Package Info -->
<RelativeLayout <RelativeLayout

2
packages/SystemUI/res/layout/notification_snooze.xml
View File

@@ -21,7 +21,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:orientation="vertical"
android:clickable="true" android:clickable="true"
android:background="@color/notification_guts_bg_color" android:background="@color/notification_material_background_color"
android:theme="@style/Theme.SystemUI"> android:theme="@style/Theme.SystemUI">
<RelativeLayout <RelativeLayout

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

@@ -39,23 +39,16 @@
<!-- 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>
<!-- The "inside" of a notification, reached via longpress -->
<color name="notification_guts_bg_color">@color/GM2_grey_900</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_dark</color> <color name="notification_primary_text_color">@*android:color/notification_primary_text_color_dark</color>
<color name="notification_guts_link_icon_tint">@color/GM2_grey_500</color> <color name="notification_guts_link_icon_tint">@color/GM2_grey_500</color>
<color name="notification_guts_sub_text_color">@color/GM2_grey_300</color> <color name="notification_guts_sub_text_color">@color/GM2_grey_300</color>
<color name="notification_guts_header_text_color">@color/GM2_grey_200</color> <color name="notification_guts_header_text_color">@color/GM2_grey_200</color>
<color name="notification_guts_info_button_color">@color/GM2_blue_300</color>
<color name="notification_guts_priority_button_content_color">@color/GM2_grey_500</color> <color name="notification_guts_priority_button_content_color">@color/GM2_grey_500</color>
<color name="notification_guts_priority_button_content_color_selected">@color/GM2_blue_300</color>
<color name="notification_guts_priority_button_bg_fill_color">@color/transparent</color> <color name="notification_guts_priority_button_bg_fill_color">@color/transparent</color>
<color name="notification_guts_priority_button_bg_fill_color_selected">@color/GM2_grey_800</color> <color name="notification_guts_priority_button_bg_fill_color_selected">@color/GM2_grey_800</color>
<color name="notification_guts_priority_button_bg_stroke_color">@color/GM2_grey_700</color> <color name="notification_guts_priority_button_bg_stroke_color">@color/GM2_grey_700</color>
<color name="notification_guts_priority_button_bg_stroke_color_selected">@color/GM2_blue_300</color>
<color name="notification_section_header_label_color">@color/GM2_grey_200</color> <color name="notification_section_header_label_color">@color/GM2_grey_200</color>
<color name="notification_section_clear_all_btn_color">@color/GM2_grey_500</color> <color name="notification_section_clear_all_btn_color">@color/GM2_grey_500</color>
<color name="notification_channel_dialog_separator">@color/GM2_grey_700</color> <color name="notification_channel_dialog_separator">@color/GM2_grey_700</color>

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

@@ -88,21 +88,16 @@
<!-- 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>
<!-- The "inside" of a notification, reached via longpress -->
<color name="notification_guts_bg_color">@color/GM2_grey_50</color>
<color name="notification_guts_link_icon_tint">@color/GM2_grey_700</color> <color name="notification_guts_link_icon_tint">@color/GM2_grey_700</color>
<color name="notification_guts_sub_text_color">@color/GM2_grey_700</color> <color name="notification_guts_sub_text_color">@color/GM2_grey_700</color>
<color name="notification_guts_header_text_color">@color/GM2_grey_900</color> <color name="notification_guts_header_text_color">@color/GM2_grey_900</color>
<color name="notification_silence_color">#FF32c1de</color> <color name="notification_silence_color">#FF32c1de</color>
<color name="notification_alert_color">#FFF87B2B</color> <color name="notification_alert_color">#FFF87B2B</color>
<color name="notification_guts_info_button_color">@color/GM2_blue_700</color>
<color name="notification_guts_priority_button_content_color">@color/GM2_grey_700</color> <color name="notification_guts_priority_button_content_color">@color/GM2_grey_700</color>
<color name="notification_guts_priority_button_content_color_selected">@color/GM2_blue_700</color>
<color name="notification_guts_priority_button_bg_fill_color">@color/transparent</color> <color name="notification_guts_priority_button_bg_fill_color">@color/transparent</color>
<color name="notification_guts_priority_button_bg_fill_color_selected">#FFFFFF</color> <color name="notification_guts_priority_button_bg_fill_color_selected">#FFFFFF</color>
<color name="notification_guts_priority_button_bg_stroke_color">@color/GM2_grey_300</color> <color name="notification_guts_priority_button_bg_stroke_color">@color/GM2_grey_300</color>
<color name="notification_guts_priority_button_bg_stroke_color_selected">@color/GM2_blue_600</color>
<color name="notification_section_header_label_color">@color/GM2_grey_900</color> <color name="notification_section_header_label_color">@color/GM2_grey_900</color>
<color name="notification_section_clear_all_btn_color">@color/GM2_grey_700</color> <color name="notification_section_clear_all_btn_color">@color/GM2_grey_700</color>

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

@@ -514,7 +514,7 @@
<style name="TextAppearance.NotificationInfo.Button"> <style name="TextAppearance.NotificationInfo.Button">
<item name="android:fontFamily">@*android:string/config_headlineFontFamilyMedium</item> <item name="android:fontFamily">@*android:string/config_headlineFontFamilyMedium</item>
<item name="android:textSize">14sp</item> <item name="android:textSize">14sp</item>
<item name="android:textColor">@color/notification_guts_info_button_color</item> <item name="android:textColor">?android:attr/colorAccent</item>
<item name="android:background">@drawable/btn_borderless_rect</item> <item name="android:background">@drawable/btn_borderless_rect</item>
<item name="android:gravity">center_vertical</item> <item name="android:gravity">center_vertical</item>
<item name="android:focusable">true</item> <item name="android:focusable">true</item>
@@ -550,7 +550,7 @@
<style name="TextAppearance.NotificationImportanceButton"> <style name="TextAppearance.NotificationImportanceButton">
<item name="android:textSize">@dimen/notification_importance_button_text</item> <item name="android:textSize">@dimen/notification_importance_button_text</item>
<item name="android:fontFamily">@*android:string/config_headlineFontFamilyMedium</item> <item name="android:fontFamily">@*android:string/config_headlineFontFamilyMedium</item>
<item name="android:textColor">@color/notification_guts_priority_contents</item> <item name="android:textColor">?android:attr/colorAccent</item>
<item name="android:gravity">center</item> <item name="android:gravity">center</item>
</style> </style>