From 3c8ff4712fb37865943c8958b4bb6d85eb07ca33 Mon Sep 17 00:00:00 2001
From: Robert Horvath <robhor@google.com>
Date: Fri, 22 Apr 2022 16:25:58 +0200
Subject: [PATCH] Adjust LogAccessDialog themeing for TV

The issues with the LogAccessDialogActivity dialog on TV were:
- White text on white background (now using default background instead
  of ?attr/colorSurface)
- The buttons had no focused state (now using default TV dialog button
  style)

Bug: 228001277
Test: Manual, on adt3 and phone emulator in light & dark mode
Change-Id: I8039183464ff5e13fcf77f146c56c43f6ee46f6a
---
 ..._access_user_consent_dialog_permission.xml | 58 ++++++++++---------
 core/res/res/values-television/styles.xml     | 21 +++++++
 core/res/res/values/styles.xml                | 14 ++---
 3 files changed, 58 insertions(+), 35 deletions(-)
 create mode 100644 core/res/res/values-television/styles.xml

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 c88bc92827086..1a395b9fc30f9 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
@@ -26,8 +26,7 @@
               android:paddingLeft="24dp"
               android:paddingRight="24dp"
               android:paddingTop="24dp"
-              android:paddingBottom="24dp"
-              android:background="?attr/colorSurface">
+              android:paddingBottom="24dp">
 
     <ImageView
             android:id="@+id/log_access_image_view"
@@ -37,8 +36,7 @@
             android:src="@drawable/ic_doc_document"
             tools:layout_editor_absoluteX="148dp"
             tools:layout_editor_absoluteY="35dp"
-            android:gravity="center"
-            android:tint="?attr/colorAccentPrimaryVariant"/>
+            android:gravity="center" />
 
     <TextView
             android:id="@+id/log_access_dialog_title"
@@ -60,29 +58,35 @@
             android:textColor="?android:attr/textColorPrimary"
             android:gravity="center" />
 
-    <Button
-            android:id="@+id/log_access_dialog_allow_button"
+    <LinearLayout
+            android:orientation="vertical"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:text="@string/log_access_confirmation_allow"
-            style="@style/PermissionGrantButtonTop"
-            android:layout_marginBottom="5dp"
-            android:layout_centerHorizontal="true"
-            android:layout_alignParentTop="true"
-            android:layout_alignParentBottom="true"
-            android:clipToOutline="true"
-            android:gravity="center" />
-
-    <Button
-            android:id="@+id/log_access_dialog_deny_button"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:text="@string/log_access_confirmation_deny"
-            style="@style/PermissionGrantButtonBottom"
-            android:layout_centerHorizontal="true"
-            android:layout_alignParentTop="true"
-            android:layout_alignParentBottom="true"
-            android:clipToOutline="true"
-            android:gravity="center" />
+            android:layout_height="wrap_content">
+        <Button
+                android:id="@+id/log_access_dialog_allow_button"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/log_access_confirmation_allow"
+                style="@style/PermissionGrantButtonTop"
+                android:textAppearance="@style/PermissionGrantButtonTextAppearance"
+                android:layout_marginBottom="5dp"
+                android:layout_centerHorizontal="true"
+                android:layout_alignParentTop="true"
+                android:layout_alignParentBottom="true"
+                android:clipToOutline="true"
+                android:gravity="center" />
 
+        <Button
+                android:id="@+id/log_access_dialog_deny_button"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/log_access_confirmation_deny"
+                style="@style/PermissionGrantButtonBottom"
+                android:textAppearance="@style/PermissionGrantButtonTextAppearance"
+                android:layout_centerHorizontal="true"
+                android:layout_alignParentTop="true"
+                android:layout_alignParentBottom="true"
+                android:clipToOutline="true"
+                android:gravity="center" />
+    </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/core/res/res/values-television/styles.xml b/core/res/res/values-television/styles.xml
new file mode 100644
index 0000000000000..ad9140cdc6a9b
--- /dev/null
+++ b/core/res/res/values-television/styles.xml
@@ -0,0 +1,21 @@
+<!--
+  ~ Copyright (C) 2022 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<resources>
+    <style name="PermissionGrantButtonTop"
+        parent="@style/Widget.Leanback.Button.ButtonBarGravityStart" />
+    <style name="PermissionGrantButtonBottom"
+        parent="@style/Widget.Leanback.Button.ButtonBarGravityStart" />
+</resources>
\ No newline at end of file
diff --git a/core/res/res/values/styles.xml b/core/res/res/values/styles.xml
index c07404bf141d7..8efa7dc0a3e93 100644
--- a/core/res/res/values/styles.xml
+++ b/core/res/res/values/styles.xml
@@ -1501,26 +1501,27 @@ please see styles_device_defaults.xml.
 
     <!-- The style for log access consent text -->
     <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">
-        <item name="android:layout_width">332dp</item>
         <item name="android:textSize">14sp</item>
         <item name="android:fontFamily">google-sans-text</item>
     </style>
 
+    <style name="PermissionGrantButtonTextAppearance">
+        <item name="android:fontFamily">google-sans-medium</item>
+        <item name="android:textSize">14sp</item>
+        <item name="android:textColor">@android:color/system_neutral1_900</item>
+    </style>
+
     <style name="PermissionGrantButtonTop"
            parent="@android:style/Widget.DeviceDefault.Button.Borderless.Colored">
         <item name="android:layout_width">332dp</item>
         <item name="android:layout_height">56dp</item>
         <item name="android:layout_marginTop">2dp</item>
         <item name="android:layout_marginBottom">2dp</item>
-        <item name="android:fontFamily">google-sans-medium</item>
-        <item name="android:textSize">14sp</item>
-        <item name="android:textColor">@android:color/system_neutral1_900</item>
         <item name="android:background">@drawable/grant_permissions_buttons_top</item>
     </style>
 
@@ -1530,9 +1531,6 @@ please see styles_device_defaults.xml.
         <item name="android:layout_height">56dp</item>
         <item name="android:layout_marginTop">2dp</item>
         <item name="android:layout_marginBottom">2dp</item>
-        <item name="android:fontFamily">google-sans-medium</item>
-        <item name="android:textSize">14sp</item>
-        <item name="android:textColor">@android:color/system_neutral1_900</item>
         <item name="android:background">@drawable/grant_permissions_buttons_bottom</item>
     </style>