From 2a212020cccff7241fcf3c3d0ee650f692659fbe Mon Sep 17 00:00:00 2001
From: eunjeongshin <eunjeongshin@google.com>
Date: Fri, 8 Apr 2022 18:36:45 +0000
Subject: [PATCH] Update font/color of user consent dialog for device log
 access

This change is to apply text font and color change for user consent
prompt when device log access is requested.

This codebase is the continuity of the implementation ag/16618162 to
obtain user consent.

Bug: 193708292
Test: CtsVerifier
Change-Id: I7f76ab9bdd76e09e98db66c60aab37e399bd637a
---
 .../log_access_user_consent_dialog_permission.xml      |  8 ++++----
 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 bd7efbd59c333..400d4c231cf3a 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 7a9f520b4d3cb..6a9d3ac0044ff 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"