PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Migrate materialColor* attributes into colors"

Browse Source 
Revert submission 29910036-color-rewrite

Reason for revert: DF Blocking bug:b/383230490 . Reverts will be cherry picked for a .003 release build.

Reverted changes: /q/submissionid:29910036-color-rewrite
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:ed8074008f149acf8e1d472866803ff74c7a5d20)
Merged-In: I1229283119cbebb6f6e837b7bbd65480299086c4
Change-Id: I1229283119cbebb6f6e837b7bbd65480299086c4
This commit is contained in:
Daniel Chapin
2024-12-10 18:34:33 +00:00
committed by Android Build Coastguard Worker
parent cf7284e87f
commit f2cdb1f74f
63 changed files with 127 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
res/drawable/accessibility_contrast_button_background.xml
View File

@@ -22,9 +22,9 @@
<layer-list>
<item>
<shape android:shape="rectangle">
<solid android:color="@androidprv:color/materialColorSurfaceContainerHighest" />
<solid android:color="?androidprv:attr/materialColorSurfaceContainerHighest" />
<stroke
android:color="@androidprv:color/materialColorSecondary"
android:color="?androidprv:attr/materialColorSecondary"
android:width="@dimen/contrast_button_stroke_width" />
<corners android:radius="@dimen/contrast_button_radius"/>
</shape>
@@ -41,7 +41,7 @@
android:viewportHeight="24"
android:tint="?attr/colorControlNormal">
<path
android:fillColor="@androidprv:color/materialColorPrimary"
android:fillColor="?androidprv:attr/materialColorPrimary"
android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10c5.52,0 10,-4.48 10,-10S17.52,2 12,2zM10.59,16.6l-4.24,-4.24l1.41,-1.41l2.83,2.83l5.66,-5.66l1.41,1.41L10.59,16.6z"/>
</vector>
</item>
@@ -55,7 +55,7 @@
android:left="@dimen/contrast_button_stroke_width"
android:right="@dimen/contrast_button_stroke_width">
<shape android:shape="rectangle">
<solid android:color="@androidprv:color/materialColorSurfaceContainerHighest" />
<solid android:color="?androidprv:attr/materialColorSurfaceContainerHighest" />
<corners android:radius="@dimen/contrast_button_radius"/>
</shape>
</item>

2
res/drawable/broadcast_button_outline.xml
View File

@@ -29,7 +29,7 @@
<shape android:shape="rectangle">
<corners android:radius="24dp"/>
<solid android:color="@android:color/transparent"/>
<stroke android:color="@androidprv:color/materialColorPrimaryContainer"
<stroke android:color="?androidprv:attr/materialColorPrimaryContainer"
android:width="1dp"
/>
<padding android:left="16dp"

2
res/drawable/color_contrast_preview_background.xml
View File

@@ -17,6 +17,6 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
android:shape="rectangle" >
<solid android:color="@androidprv:color/materialColorSurfaceContainerHigh"/>
<solid android:color="?androidprv:attr/materialColorSurfaceContainerHigh"/>
<corners android:radius="20dp" />
</shape>

2
res/drawable/color_contrast_preview_bottom_appbar_background.xml
View File

@@ -17,7 +17,7 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
android:shape="rectangle" >
<solid android:color="@androidprv:color/materialColorSurfaceContainer"/>
<solid android:color="?androidprv:attr/materialColorSurfaceContainer"/>
<corners
android:bottomLeftRadius="20dp"
android:bottomRightRadius="20dp"

2
res/drawable/color_contrast_preview_button_background.xml
View File

@@ -17,6 +17,6 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
android:shape="rectangle" >
<solid android:color="@androidprv:color/materialColorTertiaryContainer"/>
<solid android:color="?androidprv:attr/materialColorTertiaryContainer"/>
<corners android:radius="7dp" />
</shape>

2
res/drawable/color_contrast_preview_dialog_background.xml
View File

@@ -17,6 +17,6 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
android:shape="rectangle" >
<solid android:color="@androidprv:color/materialColorSurfaceContainerLow"/>
<solid android:color="?androidprv:attr/materialColorSurfaceContainerLow"/>
<corners android:radius="12dp" />
</shape>

2
res/drawable/color_contrast_preview_icon_edit_background.xml
View File

@@ -17,6 +17,6 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
android:shape="rectangle" >
<solid android:color="@androidprv:color/materialColorPrimaryContainer"/>
<solid android:color="?androidprv:attr/materialColorPrimaryContainer"/>
<corners android:radius="24dp" />
</shape>

2
res/drawable/color_contrast_preview_icon_group_background.xml
View File

@@ -17,6 +17,6 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
android:shape="oval" >
<solid android:color="@androidprv:color/materialColorSurfaceContainerHighest"/>
<solid android:color="?androidprv:attr/materialColorSurfaceContainerHighest"/>
<size android:width="36dp" android:height="36dp" />
</shape>

2
res/drawable/color_contrast_preview_icon_inbox_background.xml
View File

@@ -17,7 +17,7 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
android:shape="rectangle" >
<solid android:color="@androidprv:color/materialColorSecondaryContainer"/>
<solid android:color="?androidprv:attr/materialColorSecondaryContainer"/>
<corners android:radius="20dp" />
<size android:height="30dp" android:width="60dp" />
</shape>

2
res/drawable/color_contrast_preview_icon_star_background.xml
View File

@@ -17,6 +17,6 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
android:shape="oval" >
<solid android:color="@androidprv:color/materialColorPrimary"/>
<solid android:color="?androidprv:attr/materialColorPrimary"/>
<size android:width="36dp" android:height="36dp" />
</shape>

2
res/drawable/color_contrast_preview_tag_background.xml
View File

@@ -17,6 +17,6 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
android:shape="rectangle" >
<solid android:color="@androidprv:color/materialColorSurfaceContainerHighest"/>
<solid android:color="?androidprv:attr/materialColorSurfaceContainerHighest"/>
<corners android:radius="4dp" />
</shape>

2
res/drawable/dream_default_preview_icon.xml
View File

@@ -20,6 +20,6 @@
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path android:fillColor="@androidprv:color/materialColorOnSurfaceVariant"
<path android:fillColor="?androidprv:attr/materialColorOnSurfaceVariant"
android:pathData="M3,19Q2.175,19 1.588,18.413Q1,17.825 1,17V7Q1,6.175 1.588,5.588Q2.175,5 3,5H13Q13.825,5 14.413,5.588Q15,6.175 15,7V17Q15,17.825 14.413,18.413Q13.825,19 13,19ZM3,17H13Q13,17 13,17Q13,17 13,17V7Q13,7 13,7Q13,7 13,7H3Q3,7 3,7Q3,7 3,7V17Q3,17 3,17Q3,17 3,17ZM17,19V5H19V19ZM21,19V5H23V19ZM4,15H12L9.4,11.5L7.5,14L6.1,12.15ZM3,7Q3,7 3,7Q3,7 3,7V17Q3,17 3,17Q3,17 3,17Q3,17 3,17Q3,17 3,17V7Q3,7 3,7Q3,7 3,7Z"/>
</vector>

2
res/drawable/dream_preview_rounded_bg.xml
View File

@@ -17,6 +17,6 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
android:shape="rectangle">
<solid android:color="@androidprv:color/materialColorSurfaceContainer" />
<solid android:color="?androidprv:attr/materialColorSurfaceContainer" />
<corners android:radius="@dimen/dream_item_corner_radius"/>
</shape>

2
res/drawable/ic_article_24dp.xml
View File

@@ -22,6 +22,6 @@
android:tint="?attr/colorControlNormal"
android:autoMirrored="true">
<path
android:fillColor="@androidprv:color/materialColorOnSurfaceVariant"
android:fillColor="?androidprv:attr/materialColorOnSurfaceVariant"
android:pathData="M19,5v14L5,19L5,5h14m0,-2L5,3c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2L21,5c0,-1.1 -0.9,-2 -2,-2zM14,17L7,17v-2h7v2zM17,13L7,13v-2h10v2zM17,9L7,9L7,7h10v2z"/>
</vector>

2
res/drawable/ic_article_filled_24dp.xml
View File

@@ -21,6 +21,6 @@
android:viewportHeight="24"
android:tint="?attr/colorControlNormal">
<path
android:fillColor="@androidprv:color/materialColorOnTertiaryContainer"
android:fillColor="?androidprv:attr/materialColorOnTertiaryContainer"
android:pathData="M19,3H5C3.9,3 3,3.9 3,5v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2V5C21,3.9 20.1,3 19,3zM14,17H7v-2h7V17zM17,13H7v-2h10V13zM17,9H7V7h10V9z"/>
</vector>

2
res/drawable/ic_chat_bubble_24dp.xml
View File

@@ -21,6 +21,6 @@
android:viewportHeight="24"
android:tint="?attr/colorControlNormal">
<path
android:fillColor="@androidprv:color/materialColorOnSurfaceVariant"
android:fillColor="?androidprv:attr/materialColorOnSurfaceVariant"
android:pathData="M20,2L4,2c-1.1,0 -2,0.9 -2,2v18l4,-4h14c1.1,0 2,-0.9 2,-2L22,4c0,-1.1 -0.9,-2 -2,-2zM20,16L4,16L4,4h16v12z"/>
</vector>

2
res/drawable/ic_edit_24dp.xml
View File

@@ -21,6 +21,6 @@
android:viewportHeight="24"
android:tint="?attr/colorControlNormal">
<path
android:fillColor="@androidprv:color/materialColorOnPrimaryContainer"
android:fillColor="?androidprv:attr/materialColorOnPrimaryContainer"
android:pathData="M20.41,4.94l-1.35,-1.35c-0.78,-0.78 -2.05,-0.78 -2.83,0L3,16.82L3,21h4.18L20.41,7.77c0.79,-0.78 0.79,-2.05 0,-2.83zM6.41,19.06L5,19v-1.36l9.82,-9.82 1.41,1.41 -9.82,9.83z"/>
</vector>

2
res/drawable/ic_group_24dp.xml
View File

@@ -21,6 +21,6 @@
android:viewportHeight="24"
android:tint="?attr/colorControlNormal">
<path
android:fillColor="@androidprv:color/materialColorSecondary"
android:fillColor="?androidprv:attr/materialColorSecondary"
android:pathData="M15,8c0,-1.42 -0.5,-2.73 -1.33,-3.76C14.09,4.1 14.53,4 15,4c2.21,0 4,1.79 4,4s-1.79,4 -4,4c-0.43,0 -0.84,-0.09 -1.23,-0.21c-0.03,-0.01 -0.06,-0.02 -0.1,-0.03C14.5,10.73 15,9.42 15,8zM16.66,13.13C18.03,14.06 19,15.32 19,17v3h4v-3C23,14.82 19.42,13.53 16.66,13.13zM9,4c2.21,0 4,1.79 4,4s-1.79,4 -4,4s-4,-1.79 -4,-4S6.79,4 9,4zM9,13c2.67,0 8,1.34 8,4v3H1v-3C1,14.34 6.33,13 9,13z"/>
</vector>

2
res/drawable/ic_inbox_24dp.xml
View File

@@ -21,6 +21,6 @@
android:viewportHeight="24"
android:tint="?attr/colorControlNormal">
<path
android:fillColor="@androidprv:color/materialColorOnSecondaryContainer"
android:fillColor="?androidprv:attr/materialColorOnSecondaryContainer"
android:pathData="M19,3H5C3.9,3 3,3.9 3,5v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2V5C21,3.9 20.1,3 19,3zM19,5v9h-4.18c-0.41,1.16 -1.51,2 -2.82,2s-2.4,-0.84 -2.82,-2H5V5H19z"/>
</vector>

2
res/drawable/ic_modifier_keys_reset.xml
View File

@@ -21,7 +21,7 @@
android:height="24.0dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0"
android:tint="@androidprv:color/materialColorPrimary">
android:tint="?androidprv:attr/materialColorPrimary">
<path
android:fillColor="@android:color/white"
android:pathData="M18,4C13.58,0.69 7.31,1.58 4,6V4H2v6h6V8H5.09c1.44,-2.47 4.09,-3.98 6.94,-3.97c4.42,0.02 7.99,3.61 7.97,8.03s-3.61,7.99 -8.03,7.97C7.55,20.01 3.98,16.42 4,12H2c0,3.15 1.48,6.11 4,8c4.42,3.31 10.69,2.42 14,-2C23.31,13.58 22.42,7.31 18,4z"/>

2
res/drawable/ic_star_24dp.xml
View File

@@ -21,6 +21,6 @@
android:viewportHeight="24"
android:tint="?attr/colorControlNormal">
<path
android:fillColor="@androidprv:color/materialColorOnPrimary"
android:fillColor="?androidprv:attr/materialColorOnPrimary"
android:pathData="M12,17.27L18.18,21l-1.64,-7.03L22,9.24l-7.19,-0.61L12,2 9.19,8.63 2,9.24l5.46,4.73L5.82,21 12,17.27z"/>
</vector>

2
res/drawable/modifier_key_bordered.xml
View File

@@ -25,7 +25,7 @@
<solid android:color="@android:color/transparent"/>
<stroke
android:width="1dp"
android:color="@androidprv:color/materialColorPrimary"/>
android:color="?androidprv:attr/materialColorPrimary"/>
</shape>
</item>
</ripple>

2
res/drawable/modifier_key_colored.xml
View File

@@ -22,7 +22,7 @@
<item>
<shape android:shape="rectangle">
<corners android:radius="24dp"/>
<solid android:color="@androidprv:color/materialColorPrimary"/>
<solid android:color="?androidprv:attr/materialColorPrimary"/>
</shape>
</item>
</ripple>

2
res/drawable/modifier_key_lisetview_background.xml
View File

@@ -22,7 +22,7 @@
<item>
<shape android:shape="rectangle">
<corners android:radius="24dp"/>
<solid android:color="@androidprv:color/materialColorSurfaceContainerHighest"/>
<solid android:color="?androidprv:attr/materialColorSurfaceContainerHighest"/>
</shape>
</item>
</ripple>

2
res/drawable/pointer_icon_fill_container_background.xml
View File

@@ -18,5 +18,5 @@
xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
android:shape="rectangle">
<corners android:radius="20dp" />
<solid android:color="@androidprv:color/materialColorSurfaceContainerHigh"/>
<solid android:color="?androidprv:attr/materialColorSurfaceContainerHigh"/>
</shape>

2
res/drawable/preference_circular_icons_plus_item_background.xml
View File

@@ -21,5 +21,5 @@
<size
android:width="@dimen/zen_mode_circular_icon_diameter"
android:height="@dimen/zen_mode_circular_icon_diameter" />
<solid android:color="@androidprv:color/materialColorSecondaryContainer" />
<solid android:color="?androidprv:attr/materialColorSecondaryContainer" />
</shape>

2
res/drawable/rounded_bg.xml
View File

@@ -17,7 +17,7 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
android:shape="rectangle">
<solid android:color="@androidprv:color/materialColorSurfaceContainer" />
<solid android:color="?androidprv:attr/materialColorSurfaceContainer" />
<corners
android:bottomLeftRadius="?android:attr/dialogCornerRadius"
android:topLeftRadius="?android:attr/dialogCornerRadius"

2
res/drawable/sim_confirm_dialog_btn_outline.xml
View File

@@ -29,7 +29,7 @@
<shape android:shape="rectangle">
<corners android:radius="24dp"/>
<solid android:color="@android:color/transparent"/>
<stroke android:color="@androidprv:color/materialColorPrimaryContainer"
<stroke android:color="?androidprv:attr/materialColorPrimaryContainer"
android:width="1dp" />
<padding android:left="16dp"
android:top="8dp"

2
res/drawable/trackpad_bordered.xml
View File

@@ -25,7 +25,7 @@
<solid android:color="@android:color/transparent"/>
<stroke
android:width="1dp"
android:color="@androidprv:color/materialColorPrimary"/>
android:color="?androidprv:attr/materialColorPrimary"/>
</shape>
</item>
</ripple>

2
res/drawable/trackpad_button_done_colored.xml
View File

@@ -22,7 +22,7 @@
<item>
<shape android:shape="rectangle">
<corners android:radius="24dp"/>
<solid android:color="@androidprv:color/materialColorPrimary"/>
<solid android:color="?androidprv:attr/materialColorPrimary"/>
</shape>
</item>
</ripple>

4
res/drawable/user_select_background.xml
View File

@@ -19,13 +19,13 @@
android:color="@color/settingslib_ripple_color">
<item android:id="@android:id/mask">
<shape android:shape="rectangle">
<solid android:color="@androidprv:color/materialColorSurfaceContainer"/>
<solid android:color="?androidprv:attr/materialColorSurfaceContainer"/>
<corners android:radius="20dp"/>
</shape>
</item>
<item android:id="@android:id/background">
<shape android:shape="rectangle">
<stroke android:color="@androidprv:color/materialColorPrimaryContainer" android:width="1dp"/>
<stroke android:color="?androidprv:attr/materialColorPrimaryContainer" android:width="1dp"/>
<corners android:radius="20dp"/>
</shape>
</item>

2
res/drawable/volume_dialog_button_background_outline.xml
View File

@@ -21,7 +21,7 @@
<shape
android:shape="rectangle">
<stroke
android:color="@androidprv:color/materialColorPrimaryContainer"
android:color="?androidprv:attr/materialColorPrimaryContainer"
android:width="1dp"/>
<corners android:radius="24dp"/>
<padding