summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Dmitry Dementyev <dementyev@google.com> 2023-09-22 17:56:03 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2023-09-22 17:56:03 +0000
commit093294589fab94ead965e3aedbbf690dd2b83f78 (patch)
treeaa81b9bc1d3b118fc1e60b0dcb9234284e5ad02b
parentf2cf107421071c56edf9d1a2d0c19991f42dc6b2 (diff)
parent87e81c22fa3531b378ef4bce06026c0f602ff5a1 (diff)
Merge "Update simple_list_item_single_choice to work better with large fonts." into main
-rw-r--r--core/res/res/layout/simple_list_item_multiple_choice.xml3
-rw-r--r--core/res/res/layout/simple_list_item_single_choice.xml3
2 files changed, 4 insertions, 2 deletions
diff --git a/core/res/res/layout/simple_list_item_multiple_choice.xml b/core/res/res/layout/simple_list_item_multiple_choice.xml
index 440b6fd8e1b1..fd9bf76aade5 100644
--- a/core/res/res/layout/simple_list_item_multiple_choice.xml
+++ b/core/res/res/layout/simple_list_item_multiple_choice.xml
@@ -17,7 +17,8 @@
<CheckedTextView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@android:id/text1"
android:layout_width="match_parent"
- android:layout_height="?android:attr/listPreferredItemHeightSmall"
+ android:layout_height="wrap_content"
+ android:minHeight="?android:attr/listPreferredItemHeightSmall"
android:textAppearance="?android:attr/textAppearanceListItemSmall"
android:gravity="center_vertical"
android:checkMark="?android:attr/listChoiceIndicatorMultiple"
diff --git a/core/res/res/layout/simple_list_item_single_choice.xml b/core/res/res/layout/simple_list_item_single_choice.xml
index 02cb7f77645c..a66308e1ad02 100644
--- a/core/res/res/layout/simple_list_item_single_choice.xml
+++ b/core/res/res/layout/simple_list_item_single_choice.xml
@@ -17,7 +17,8 @@
<CheckedTextView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@android:id/text1"
android:layout_width="match_parent"
- android:layout_height="?android:attr/listPreferredItemHeightSmall"
+ android:layout_height="wrap_content"
+ android:minHeight="?android:attr/listPreferredItemHeightSmall"
android:textAppearance="?android:attr/textAppearanceListItemSmall"
android:gravity="center_vertical"
android:checkMark="?android:attr/listChoiceIndicatorSingle"