commit 07bfdd5bd4d05563ea8702a5a82ff729389cb6bf
author Chihhang Chuang <chihhangchuang@google.com> Wed Jun 17 19:03:22 2020 +0800
committer Chihhang Chuang <chihhangchuang@google.com> Wed Jun 17 19:43:38 2020 +0800
tree 8882e5b7d8fced19bb4c17c2cb49238e95985739
parent 49bcc2711091dfee873a5dfe005d91b989f9a28a

Fix theme picker breaking in RTL mode

- Fix the preview screen.
- Fix the theme option layout.

Screenshot:
LTR: https://screenshot.googleplex.com/BwN8J2VKKg5.png
RTL: https://screenshot.googleplex.com/Fm4WQKKrB8i.png

Test: Manually, see screenshot
Bug: 159093562
Change-Id: I03cd05d3f4c85472a2bdc70b621cb2ad1651404e

res/layout/theme_option.xml

diff --git a/res/layout/theme_option.xml b/res/layout/theme_option.xml
index 557d532..379c507 100644
--- a/res/layout/theme_option.xml
+++ b/res/layout/theme_option.xml
@@ -46,7 +46,7 @@
             android:layout_width="@dimen/theme_option_icon_sample_width"
             android:layout_height="@dimen/theme_option_icon_sample_height"
             android:layout_alignParentTop="true"
-            android:layout_alignParentLeft="true"
+            android:layout_alignParentStart="true"
             android:tint="?android:colorForeground"/>
         <ImageView
             android:id="@+id/theme_option_shape"
@@ -54,7 +54,7 @@
             android:layout_height="@dimen/theme_option_shape_sample_height"
             android:layout_alignBottom="@+id/theme_option_icon"
             android:layout_toEndOf="@id/theme_option_icon"
-            android:layout_marginLeft="@dimen/theme_option_sample_margin"/>
+            android:layout_marginStart="@dimen/theme_option_sample_margin"/>
         <TextView
             android:id="@+id/theme_option_font"
             android:layout_width="@dimen/theme_option_font_sample_width"

res/layout/theme_preview_color_icons.xml

diff --git a/res/layout/theme_preview_color_icons.xml b/res/layout/theme_preview_color_icons.xml
index f1e7522..c8afb99 100644
--- a/res/layout/theme_preview_color_icons.xml
+++ b/res/layout/theme_preview_color_icons.xml
@@ -129,18 +129,18 @@
         </LinearLayout>
 
         <!-- Icons of CheckBox/RadioButton/Switch. -->
-        <LinearLayout
+        <RelativeLayout
             android:id="@+id/button_icons"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="horizontal"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toBottomOf="@id/qs_icons"
             app:layout_constraintBottom_toBottomOf="parent">
             <FrameLayout
                 android:layout_width="@dimen/preview_theme_icon_size"
-                android:layout_height="@dimen/preview_theme_icon_size">
+                android:layout_height="@dimen/preview_theme_icon_size"
+                android:layout_alignParentStart="true">
                 <CheckBox
                     android:id="@+id/preview_check_selected"
                     android:layout_width="wrap_content"
@@ -149,13 +149,11 @@
                     android:checked="true"
                     android:enabled="false"/>
             </FrameLayout>
-            <Space
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1" />
+
             <FrameLayout
                 android:layout_width="@dimen/preview_theme_icon_size"
-                android:layout_height="@dimen/preview_theme_icon_size">
+                android:layout_height="@dimen/preview_theme_icon_size"
+                android:layout_centerHorizontal="true">
                 <RadioButton
                     android:id="@+id/preview_radio_selected"
                     android:layout_width="wrap_content"
@@ -164,13 +162,11 @@
                     android:checked="true"
                     android:enabled="false"/>
             </FrameLayout>
-            <Space
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1" />
+
             <FrameLayout
-                android:layout_width="@dimen/preview_theme_icon_size"
-                android:layout_height="@dimen/preview_theme_icon_size">
+                android:layout_width="wrap_content"
+                android:layout_height="@dimen/preview_theme_icon_size"
+                android:layout_alignParentEnd="true">
                 <Switch
                     android:id="@+id/preview_toggle_selected"
                     android:layout_width="wrap_content"
@@ -179,7 +175,7 @@
                     android:checked="true"
                     android:enabled="false"/>
             </FrameLayout>
-        </LinearLayout>
+        </RelativeLayout>
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 </androidx.cardview.widget.CardView>