Merge "Fix low contrast text in add user dialog." into udc-dev am: 59ecd6a40a

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23450544

Change-Id: I5ca19d41f39d753796ed3e929550cd7db51a1a05
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Oli Lan
2023-05-30 11:14:51 +00:00
committed by Automerger Merge Worker

View File

@@ -17,6 +17,7 @@
<resources xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"> <resources xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">
<style name="TextAppearanceSmall"> <style name="TextAppearanceSmall">
<item name="android:textAppearance">?android:attr/textAppearanceSmall</item> <item name="android:textAppearance">?android:attr/textAppearanceSmall</item>
<item name="android:textColor">?android:attr/textColorSecondary</item>
</style> </style>
<style name="TextAppearanceMedium"> <style name="TextAppearanceMedium">
<item name="android:textAppearance">?android:attr/textAppearanceMedium</item> <item name="android:textAppearance">?android:attr/textAppearanceMedium</item>
@@ -91,7 +92,7 @@
<item name="android:ellipsize">end</item> <item name="android:ellipsize">end</item>
</style> </style>
<style name="DialogButtonPositive" xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"> <style name="DialogButtonPositive">
<item name="android:buttonCornerRadius">0dp</item> <item name="android:buttonCornerRadius">0dp</item>
<item name="android:background">@drawable/dialog_btn_filled</item> <item name="android:background">@drawable/dialog_btn_filled</item>
<item name="android:textColor">?androidprv:attr/textColorOnAccent</item> <item name="android:textColor">?androidprv:attr/textColorOnAccent</item>
@@ -105,7 +106,6 @@
<style name="DialogButtonNegative"> <style name="DialogButtonNegative">
<item name="android:buttonCornerRadius">28dp</item> <item name="android:buttonCornerRadius">28dp</item>
<item name="android:background">@drawable/dialog_btn_outline</item> <item name="android:background">@drawable/dialog_btn_outline</item>
<item name="android:buttonCornerRadius">28dp</item>
<item name="android:textColor">?android:attr/textColorPrimary</item> <item name="android:textColor">?android:attr/textColorPrimary</item>
<item name="android:textSize">14sp</item> <item name="android:textSize">14sp</item>
<item name="android:lineHeight">20sp</item> <item name="android:lineHeight">20sp</item>