Merge "Remove redundant style in accessibility permission dialog"

This commit is contained in:
Kevin Chang
2019-06-14 09:47:14 +00:00
committed by Android (Google) Code Review
3 changed files with 4 additions and 9 deletions

View File

@@ -57,12 +57,12 @@
<Button <Button
android:id="@+id/permission_disable_stop_button" android:id="@+id/permission_disable_stop_button"
android:text="@string/accessibility_dialog_button_stop" android:text="@string/accessibility_dialog_button_stop"
style="@style/AccessibilityDialogButtonAllow" /> style="@style/AccessibilityDialogButton" />
<Button <Button
android:id="@+id/permission_disable_cancel_button" android:id="@+id/permission_disable_cancel_button"
android:text="@string/accessibility_dialog_button_cancel" android:text="@string/accessibility_dialog_button_cancel"
style="@style/AccessibilityDialogButtonDeny" /> style="@style/AccessibilityDialogButton" />
</LinearLayout> </LinearLayout>

View File

@@ -127,12 +127,12 @@
<Button <Button
android:id="@+id/permission_enable_allow_button" android:id="@+id/permission_enable_allow_button"
android:text="@string/accessibility_dialog_button_allow" android:text="@string/accessibility_dialog_button_allow"
style="@style/AccessibilityDialogButtonAllow" /> style="@style/AccessibilityDialogButton" />
<Button <Button
android:id="@+id/permission_enable_deny_button" android:id="@+id/permission_enable_deny_button"
android:text="@string/accessibility_dialog_button_deny" android:text="@string/accessibility_dialog_button_deny"
style="@style/AccessibilityDialogButtonDeny" /> style="@style/AccessibilityDialogButton" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>

View File

@@ -651,9 +651,4 @@
<item name="android:background">?android:attr/selectableItemBackground</item> <item name="android:background">?android:attr/selectableItemBackground</item>
</style> </style>
<style name="AccessibilityDialogButtonAllow"
parent="@style/AccessibilityDialogButton"></style>
<style name="AccessibilityDialogButtonDeny"
parent="@style/AccessibilityDialogButton"></style>
</resources> </resources>