From 933396975357d27ae72c10da8b3f3fa34f0545fa Mon Sep 17 00:00:00 2001
From: Peter Liang <peterliang@google.com>
Date: Wed, 10 Aug 2022 22:26:47 +0800
Subject: [PATCH] The activity launch preference should align to the padding
 style of the main switch.

Replaces all margins with the padding to be compatible with SuW lib, and
fine-tune the layouts.

Bug: 242046040
Test: manual test
Change-Id: I27c387b7ff60e6ea4f1fff61e1fd73b647228df9
---
 ...cessibility_launch_activity_preference.xml | 45 +++++++++++--------
 1 file changed, 26 insertions(+), 19 deletions(-)

diff --git a/res/layout/accessibility_launch_activity_preference.xml b/res/layout/accessibility_launch_activity_preference.xml
index 26a1c334212..5ec6bea4690 100644
--- a/res/layout/accessibility_launch_activity_preference.xml
+++ b/res/layout/accessibility_launch_activity_preference.xml
@@ -14,26 +14,33 @@
   See the License for the specific language governing permissions and
   limitations under the License.
   -->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:minHeight="@dimen/settingslib_min_switch_bar_height"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_height="wrap_content"
     android:layout_width="match_parent"
-    android:layout_margin="@dimen/settingslib_switchbar_margin"
-    android:paddingStart="@dimen/settingslib_switchbar_padding_left"
-    android:paddingEnd="@dimen/settingslib_switchbar_padding_right"
-    android:background="@drawable/settingslib_switch_bar_bg_on">
+    android:minHeight="?android:attr/listPreferredItemHeight"
+    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
+    android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+    android:paddingVertical="@dimen/settingslib_switchbar_margin"
+    android:background="@android:color/transparent"
+    android:importantForAccessibility="no">
 
-    <TextView
-        android:id="@android:id/title"
+    <FrameLayout
         android:layout_height="wrap_content"
-        android:layout_width="wrap_content"
-        android:layout_marginEnd="@dimen/settingslib_switch_title_margin"
-        android:layout_marginVertical="@dimen/settingslib_switch_title_margin"
-        android:layout_gravity="center_vertical"
-        android:ellipsize="end"
-        android:textAppearance="?android:attr/textAppearanceListItem"
-        android:hyphenationFrequency="normalFast"
-        android:lineBreakWordStyle="phrase"
-        style="@style/MainSwitchText.Settingslib" />
-</LinearLayout>
+        android:layout_width="match_parent"
+        android:paddingStart="@dimen/settingslib_switchbar_padding_left"
+        android:paddingEnd="@dimen/settingslib_switchbar_padding_right"
+        android:background="@drawable/settingslib_switch_bar_bg_on">
+
+        <TextView
+            android:id="@android:id/title"
+            android:layout_height="wrap_content"
+            android:layout_width="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:paddingVertical="@dimen/settingslib_switch_title_margin"
+            android:ellipsize="end"
+            android:textAppearance="?android:attr/textAppearanceListItem"
+            android:hyphenationFrequency="normalFast"
+            android:lineBreakWordStyle="phrase"
+            style="@style/MainSwitchText.Settingslib"/>
+    </FrameLayout>
+</FrameLayout>