diff options
| author | 2022-04-11 15:39:13 +0000 | |
|---|---|---|
| committer | 2022-04-11 15:39:13 +0000 | |
| commit | db35306275c7822e662d5287eb60fe7b7d28e0c7 (patch) | |
| tree | 402487fe1ed9e4113935ed03679a724b2bb9590d | |
| parent | 2ae4a5bc60856cea215cd8014ad7f99e254a1d7f (diff) | |
| parent | 2211b3599275d65ec71f02577f68b1f52bc74274 (diff) | |
Merge "Update font/color of user consent dialog for device log access" into tm-dev am: 2211b35992
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17664084
Change-Id: I2ae763684a2307f81cab2649c4ac1554389103aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | core/res/res/layout/log_access_user_consent_dialog_permission.xml | 8 | ||||
| -rw-r--r-- | core/res/res/values/styles.xml | 10 |
2 files changed, 9 insertions, 9 deletions
diff --git a/core/res/res/layout/log_access_user_consent_dialog_permission.xml b/core/res/res/layout/log_access_user_consent_dialog_permission.xml index bd7efbd59c33..400d4c231cf3 100644 --- a/core/res/res/layout/log_access_user_consent_dialog_permission.xml +++ b/core/res/res/layout/log_access_user_consent_dialog_permission.xml @@ -37,8 +37,8 @@ android:src="@drawable/ic_doc_document" tools:layout_editor_absoluteX="148dp" tools:layout_editor_absoluteY="35dp" - android:gravity="center" /> - + android:gravity="center" + android:tint="?attr/colorAccentPrimaryVariant"/> <TextView android:id="@+id/log_access_dialog_title" @@ -46,14 +46,14 @@ android:layout_width="wrap_content" android:layout_marginBottom="32dp" android:text="@string/log_access_confirmation_title" - android:textAppearance="?attr/textAppearanceLarge" - android:textColor="@android:color/system_neutral1_900" + android:textAppearance="@style/AllowLogAccess" android:gravity="center" /> <TextView android:id="@+id/log_access_dialog_body" android:layout_height="wrap_content" android:layout_width="wrap_content" + android:layout_marginBottom="40dp" android:text="@string/log_access_confirmation_body" android:textAppearance="@style/PrimaryAllowLogAccess" android:gravity="center" /> diff --git a/core/res/res/values/styles.xml b/core/res/res/values/styles.xml index 7a9f520b4d3c..6a9d3ac0044f 100644 --- a/core/res/res/values/styles.xml +++ b/core/res/res/values/styles.xml @@ -1500,18 +1500,18 @@ please see styles_device_defaults.xml. </style> <!-- The style for log access consent text --> - <style name="AllowLogAccess"> + <style name="AllowLogAccess" + parent="@android:style/Theme.DeviceDefault.Dialog.Alert.DayNight"> <item name="android:layout_width">332dp</item> <item name="android:textSize">24sp</item> - <item name="android:textColor">@android:color/system_neutral1_900</item> <item name="android:fontFamily">google-sans</item> </style> - <style name="PrimaryAllowLogAccess"> + <style name="PrimaryAllowLogAccess" + parent="@android:style/Theme.DeviceDefault.Dialog.Alert.DayNight"> <item name="android:layout_width">332dp</item> <item name="android:textSize">14sp</item> - <item name="android:textColor">@android:color/system_neutral1_900</item> - <item name="android:fontFamily">google-sans</item> + <item name="android:fontFamily">google-sans-text</item> </style> <style name="PermissionGrantButtonTop" |