From 2293d7b304e0823f30ca5c064000ce98c9dc91ed Mon Sep 17 00:00:00 2001
From: Kevin Chang <kevincpchang@google.com>
Date: Fri, 14 Jun 2019 09:30:29 +0800
Subject: [PATCH] Remove redundant style in accessibility permission dialog

Remove the redundant style of allow and deny button in the dialog
since these styles don't have override bodies which indicates that
the style of these two buttons can be replaced by the parent style.

Test: Visual
Fixes: 135166860
Change-Id: I500963196e7afe52065b1b615b35d07f6a77037a
---
 res/layout/disable_accessibility_service_dialog_content.xml | 4 ++--
 res/layout/enable_accessibility_service_dialog_content.xml  | 4 ++--
 res/values/styles.xml                                       | 5 -----
 3 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/res/layout/disable_accessibility_service_dialog_content.xml b/res/layout/disable_accessibility_service_dialog_content.xml
index e365484d633..680de4adea5 100644
--- a/res/layout/disable_accessibility_service_dialog_content.xml
+++ b/res/layout/disable_accessibility_service_dialog_content.xml
@@ -57,12 +57,12 @@
                 <Button
                     android:id="@+id/permission_disable_stop_button"
                     android:text="@string/accessibility_dialog_button_stop"
-                    style="@style/AccessibilityDialogButtonAllow" />
+                    style="@style/AccessibilityDialogButton" />
 
                 <Button
                     android:id="@+id/permission_disable_cancel_button"
                     android:text="@string/accessibility_dialog_button_cancel"
-                    style="@style/AccessibilityDialogButtonDeny" />
+                    style="@style/AccessibilityDialogButton" />
 
             </LinearLayout>
 
diff --git a/res/layout/enable_accessibility_service_dialog_content.xml b/res/layout/enable_accessibility_service_dialog_content.xml
index 066c3399621..59cb6ddac8c 100644
--- a/res/layout/enable_accessibility_service_dialog_content.xml
+++ b/res/layout/enable_accessibility_service_dialog_content.xml
@@ -127,12 +127,12 @@
             <Button
                 android:id="@+id/permission_enable_allow_button"
                 android:text="@string/accessibility_dialog_button_allow"
-                style="@style/AccessibilityDialogButtonAllow" />
+                style="@style/AccessibilityDialogButton" />
 
             <Button
                 android:id="@+id/permission_enable_deny_button"
                 android:text="@string/accessibility_dialog_button_deny"
-                style="@style/AccessibilityDialogButtonDeny" />
+                style="@style/AccessibilityDialogButton" />
 
         </LinearLayout>
     </LinearLayout>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index d3d3199f62b..9b78a43a1b7 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -651,9 +651,4 @@
         <item name="android:background">?android:attr/selectableItemBackground</item>
     </style>
 
-    <style name="AccessibilityDialogButtonAllow"
-           parent="@style/AccessibilityDialogButton"></style>
-    <style name="AccessibilityDialogButtonDeny"
-           parent="@style/AccessibilityDialogButton"></style>
-
 </resources>