Fix textview overlap after font size modify to maximum

Bug: b/267268456
Test: Manual test passed
Change-Id: Ib9baf42c5ea07e6530e604a8e22fe0b6b6d5ca82
This commit is contained in:
tom hsu
2023-02-13 22:57:05 +08:00
parent 5a2088e232
commit d3f9d7d843
2 changed files with 28 additions and 26 deletions

View File

@@ -20,6 +20,8 @@
android:layout_height="wrap_content"
android:minHeight="?android:listPreferredItemHeight"
android:background="?android:colorBackground"
android:layout_marginTop="4dp"
android:layout_marginBottom="4dp"
android:layoutDirection="locale"
android:textDirection="locale">
@@ -29,12 +31,6 @@
android:paddingStart="24dp"
android:layout_toStartOf="@+id/dragHandle"/>
<TextView
android:id="@+id/label"
style="@style/LanguageCheckboxAndLabel"
android:paddingStart="56dp"
android:layout_toStartOf="@+id/dragHandle"/>
<TextView
android:id="@+id/miniLabel"
style="@style/LanguageCheckboxAndLabel"
@@ -45,27 +41,34 @@
android:layout_alignTop="@id/checkbox"
android:layout_alignBottom="@id/checkbox"/>
<TextView
android:id="@+id/l10nWarn"
style="@style/LanguageCheckboxAndLabel"
android:layout_marginTop="-28dp"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:minHeight="?android:listPreferredItemHeight"
android:paddingStart="56dp"
android:textAppearance="?android:attr/textAppearanceListItemSecondary"
android:textColor="?android:textColorSecondary"
android:text="@string/locale_not_translated"
android:layout_toStartOf="@+id/dragHandle"
android:layout_below="@id/label"/>
android:layout_toStartOf="@+id/dragHandle">
<TextView
android:id="@+id/label"
style="@style/LanguageCheckboxAndLabel"/>
<TextView
android:id="@+id/default_locale"
style="@style/LanguageCheckboxAndLabel"
android:layout_marginTop="-28dp"
android:paddingStart="56dp"
android:textAppearance="?android:attr/textAppearanceListItemSecondary"
android:textColor="?android:textColorSecondary"
android:text="@string/desc_current_default_language"
android:layout_toStartOf="@+id/dragHandle"
android:layout_below="@id/label"/>
<TextView
android:id="@+id/l10nWarn"
style="@style/LanguageCheckboxAndLabel"
android:textAppearance="?android:attr/textAppearanceListItemSecondary"
android:textColor="?android:textColorSecondary"
android:layout_marginBottom="4dp"
android:text="@string/locale_not_translated"/>
<TextView
android:id="@+id/default_locale"
style="@style/LanguageCheckboxAndLabel"
android:textAppearance="?android:attr/textAppearanceListItemSecondary"
android:textColor="?android:textColorSecondary"
android:layout_marginBottom="4dp"
android:text="@string/desc_current_default_language"/>
</LinearLayout>
<ImageView
android:id="@+id/dragHandle"

View File

@@ -322,7 +322,6 @@
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:layout_marginStart">?android:attr/listPreferredItemPaddingStart</item>
<item name="android:minHeight">?android:attr/listPreferredItemHeight</item>
<item name="android:textAppearance">?android:attr/textAppearanceListItem</item>
<item name="android:gravity">center_vertical</item>
</style>