PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix textview overlap after font size modify to maximum"

Browse Source
This commit is contained in:
TreeHugger Robot
2023-02-16 08:50:01 +00:00
committed by Android (Google) Code Review
parent 4afd4c639c d3f9d7d843
commit e45f1af4ea
2 changed files with 28 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
res/layout/locale_drag_cell.xml
View File

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

1
res/values/styles.xml
View File

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