Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Allow the title of preference display in 2 lines" into sc-dev

Browse Source
This commit is contained in:
Edgar Wang
2021-06-09 07:02:19 +00:00
committed by Android (Google) Code Review
parent bbece86115 58c464179b
commit a51e1efffe
5 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SettingsLib/SettingsTheme/res/layout-v31/settingslib_preference.xml
View File

@@ -42,7 +42,7 @@
android:id="@android:id/title" android:id="@android:id/title"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:singleLine="true" android:maxLines="2"
android:textAppearance="?android:attr/textAppearanceListItem" android:textAppearance="?android:attr/textAppearanceListItem"
android:ellipsize="marquee"/> android:ellipsize="marquee"/>

2
packages/SettingsLib/TwoTargetPreference/res/layout-v31/preference_two_target.xml
View File

@@ -40,7 +40,7 @@
android:id="@android:id/title" android:id="@android:id/title"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:singleLine="true" android:maxLines="2"
android:textAppearance="?android:attr/textAppearanceListItem" android:textAppearance="?android:attr/textAppearanceListItem"
android:ellipsize="marquee"/> android:ellipsize="marquee"/>

2
packages/SettingsLib/res/layout/preference_access_point.xml
View File

@@ -64,7 +64,7 @@
android:id="@android:id/title" android:id="@android:id/title"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:singleLine="true" android:maxLines="2"
android:textAppearance="?android:attr/textAppearanceListItem" android:textAppearance="?android:attr/textAppearanceListItem"
android:ellipsize="marquee" /> android:ellipsize="marquee" />

2
packages/SettingsLib/res/layout/preference_checkable_two_target.xml
View File

@@ -61,7 +61,7 @@
android:id="@android:id/title" android:id="@android:id/title"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:singleLine="true" android:maxLines="2"
android:textAppearance="?android:attr/textAppearanceListItem" android:textAppearance="?android:attr/textAppearanceListItem"
android:ellipsize="marquee" /> android:ellipsize="marquee" />

2
packages/SettingsLib/res/layout/restricted_switch_preference.xml
View File

@@ -51,7 +51,7 @@
<TextView android:id="@android:id/title" <TextView android:id="@android:id/title"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:singleLine="true" android:maxLines="2"
android:textAppearance="?android:attr/textAppearanceListItem" android:textAppearance="?android:attr/textAppearanceListItem"
android:ellipsize="marquee" /> android:ellipsize="marquee" />