diff options
| author | 2022-04-11 16:52:04 +0000 | |
|---|---|---|
| committer | 2022-04-11 16:52:04 +0000 | |
| commit | e30c53d99ec03c99960dfa7556221544b91aefe0 (patch) | |
| tree | d55bc7e8722146aa49e9fff0f5f7248ff51fd2cb | |
| parent | ff986fe4cce5d57de26610cdc440169d97a6cfb4 (diff) | |
| parent | 50d7143faaca1ba2067bd75b5b18dea4e32ce598 (diff) | |
Merge "Dark mode support for user consent dialog when device log access is requested" into tm-dev
| -rw-r--r-- | core/res/res/layout/log_access_user_consent_dialog_permission.xml | 2 | ||||
| -rw-r--r-- | core/res/res/values/styles.xml | 6 |
2 files changed, 4 insertions, 4 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 400d4c231cf3..c88bc9282708 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 @@ -47,6 +47,7 @@ android:layout_marginBottom="32dp" android:text="@string/log_access_confirmation_title" android:textAppearance="@style/AllowLogAccess" + android:textColor="?android:attr/textColorPrimary" android:gravity="center" /> <TextView @@ -56,6 +57,7 @@ android:layout_marginBottom="40dp" android:text="@string/log_access_confirmation_body" android:textAppearance="@style/PrimaryAllowLogAccess" + android:textColor="?android:attr/textColorPrimary" android:gravity="center" /> <Button diff --git a/core/res/res/values/styles.xml b/core/res/res/values/styles.xml index 6a9d3ac0044f..c07404bf141d 100644 --- a/core/res/res/values/styles.xml +++ b/core/res/res/values/styles.xml @@ -1500,15 +1500,13 @@ please see styles_device_defaults.xml. </style> <!-- The style for log access consent text --> - <style name="AllowLogAccess" - parent="@android:style/Theme.DeviceDefault.Dialog.Alert.DayNight"> + <style name="AllowLogAccess"> <item name="android:layout_width">332dp</item> <item name="android:textSize">24sp</item> <item name="android:fontFamily">google-sans</item> </style> - <style name="PrimaryAllowLogAccess" - parent="@android:style/Theme.DeviceDefault.Dialog.Alert.DayNight"> + <style name="PrimaryAllowLogAccess"> <item name="android:layout_width">332dp</item> <item name="android:textSize">14sp</item> <item name="android:fontFamily">google-sans-text</item> |