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

Commit 7e0aac24 authored by Edgar Wang's avatar Edgar Wang Committed by Automerger Merge Worker
Browse files

Merge "Allow the title of preference display in 2 lines" into sc-dev am: a51e1eff am: a203af36 

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

Change-Id: Ie9ae7bc26c898b203bbecb3262de6ae5c367f016
parents 44858628 a203af36

packages/SettingsLib/SettingsTheme/res/layout-v31/settingslib_preference.xml

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ 
            android:id="@android:id/title"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:singleLine="true"

            android:maxLines="2"

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

            android:ellipsize="marquee"/>

packages/SettingsLib/TwoTargetPreference/res/layout-v31/preference_two_target.xml

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ 
            android:id="@android:id/title"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:singleLine="true"

            android:maxLines="2"

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

            android:ellipsize="marquee"/>

packages/SettingsLib/res/layout/preference_access_point.xml

+1 −1
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ 
                android:id="@android:id/title"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:singleLine="true"

                android:maxLines="2"

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

                android:ellipsize="marquee" />

packages/SettingsLib/res/layout/preference_checkable_two_target.xml

+1 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ 
                android:id="@android:id/title"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:singleLine="true"

                android:maxLines="2"

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

                android:ellipsize="marquee" />

packages/SettingsLib/res/layout/restricted_switch_preference.xml

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ 
        <TextView android:id="@android:id/title"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:singleLine="true"

            android:maxLines="2"

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

            android:ellipsize="marquee" />