Make sure text of different launguages won't be cut.
Bug: 192501966
Test: Tested in two panel UI. Does not affect one-panel.
Change-Id: I3fe08fc7aac33f76e85feff026c1814591471b1f
diff --git a/Settings/res-twopanel/layout-v31/preference_two_target.xml b/Settings/res-twopanel/layout-v31/preference_two_target.xml
index a54a03c..8ec4650 100644
--- a/Settings/res-twopanel/layout-v31/preference_two_target.xml
+++ b/Settings/res-twopanel/layout-v31/preference_two_target.xml
@@ -57,7 +57,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:minHeight="@dimen/tp_preference_title_min_height"
- android:includeFontPadding="false"
+ android:includeFontPadding="true"
android:duplicateParentState="true"
android:ellipsize="marquee"
android:textAppearance="?android:attr/textAppearanceListItem"/>
@@ -67,7 +67,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/lb_preference_item_primary_text_margin_bottom"
android:minHeight="@dimen/tp_preference_summary_min_height"
- android:includeFontPadding="false"
+ android:includeFontPadding="true"
android:duplicateParentState="true"
android:textAppearance="?android:attr/textAppearanceListItemSecondary"
android:singleLine="false"
diff --git a/Settings/res-twopanel/layout/leanback_list_preference_fragment.xml b/Settings/res-twopanel/layout/leanback_list_preference_fragment.xml
index 1f2729b..d16c6ea 100644
--- a/Settings/res-twopanel/layout/leanback_list_preference_fragment.xml
+++ b/Settings/res-twopanel/layout/leanback_list_preference_fragment.xml
@@ -36,7 +36,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="?android:attr/titleTextStyle"
- android:includeFontPadding="false"
+ android:includeFontPadding="true"
android:layout_marginBottom="@dimen/tp_preference_decor_title_margin_bottom"
android:singleLine="false"
android:autoSizeTextType="uniform"
diff --git a/Settings/res-twopanel/layout/leanback_preference.xml b/Settings/res-twopanel/layout/leanback_preference.xml
index f46ca8d..f452f08 100644
--- a/Settings/res-twopanel/layout/leanback_preference.xml
+++ b/Settings/res-twopanel/layout/leanback_preference.xml
@@ -57,7 +57,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:minHeight="@dimen/tp_preference_title_min_height"
- android:includeFontPadding="false"
+ android:includeFontPadding="true"
android:duplicateParentState="true"
android:textAppearance="?android:attr/textAppearanceListItem"/>
<TextView
@@ -66,7 +66,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/lb_preference_item_primary_text_margin_bottom"
android:minHeight="@dimen/tp_preference_summary_min_height"
- android:includeFontPadding="false"
+ android:includeFontPadding="true"
android:duplicateParentState="true"
android:textAppearance="?android:attr/textAppearanceListItemSecondary"
android:singleLine="false"
diff --git a/Settings/res-twopanel/layout/leanback_preference_fragment.xml b/Settings/res-twopanel/layout/leanback_preference_fragment.xml
index 91c7b43..0f88594 100644
--- a/Settings/res-twopanel/layout/leanback_preference_fragment.xml
+++ b/Settings/res-twopanel/layout/leanback_preference_fragment.xml
@@ -36,7 +36,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="?android:attr/titleTextStyle"
- android:includeFontPadding="false"
+ android:includeFontPadding="true"
android:layout_marginBottom="@dimen/tp_preference_decor_title_margin_bottom"
android:singleLine="false"
android:autoSizeTextType="uniform"
diff --git a/Settings/res-twopanel/layout/preference_access_point.xml b/Settings/res-twopanel/layout/preference_access_point.xml
index 5da8a1e..b057ee8 100644
--- a/Settings/res-twopanel/layout/preference_access_point.xml
+++ b/Settings/res-twopanel/layout/preference_access_point.xml
@@ -66,7 +66,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:minHeight="@dimen/tp_preference_title_min_height"
- android:includeFontPadding="false"
+ android:includeFontPadding="true"
android:singleLine="true"
android:layout_marginBottom="@dimen/lb_preference_item_primary_text_margin_bottom"
android:duplicateParentState="true"
@@ -80,7 +80,7 @@
android:layout_below="@android:id/title"
android:layout_alignStart="@android:id/title"
android:minHeight="@dimen/tp_preference_summary_min_height"
- android:includeFontPadding="false"
+ android:includeFontPadding="true"
android:duplicateParentState="true"
android:textAppearance="?android:attr/textAppearanceListItemSecondary"
android:maxLines="10" />
diff --git a/Settings/res-twopanel/layout/preference_two_target.xml b/Settings/res-twopanel/layout/preference_two_target.xml
index 33cbfe9..4d8cd68 100644
--- a/Settings/res-twopanel/layout/preference_two_target.xml
+++ b/Settings/res-twopanel/layout/preference_two_target.xml
@@ -57,7 +57,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:minHeight="@dimen/tp_preference_title_min_height"
- android:includeFontPadding="false"
+ android:includeFontPadding="true"
android:duplicateParentState="true"
android:ellipsize="marquee"
android:textAppearance="?android:attr/textAppearanceListItem"/>
@@ -67,7 +67,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/lb_preference_item_primary_text_margin_bottom"
android:minHeight="@dimen/tp_preference_summary_min_height"
- android:includeFontPadding="false"
+ android:includeFontPadding="true"
android:duplicateParentState="true"
android:textAppearance="?android:attr/textAppearanceListItemSecondary"
android:singleLine="false"
diff --git a/Settings/res-twopanel/layout/suggestion_item.xml b/Settings/res-twopanel/layout/suggestion_item.xml
index 421ecb6..a195f54 100644
--- a/Settings/res-twopanel/layout/suggestion_item.xml
+++ b/Settings/res-twopanel/layout/suggestion_item.xml
@@ -56,7 +56,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:minHeight="@dimen/tp_preference_title_min_height"
- android:includeFontPadding="false"
+ android:includeFontPadding="true"
android:duplicateParentState="true"
android:textAppearance="?android:attr/textAppearanceListItem"/>
<TextView
@@ -65,7 +65,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/lb_preference_item_primary_text_margin_bottom"
android:minHeight="@dimen/tp_preference_summary_min_height"
- android:includeFontPadding="false"
+ android:includeFontPadding="true"
android:duplicateParentState="true"
android:textAppearance="?android:attr/textAppearanceListItemSecondary"
android:maxLines="4" />
diff --git a/TwoPanelSettingsLib/res/layout/slice_title_container.xml b/TwoPanelSettingsLib/res/layout/slice_title_container.xml
index 7cc9f18..a01fa08 100644
--- a/TwoPanelSettingsLib/res/layout/slice_title_container.xml
+++ b/TwoPanelSettingsLib/res/layout/slice_title_container.xml
@@ -27,7 +27,7 @@
android:id="@+id/decor_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:includeFontPadding="false"
+ android:includeFontPadding="true"
android:singleLine="false"
android:maxLines="4"
android:ellipsize="end"
@@ -40,7 +40,7 @@
android:layout_marginEnd="?android:attr/listPreferredItemPaddingEnd"
android:layout_marginTop="@dimen/decor_subtitle_margin_top"
android:layout_below="@id/decor_title"
- android:includeFontPadding="false"
+ android:includeFontPadding="true"
style="@style/TextAppearance.TwoPanelPreference.Subtitle"/>
<ImageView
android:id="@+id/decor_icon"
