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

Merge "Fix the problem that the title of MainsSitchPreference will be truncated." into sc-dev am: d8d35066c1

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15126530

Change-Id: I1e0578f1e4e99726a20806bc4c282338198217cd
This commit is contained in:
Stanley Wang
2021-06-30 06:42:33 +00:00
committed by Automerger Merge Worker
parent fbc7e250ff d8d35066c1
commit b5794e0fe1
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/SettingsLib/MainSwitchPreference/res/layout-v31/settingslib_main_switch_bar.xml
View File

@@ -36,9 +36,9 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_weight="1" android:layout_weight="1"
android:layout_marginEnd="16dp" android:layout_marginEnd="@dimen/settingslib_switch_title_margin"
android:layout_marginVertical="@dimen/settingslib_switch_title_margin"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:maxLines="2"
android:ellipsize="end" android:ellipsize="end"
android:textAppearance="?android:attr/textAppearanceListItem" android:textAppearance="?android:attr/textAppearanceListItem"
style="@style/MainSwitchText.Settingslib" /> style="@style/MainSwitchText.Settingslib" />

3
packages/SettingsLib/MainSwitchPreference/res/values/dimens.xml
View File

@@ -41,6 +41,9 @@
<!-- Radius of switch bar --> <!-- Radius of switch bar -->
<dimen name="settingslib_switch_bar_radius">28dp</dimen> <dimen name="settingslib_switch_bar_radius">28dp</dimen>
<!-- Size of title margin -->
<dimen name="settingslib_switch_title_margin">16dp</dimen>
<!-- SwitchBar sub settings margin start / end --> <!-- SwitchBar sub settings margin start / end -->
<dimen name="settingslib_switchbar_subsettings_margin_start">72dp</dimen> <dimen name="settingslib_switchbar_subsettings_margin_start">72dp</dimen>
<dimen name="settingslib_switchbar_subsettings_margin_end">16dp</dimen> <dimen name="settingslib_switchbar_subsettings_margin_end">16dp</dimen>