From 6c553ea3f1cc6d957ab52e52fdc034576f0ffa13 Mon Sep 17 00:00:00 2001
From: Stanley Wang <stanleytfwang@google.com>
Date: Sun, 27 Jun 2021 17:23:47 +0800
Subject: [PATCH] Fix the problem that the unknown item will be announced when
 using Switch Access.

- Disable the importantForAccessibility of the
  SettingsMainSwitchBar's parent layout.

Fix: 182227784
Test: robotest and operate the switch preference manually
Change-Id: I5e0e4bb972f6996192d5a30525bb5370a006b115
---
 res/layout/preference_widget_main_switch.xml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/res/layout/preference_widget_main_switch.xml b/res/layout/preference_widget_main_switch.xml
index a02ed43e157..a01105f8dab 100644
--- a/res/layout/preference_widget_main_switch.xml
+++ b/res/layout/preference_widget_main_switch.xml
@@ -15,10 +15,11 @@
   limitations under the License.
   -->
 
-<LinearLayout
+<FrameLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content">
+    android:layout_height="wrap_content"
+    android:importantForAccessibility="no">
 
     <com.android.settings.widget.SettingsMainSwitchBar
         android:id="@+id/main_switch_bar"
@@ -26,4 +27,4 @@
         android:layout_height="wrap_content"
         android:layout_width="match_parent" />
 
-</LinearLayout>
+</FrameLayout>