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

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

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

diff --git a/packages/SettingsLib/MainSwitchPreference/res/layout/settingslib_main_switch_layout.xml b/packages/SettingsLib/MainSwitchPreference/res/layout/settingslib_main_switch_layout.xml
index eccf0c091e491..bef6e352d854c 100644
--- a/packages/SettingsLib/MainSwitchPreference/res/layout/settingslib_main_switch_layout.xml
+++ b/packages/SettingsLib/MainSwitchPreference/res/layout/settingslib_main_switch_layout.xml
@@ -15,9 +15,10 @@
   limitations under the License.
   -->
 
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_height="wrap_content"
-    android:layout_width="match_parent" >
+    android:layout_width="match_parent"
+    android:importantForAccessibility="no">
 
     <com.android.settingslib.widget.MainSwitchBar
         android:id="@+id/settingslib_main_switch_bar"
@@ -25,6 +26,6 @@
         android:layout_height="wrap_content"
         android:layout_width="match_parent" />
 
-</LinearLayout>
+</FrameLayout>