From 5fd16e261c8e504d263fd7d8515bbc9fbd31924d Mon Sep 17 00:00:00 2001
From: Jason Chiu <chiujason@google.com>
Date: Mon, 27 Jul 2020 16:17:32 +0800
Subject: [PATCH] Make all up button speak the default description

Talkback speaks "back button" for the up button in the action bar, which
causes inconsistency with other injected pages.

Remove the self-defined content description to make it speak the default
one "Navigation up button".

Fixes: 158724875
Test: rebuild, manual
Change-Id: Ief2b1410553422cd6f06bd30e00ab4c8a59a3595
Merged-In: Ief2b1410553422cd6f06bd30e00ab4c8a59a3595
(cherry picked from commit dd0b2dc48372ff3f5237e0ca178c05dcd400c094)
---
 res/layout/settings_base_layout.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/res/layout/settings_base_layout.xml b/res/layout/settings_base_layout.xml
index 0a4437ee573..9fbc2a29c19 100644
--- a/res/layout/settings_base_layout.xml
+++ b/res/layout/settings_base_layout.xml
@@ -26,8 +26,7 @@
         style="?android:attr/actionBarStyle"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:theme="?android:attr/actionBarTheme"
-        android:navigationContentDescription="@*android:string/back_button_label" />
+        android:theme="?android:attr/actionBarTheme" />
     <FrameLayout
         android:id="@+id/content_frame"
         android:layout_width="match_parent"