From 58c464179b7ef0dda38304b6369b96151e03c779 Mon Sep 17 00:00:00 2001 From: Edgar Wang Date: Tue, 8 Jun 2021 00:01:21 +0800 Subject: [PATCH] Allow the title of preference display in 2 lines After discussed with UX, we think that is necessery for localization. So we set the max_line to 2. Bug: 189495817 Test: change language and manual test Change-Id: I269a22af37e9edb14de46f9ac245da07b8e2a228 --- .../SettingsTheme/res/layout-v31/settingslib_preference.xml | 2 +- .../res/layout-v31/preference_two_target.xml | 2 +- packages/SettingsLib/res/layout/preference_access_point.xml | 2 +- .../SettingsLib/res/layout/preference_checkable_two_target.xml | 2 +- .../SettingsLib/res/layout/restricted_switch_preference.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/SettingsLib/SettingsTheme/res/layout-v31/settingslib_preference.xml b/packages/SettingsLib/SettingsTheme/res/layout-v31/settingslib_preference.xml index 579abbd581697..23aa993cc8cc9 100644 --- a/packages/SettingsLib/SettingsTheme/res/layout-v31/settingslib_preference.xml +++ b/packages/SettingsLib/SettingsTheme/res/layout-v31/settingslib_preference.xml @@ -42,7 +42,7 @@ android:id="@android:id/title" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:singleLine="true" + android:maxLines="2" android:textAppearance="?android:attr/textAppearanceListItem" android:ellipsize="marquee"/> diff --git a/packages/SettingsLib/TwoTargetPreference/res/layout-v31/preference_two_target.xml b/packages/SettingsLib/TwoTargetPreference/res/layout-v31/preference_two_target.xml index 2c2756b365333..2c35772de2cae 100644 --- a/packages/SettingsLib/TwoTargetPreference/res/layout-v31/preference_two_target.xml +++ b/packages/SettingsLib/TwoTargetPreference/res/layout-v31/preference_two_target.xml @@ -40,7 +40,7 @@ android:id="@android:id/title" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:singleLine="true" + android:maxLines="2" android:textAppearance="?android:attr/textAppearanceListItem" android:ellipsize="marquee"/> diff --git a/packages/SettingsLib/res/layout/preference_access_point.xml b/packages/SettingsLib/res/layout/preference_access_point.xml index f3f43accca3ca..802d604a44f97 100644 --- a/packages/SettingsLib/res/layout/preference_access_point.xml +++ b/packages/SettingsLib/res/layout/preference_access_point.xml @@ -64,7 +64,7 @@ android:id="@android:id/title" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:singleLine="true" + android:maxLines="2" android:textAppearance="?android:attr/textAppearanceListItem" android:ellipsize="marquee" /> diff --git a/packages/SettingsLib/res/layout/preference_checkable_two_target.xml b/packages/SettingsLib/res/layout/preference_checkable_two_target.xml index e4f72422e408d..f512f9b271315 100644 --- a/packages/SettingsLib/res/layout/preference_checkable_two_target.xml +++ b/packages/SettingsLib/res/layout/preference_checkable_two_target.xml @@ -61,7 +61,7 @@ android:id="@android:id/title" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:singleLine="true" + android:maxLines="2" android:textAppearance="?android:attr/textAppearanceListItem" android:ellipsize="marquee" /> diff --git a/packages/SettingsLib/res/layout/restricted_switch_preference.xml b/packages/SettingsLib/res/layout/restricted_switch_preference.xml index d9f91def3be3f..169ae97c1a6d3 100644 --- a/packages/SettingsLib/res/layout/restricted_switch_preference.xml +++ b/packages/SettingsLib/res/layout/restricted_switch_preference.xml @@ -51,7 +51,7 @@