Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 139e43b1 authored by Stanley Wang's avatar Stanley Wang Committed by Automerger Merge Worker
Browse files

Merge "Fix the problem that the title of MainsSitchPreference will be... 

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

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

Change-Id: I1e1a8fa16da68e79382a89b22d1a7e37f35b8c8f
parents 447a3469 d8d35066

packages/SettingsLib/MainSwitchPreference/res/layout-v31/settingslib_main_switch_bar.xml

+2 −2
Original line number Diff line number Diff line
@@ -36,9 +36,9 @@ 
            android:layout_height="wrap_content"

            android:layout_width="0dp"

            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:maxLines="2"

            android:ellipsize="end"

            android:textAppearance="?android:attr/textAppearanceListItem"

            style="@style/MainSwitchText.Settingslib" />

packages/SettingsLib/MainSwitchPreference/res/values/dimens.xml

+3 −0
Original line number Diff line number Diff line
@@ -41,6 +41,9 @@ 
    <!-- Radius of switch bar -->

    <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 -->

    <dimen name="settingslib_switchbar_subsettings_margin_start">72dp</dimen>

    <dimen name="settingslib_switchbar_subsettings_margin_end">16dp</dimen>