From 7f0f81a435d6cf818d7099f8b4a2c567ba82232b Mon Sep 17 00:00:00 2001 From: Edgar Wang Date: Wed, 17 May 2023 01:48:41 +0800 Subject: [PATCH] Support RTL for text of Preferences Bug: 242029276 Test: visual Change-Id: I1a27a0e20204a9649c60972e1bfc2745298f1946 --- .../res/layout-v31/settingslib_banner_message.xml | 6 ++++++ .../FooterPreference/res/layout-v31/preference_footer.xml | 4 ++++ .../FooterPreference/res/layout-v33/preference_footer.xml | 4 ++++ .../SettingsTheme/res/layout-v31/settingslib_preference.xml | 2 ++ .../SettingsTheme/res/layout-v33/settingslib_preference.xml | 2 ++ .../res/layout-v33/top_intro_preference.xml | 2 ++ .../TopIntroPreference/res/layout/top_intro_preference.xml | 2 ++ 7 files changed, 22 insertions(+) diff --git a/packages/SettingsLib/BannerMessagePreference/res/layout-v31/settingslib_banner_message.xml b/packages/SettingsLib/BannerMessagePreference/res/layout-v31/settingslib_banner_message.xml index 6f504efbaaf0b..9d53e39c7bf85 100644 --- a/packages/SettingsLib/BannerMessagePreference/res/layout-v31/settingslib_banner_message.xml +++ b/packages/SettingsLib/BannerMessagePreference/res/layout-v31/settingslib_banner_message.xml @@ -50,6 +50,8 @@ android:id="@+id/banner_title" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_gravity="start" + android:textAlignment="viewStart" android:paddingTop="0dp" android:paddingBottom="4dp" android:textAppearance="@style/Banner.Title.SettingsLib"/> @@ -58,6 +60,8 @@ android:id="@+id/banner_subtitle" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_gravity="start" + android:textAlignment="viewStart" android:paddingTop="0dp" android:paddingBottom="4dp" android:textAppearance="@style/Banner.Subtitle.SettingsLib" @@ -67,6 +71,8 @@ android:id="@+id/banner_summary" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_gravity="start" + android:textAlignment="viewStart" android:paddingTop="4dp" android:paddingBottom="8dp" android:textAppearance="@style/Banner.Summary.SettingsLib"/> diff --git a/packages/SettingsLib/FooterPreference/res/layout-v31/preference_footer.xml b/packages/SettingsLib/FooterPreference/res/layout-v31/preference_footer.xml index 42700b3ace07e..470a83d0982bc 100644 --- a/packages/SettingsLib/FooterPreference/res/layout-v31/preference_footer.xml +++ b/packages/SettingsLib/FooterPreference/res/layout-v31/preference_footer.xml @@ -50,6 +50,8 @@ android:id="@android:id/title" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_gravity="start" + android:textAlignment="viewStart" android:paddingTop="16dp" android:paddingBottom="8dp" android:textColor="?android:attr/textColorSecondary" @@ -60,6 +62,8 @@ android:text="@string/settingslib_learn_more_text" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_gravity="start" + android:textAlignment="viewStart" android:paddingBottom="8dp" android:clickable="true" android:visibility="gone" diff --git a/packages/SettingsLib/FooterPreference/res/layout-v33/preference_footer.xml b/packages/SettingsLib/FooterPreference/res/layout-v33/preference_footer.xml index a2f25100edadf..4b5fd44028ad4 100644 --- a/packages/SettingsLib/FooterPreference/res/layout-v33/preference_footer.xml +++ b/packages/SettingsLib/FooterPreference/res/layout-v33/preference_footer.xml @@ -50,6 +50,8 @@ android:id="@android:id/title" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_gravity="start" + android:textAlignment="viewStart" android:paddingTop="16dp" android:paddingBottom="8dp" android:textColor="?android:attr/textColorSecondary" @@ -62,6 +64,8 @@ android:text="@string/settingslib_learn_more_text" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_gravity="start" + android:textAlignment="viewStart" android:paddingBottom="8dp" android:clickable="true" android:visibility="gone" diff --git a/packages/SettingsLib/SettingsTheme/res/layout-v31/settingslib_preference.xml b/packages/SettingsLib/SettingsTheme/res/layout-v31/settingslib_preference.xml index 23aa993cc8cc9..dda7517cc1c34 100644 --- a/packages/SettingsLib/SettingsTheme/res/layout-v31/settingslib_preference.xml +++ b/packages/SettingsLib/SettingsTheme/res/layout-v31/settingslib_preference.xml @@ -42,6 +42,8 @@ android:id="@android:id/title" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_gravity="start" + android:textAlignment="viewStart" android:maxLines="2" android:textAppearance="?android:attr/textAppearanceListItem" android:ellipsize="marquee"/> diff --git a/packages/SettingsLib/SettingsTheme/res/layout-v33/settingslib_preference.xml b/packages/SettingsLib/SettingsTheme/res/layout-v33/settingslib_preference.xml index 70ce3749ea199..fedcc77ed6b9f 100644 --- a/packages/SettingsLib/SettingsTheme/res/layout-v33/settingslib_preference.xml +++ b/packages/SettingsLib/SettingsTheme/res/layout-v33/settingslib_preference.xml @@ -42,6 +42,8 @@ android:id="@android:id/title" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_gravity="start" + android:textAlignment="viewStart" android:maxLines="2" android:hyphenationFrequency="normalFast" android:lineBreakWordStyle="phrase" diff --git a/packages/SettingsLib/TopIntroPreference/res/layout-v33/top_intro_preference.xml b/packages/SettingsLib/TopIntroPreference/res/layout-v33/top_intro_preference.xml index 6046d911879e1..195d45f3a6398 100644 --- a/packages/SettingsLib/TopIntroPreference/res/layout-v33/top_intro_preference.xml +++ b/packages/SettingsLib/TopIntroPreference/res/layout-v33/top_intro_preference.xml @@ -30,6 +30,8 @@ android:id="@android:id/title" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_gravity="start" + android:textAlignment="viewStart" android:clickable="false" android:longClickable="false" android:maxLines="10" diff --git a/packages/SettingsLib/TopIntroPreference/res/layout/top_intro_preference.xml b/packages/SettingsLib/TopIntroPreference/res/layout/top_intro_preference.xml index 4d6e1b7f0ac84..bee6bc70f2c8e 100644 --- a/packages/SettingsLib/TopIntroPreference/res/layout/top_intro_preference.xml +++ b/packages/SettingsLib/TopIntroPreference/res/layout/top_intro_preference.xml @@ -30,6 +30,8 @@ android:id="@android:id/title" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_gravity="start" + android:textAlignment="viewStart" android:clickable="false" android:longClickable="false" android:maxLines="10"