commit 2e2716c5b5df77f4706393d60d7e5ec1d6ac450c
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Wed Jul 21 01:08:52 2021 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Wed Jul 21 01:08:52 2021 +0000
tree 4ef161c0614a72a539c6ec59079ed59f521a67a8
parent 9fe9d7ec1c5f014ec9862ba46144222de5cdfc75
parent ec2610ce068d1a4a1464b26f782e452b2e4a1c72

Snap for 7566245 from ec2610ce068d1a4a1464b26f782e452b2e4a1c72 to sc-v2-release

Change-Id: Idf768ee09f10e97793ae4c45b244493c38029940

res/layout/themed_icon_section_view.xml

diff --git a/res/layout/themed_icon_section_view.xml b/res/layout/themed_icon_section_view.xml
index 117bc2e..97892ee 100644
--- a/res/layout/themed_icon_section_view.xml
+++ b/res/layout/themed_icon_section_view.xml
@@ -21,44 +21,48 @@
     android:layout_height="wrap_content"
     android:background="?selectableItemBackground"
     android:clickable="true"
-    android:gravity="center_vertical"
-    android:orientation="horizontal"
+    android:orientation="vertical"
     android:paddingHorizontal="@dimen/section_horizontal_padding"
     android:paddingVertical="@dimen/section_vertical_padding">
 
     <LinearLayout
-        android:layout_width="0dp"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_weight="1"
         android:orientation="horizontal">
 
         <TextView
             android:id="@+id/themed_icon_title"
-            android:layout_width="wrap_content"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:paddingEnd="12dp"
             android:text="@string/themed_icon_title"
             style="@style/SectionTitleTextStyle" />
 
-        <Space
-            android:layout_width="12dp"
-            android:layout_height="0dp" />
-
-        <TextView
-            android:id="@+id/beta_tag"
+        <Switch
+            android:id="@+id/themed_icon_toggle"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/beta_title"
-            android:textColor="?androidprv:attr/textColorOnAccent"
-            style="@style/BetaTagTextStyle" />
+            android:layout_height="match_parent"
+            android:background="@null"
+            android:clickable="false"
+            android:focusable="false"
+            android:minHeight="0dp"
+            style="@style/Switch.SettingsLib"/>
+
     </LinearLayout>
 
-    <Switch
-        android:id="@+id/themed_icon_toggle"
+    <Space
+        android:layout_width="0dp"
+        android:layout_height="8dp" />
+
+    <TextView
+        android:id="@+id/beta_tag"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:background="@null"
-        android:clickable="false"
-        android:focusable="false"
-        style="@style/Switch.SettingsLib"/>
+        android:paddingHorizontal="8dp"
+        android:paddingVertical="4dp"
+        android:text="@string/beta_title"
+        android:textColor="?androidprv:attr/textColorOnAccent"
+        style="@style/BetaTagTextStyle" />
 
 </com.android.customization.picker.themedicon.ThemedIconSectionView>