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

14
res/layout/accessibility_color_contrast_preview.xml
View File

@@ -31,7 +31,7 @@
android:id="@+id/preview_background"
android:layout_width="0dp"
android:layout_height="0dp"
android:background="@androidprv:color/materialColorSurface"
android:background="?androidprv:attr/materialColorSurface"
app:layout_constraintBottom_toTopOf="@+id/bottom_appbar_background"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -96,7 +96,7 @@
android:maxLines="1"
android:paddingEnd="10dp"
android:text="@string/color_contrast_preview_sender_name"
android:textColor="@androidprv:color/materialColorOnSurface"
android:textColor="?androidprv:attr/materialColorOnSurface"
android:textSize="12sp"
app:layout_constraintEnd_toStartOf="@+id/email_tag"
app:layout_constraintHorizontal_bias="0"
@@ -116,7 +116,7 @@
android:maxLines="1"
android:paddingHorizontal="4dp"
android:text="@string/color_contrast_preview_email_badge"
android:textColor="@androidprv:color/materialColorOnSurface"
android:textColor="?androidprv:attr/materialColorOnSurface"
android:textSize="11sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/sender_name"
@@ -134,7 +134,7 @@
android:ellipsize="end"
android:maxLines="1"
android:text="@string/color_contrast_preview_email_send_date"
android:textColor="@androidprv:color/materialColorOnSurfaceVariant"
android:textColor="?androidprv:attr/materialColorOnSurfaceVariant"
android:textSize="11sp"
app:layout_constrainedWidth="true"
app:layout_constraintEnd_toEndOf="@+id/email_background"
@@ -173,7 +173,7 @@
android:ellipsize="end"
android:maxLines="1"
android:text="@string/color_contrast_preview_email_title"
android:textColor="@androidprv:color/materialColorOnSurface"
android:textColor="?androidprv:attr/materialColorOnSurface"
android:textSize="16sp"
app:layout_constrainedWidth="true"
app:layout_constraintEnd_toEndOf="@+id/email_main_background"
@@ -189,7 +189,7 @@
android:maxLines="2"
android:paddingBottom="8dp"
android:text="@string/color_contrast_preview_email_body"
android:textColor="@androidprv:color/materialColorOnSurfaceVariant"
android:textColor="?androidprv:attr/materialColorOnSurfaceVariant"
android:textSize="12sp"
app:layout_constrainedWidth="true"
app:layout_constraintEnd_toEndOf="@+id/email_main_background"
@@ -228,7 +228,7 @@
android:maxLines="1"
android:paddingEnd="10dp"
android:text="@string/color_contrast_preview_email_attachment_name"
android:textColor="@androidprv:color/materialColorOnTertiaryContainer"
android:textColor="?androidprv:attr/materialColorOnTertiaryContainer"
android:textSize="12sp"
app:layout_constrainedWidth="true"
app:layout_constraintBottom_toBottomOf="@+id/attachment_background"

6
res/layout/accessibility_color_contrast_selector.xml
View File

@@ -72,7 +72,7 @@
android:singleLine="true"
android:textSize="@dimen/contrast_button_text_size"
android:text="@string/contrast_default"
android:textColor="@androidprv:color/materialColorOnSurface"/>
android:textColor="?androidprv:attr/materialColorOnSurface"/>
</LinearLayout>
<Space
@@ -107,7 +107,7 @@
android:singleLine="true"
android:textSize="@dimen/contrast_button_text_size"
android:text="@string/contrast_medium"
android:textColor="@androidprv:color/materialColorOnSurface"/>
android:textColor="?androidprv:attr/materialColorOnSurface"/>
</LinearLayout>
<Space
@@ -142,7 +142,7 @@
android:singleLine="true"
android:textSize="@dimen/contrast_button_text_size"
android:text="@string/contrast_high"
android:textColor="@androidprv:color/materialColorOnSurface"/>
android:textColor="?androidprv:attr/materialColorOnSurface"/>
</LinearLayout>
<Space

2
res/layout/homepage_preference.xml
View File

@@ -78,7 +78,7 @@
android:layout_gravity="start"
android:textAlignment="viewStart"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@androidprv:color/materialColorOnSurfaceVariant"
android:textColor="?androidprv:attr/materialColorOnSurfaceVariant"
android:maxLines="4"
android:hyphenationFrequency="normalFast"
android:lineBreakWordStyle="phrase"

2
res/layout/homepage_preference_v2.xml
View File

@@ -78,7 +78,7 @@
android:layout_gravity="start"
android:textAlignment="viewStart"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@androidprv:color/materialColorOnSurfaceVariant"
android:textColor="?androidprv:attr/materialColorOnSurfaceVariant"
android:maxLines="4"
android:hyphenationFrequency="normalFast"
android:lineBreakWordStyle="phrase"

2
res/layout/modifier_key_item.xml
View File

@@ -31,7 +31,7 @@
android:ellipsize="marquee"
android:fadingEdge="horizontal"
android:src="@drawable/ic_check_24dp"
android:tint="@androidprv:color/materialColorPrimary"/>
android:tint="?androidprv:attr/materialColorPrimary"/>
<TextView
android:id="@+id/modifier_key_text"

2
res/layout/modifier_key_picker_dialog.xml
View File

@@ -107,7 +107,7 @@
android:paddingVertical="14dp"
android:drawablePadding="9dp"
style="@style/ModifierKeyButtonDone"
android:textColor="@androidprv:color/materialColorOnPrimary"
android:textColor="?androidprv:attr/materialColorOnPrimary"
android:text="@string/modifier_keys_done"/>
</RelativeLayout>

4
res/layout/notification_ls_minimalism_selector.xml
View File

@@ -74,7 +74,7 @@
android:singleLine="true"
android:textSize="@dimen/contrast_button_text_size"
android:text="@string/lock_screen_notifs_show_compact"
android:textColor="@androidprv:color/materialColorOnSurface"/>
android:textColor="?androidprv:attr/materialColorOnSurface"/>
</LinearLayout>
<Space
@@ -109,7 +109,7 @@
android:singleLine="true"
android:textSize="@dimen/contrast_button_text_size"
android:text="@string/lock_screen_notifs_show_full_list"
android:textColor="@androidprv:color/materialColorOnSurface"/>
android:textColor="?androidprv:attr/materialColorOnSurface"/>
</LinearLayout>
<Space

2
res/layout/pointer_icon_fill_style_layout.xml
View File

@@ -32,7 +32,7 @@
android:layout_marginTop="@dimen/pointer_fill_style_circle_padding"
android:text="@string/pointer_fill_style"
android:textSize="14sp"
android:textColor="@androidprv:color/materialColorPrimary"
android:textColor="?androidprv:attr/materialColorPrimary"
android:textAlignment="viewStart"
android:fontWeight="500" />

2
res/layout/pointer_icon_stroke_style_layout.xml
View File

@@ -31,7 +31,7 @@
android:layout_marginTop="@dimen/pointer_stroke_style_padding"
android:text="@string/pointer_stroke_style"
android:textSize="14sp"
android:textColor="@androidprv:color/materialColorPrimary"
android:textColor="?androidprv:attr/materialColorPrimary"
android:textAlignment="viewStart"
android:fontWeight="500"
android:textAppearance="?android:attr/textAppearanceListItem" />

4
res/layout/preference_background.xml
View File

@@ -65,7 +65,7 @@
android:layout_height="wrap_content"
android:singleLine="true"
android:textAppearance="?android:attr/textAppearanceListItem"
android:textColor="@androidprv:color/materialColorOnPrimaryContainer"
android:textColor="?androidprv:attr/materialColorOnPrimaryContainer"
android:ellipsize="marquee"
android:fadingEdge="horizontal"
android:hyphenationFrequency="normalFast"
@@ -78,7 +78,7 @@
android:layout_alignStart="@android:id/title"
android:layout_alignLeft="@android:id/title"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@androidprv:color/materialColorOnPrimaryContainer"
android:textColor="?androidprv:attr/materialColorOnPrimaryContainer"
android:hyphenationFrequency="normalFast"
android:lineBreakWordStyle="phrase"
android:maxLines="4"

2
res/layout/preference_circular_icons_plus_item.xml
View File

@@ -26,7 +26,7 @@
android:padding="4dp"
android:drawablePadding="0dp"
android:background="@drawable/preference_circular_icons_plus_item_background"
android:textColor="@androidprv:color/materialColorOnSecondaryContainer"
android:textColor="?androidprv:attr/materialColorOnSecondaryContainer"
android:maxLines="1"
android:autoSizeTextType="uniform"
android:autoSizeMinTextSize="6sp" />

2
res/layout/preference_widget_arrow.xml
View File

@@ -23,5 +23,5 @@
android:layout_gravity="center_vertical"
android:contentDescription="@null"
android:scaleType="center"
android:tint="@androidprv:color/materialColorOnPrimaryContainer"
android:tint="?androidprv:attr/materialColorOnPrimaryContainer"
android:src="@drawable/ic_arrow_forward" />

4
res/layout/trackpad_gesture_preview.xml
View File

@@ -82,7 +82,7 @@
android:paddingVertical="14dp"
android:drawablePadding="9dp"
style="@style/TrackpadButtonDone"
android:textColor="@androidprv:color/materialColorOnPrimary"
android:textColor="?androidprv:attr/materialColorOnPrimary"
android:text="@string/gesture_button_next"/>
<Button
@@ -96,7 +96,7 @@
android:paddingVertical="14dp"
android:drawablePadding="9dp"
style="@style/TrackpadButtonDone"
android:textColor="@androidprv:color/materialColorOnPrimary"
android:textColor="?androidprv:attr/materialColorOnPrimary"
android:text="@string/gesture_button_done"/>
</RelativeLayout>