From 50d7143faaca1ba2067bd75b5b18dea4e32ce598 Mon Sep 17 00:00:00 2001
From: eunjeongshin <eunjeongshin@google.com>
Date: Sat, 9 Apr 2022 05:10:26 +0000
Subject: [PATCH] Dark mode support for user consent dialog when device log
 access is requested

This change is to fix text color attribute of user consent
prompt layout.

Bug: 228274117
Test: CtsVerifier
Change-Id: I6d2e22423d4ac5a2348dbe84caa5dc4fcd9bb4f0
---
 .../layout/log_access_user_consent_dialog_permission.xml    | 2 ++
 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 400d4c231cf3a..c88bc92827086 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 6a9d3ac0044ff..c07404bf141d7 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>