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

Merge "Dark mode support for user consent dialog when device log access is requested" into tm-dev am: e30c53d99e

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

Change-Id: I7c4914f8808fa342190865e15f6a361c7f5d0fc6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Lucas Dupin
2022-04-11 16:54:49 +00:00
committed by Automerger Merge Worker
parent 75a1071f76 e30c53d99e
commit 1dab4fbb07
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/res/res/layout/log_access_user_consent_dialog_permission.xml
View File

@@ -47,6 +47,7 @@
android:layout_marginBottom="32dp" android:layout_marginBottom="32dp"
android:text="@string/log_access_confirmation_title" android:text="@string/log_access_confirmation_title"
android:textAppearance="@style/AllowLogAccess" android:textAppearance="@style/AllowLogAccess"
android:textColor="?android:attr/textColorPrimary"
android:gravity="center" /> android:gravity="center" />
<TextView <TextView
@@ -56,6 +57,7 @@
android:layout_marginBottom="40dp" android:layout_marginBottom="40dp"
android:text="@string/log_access_confirmation_body" android:text="@string/log_access_confirmation_body"
android:textAppearance="@style/PrimaryAllowLogAccess" android:textAppearance="@style/PrimaryAllowLogAccess"
android:textColor="?android:attr/textColorPrimary"
android:gravity="center" /> android:gravity="center" />
<Button <Button

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

@@ -1500,15 +1500,13 @@ please see styles_device_defaults.xml.
</style> </style>
<!-- The style for log access consent text --> <!-- 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:layout_width">332dp</item>
<item name="android:textSize">24sp</item> <item name="android:textSize">24sp</item>
<item name="android:fontFamily">google-sans</item> <item name="android:fontFamily">google-sans</item>
</style> </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:layout_width">332dp</item>
<item name="android:textSize">14sp</item> <item name="android:textSize">14sp</item>
<item name="android:fontFamily">google-sans-text</item> <item name="android:fontFamily">google-sans-text</item>