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

Merge "New color spec" into sc-dev

Browse Source
This commit is contained in:
Lucas Dupin
2021-04-12 18:38:14 +00:00
committed by Android (Google) Code Review
parent fd9477d782 73efcfcf15
commit 76524088d0
7 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/res/res/color/surface_light.xml
View File

@@ -14,5 +14,5 @@
limitations under the License. limitations under the License.
--> -->
<selector xmlns:android="http://schemas.android.com/apk/res/android"> <selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@color/system_neutral1_500" android:lStar="97" /> <item android:color="@color/system_neutral1_500" android:lStar="98" />
</selector> </selector>

6
core/res/res/values/colors_device_defaults.xml
View File

@@ -48,10 +48,10 @@
<color name="accent_tertiary_variant_dark_device_default">@color/system_accent3_300</color> <color name="accent_tertiary_variant_dark_device_default">@color/system_accent3_300</color>
<!-- Background colors --> <!-- Background colors -->
<color name="background_device_default_dark">@color/system_neutral1_800</color> <color name="background_device_default_dark">@color/system_neutral1_900</color>
<color name="background_device_default_light">@color/system_neutral1_50</color> <color name="background_device_default_light">@color/system_neutral1_50</color>
<color name="background_floating_device_default_dark">@color/system_neutral1_900</color> <color name="background_floating_device_default_dark">@color/background_device_default_dark</color>
<color name="background_floating_device_default_light">@color/system_neutral1_100</color> <color name="background_floating_device_default_light">@color/background_device_default_light</color>
<!-- Surface colors --> <!-- Surface colors -->
<color name="surface_header_dark">@color/system_neutral1_700</color> <color name="surface_header_dark">@color/system_neutral1_700</color>

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

@@ -17,7 +17,7 @@
*/ */
--> -->
<resources> <resources xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">
<!-- Keyguard PIN pad styles --> <!-- Keyguard PIN pad styles -->
<style name="Keyguard.TextView" parent="@android:style/Widget.DeviceDefault.TextView"> <style name="Keyguard.TextView" parent="@android:style/Widget.DeviceDefault.TextView">
<item name="android:textSize">@dimen/kg_status_line_font_size</item> <item name="android:textSize">@dimen/kg_status_line_font_size</item>
@@ -32,7 +32,7 @@
<item name="android:stateListAnimator">@null</item> <item name="android:stateListAnimator">@null</item>
</style> </style>
<style name="NumPadKey" parent="Theme.SystemUI"> <style name="NumPadKey" parent="Theme.SystemUI">
<item name="android:colorControlNormal">?android:attr/colorBackground</item> <item name="android:colorControlNormal">?androidprv:attr/colorSurface</item>
<item name="android:colorControlHighlight">?android:attr/colorAccent</item> <item name="android:colorControlHighlight">?android:attr/colorAccent</item>
<item name="android:background">@drawable/num_pad_key_background</item> <item name="android:background">@drawable/num_pad_key_background</item>
</style> </style>

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

@@ -15,8 +15,9 @@
~ limitations under the License ~ limitations under the License
--> -->
<shape xmlns:android="http://schemas.android.com/apk/res/android"> <shape xmlns:android="http://schemas.android.com/apk/res/android"
<solid android:color="?android:attr/colorBackground" /> xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">
<solid android:color="?androidprv:attr/colorSurface" />
<!--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>

3
packages/SystemUI/res/drawable/notification_material_bg.xml
View File

@@ -16,10 +16,11 @@
--> -->
<ripple xmlns:android="http://schemas.android.com/apk/res/android" <ripple xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
android:color="@color/notification_ripple_untinted_color"> android:color="@color/notification_ripple_untinted_color">
<item> <item>
<shape> <shape>
<solid android:color="?android:attr/colorBackground" /> <solid android:color="?androidprv:attr/colorSurface" />
</shape> </shape>
</item> </item>
</ripple> </ripple>

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

@@ -33,7 +33,7 @@
<!-- 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="notif_pill_background">@android:color/system_neutral1_800</color> <color name="notif_pill_background">@*android:color/surface_dark</color>
<color name="notif_pill_text">@android:color/system_neutral1_50</color> <color name="notif_pill_text">@android:color/system_neutral1_50</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>

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

@@ -157,7 +157,7 @@
<color name="minimize_dock_shadow_end">#00000000</color> <color name="minimize_dock_shadow_end">#00000000</color>
<color name="default_remote_input_background">@*android:color/notification_default_color</color> <color name="default_remote_input_background">@*android:color/notification_default_color</color>
<color name="notif_pill_background">@android:color/system_neutral2_100</color> <color name="notif_pill_background">@*android:color/surface_light</color>
<color name="notif_pill_text">@android:color/system_neutral1_900</color> <color name="notif_pill_text">@android:color/system_neutral1_900</color>
<color name="remote_input_accent">?android:attr/colorAccent</color> <color name="remote_input_accent">?android:attr/colorAccent</color>