From 2c21adcf59fd5b65c4c6fe187ff7560f3ca36604 Mon Sep 17 00:00:00 2001
From: menghanli <menghanli@google.com>
Date: Fri, 18 Mar 2022 11:56:54 +0800
Subject: [PATCH] Fix shortcut toggles content has been covered by Switch
 Access accessibility focus.

Root cause: The padding of ShortcutPreference root layout narrows the focus area.
Solution: Move the padding into child layout

Bug: 191108646
Test: Manual testing
Change-Id: Iba329c6351b7fc1ba4062946e36bea31ae093804
---
 res/layout/accessibility_shortcut_secondary_action.xml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/res/layout/accessibility_shortcut_secondary_action.xml b/res/layout/accessibility_shortcut_secondary_action.xml
index 8d0ef3bdfe3..bdb129f83e0 100644
--- a/res/layout/accessibility_shortcut_secondary_action.xml
+++ b/res/layout/accessibility_shortcut_secondary_action.xml
@@ -21,17 +21,15 @@
     android:layout_height="wrap_content"
     android:minHeight="?android:attr/listPreferredItemHeightSmall"
     android:gravity="center_vertical"
-    android:paddingStart="?android:attr/listPreferredItemPaddingStart"
-    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
     android:clipToPadding="false">
 
     <LinearLayout
         android:id="@+id/main_frame"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
+        android:paddingStart="?android:attr/listPreferredItemPaddingStart"
         android:layout_weight="1"
-        android:gravity="start|center_vertical"
-        >
+        android:gravity="start|center_vertical">
 
         <FrameLayout
             android:id="@+id/icon_frame"
@@ -91,6 +89,7 @@
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
         android:gravity="end|center_vertical"
+        android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
         android:minWidth="58dp"
         android:orientation="vertical" />