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

Commit 4f5a65d4 authored by Edgar Wang's avatar Edgar Wang Committed by Automerger Merge Worker
Browse files

Merge "Enable hyphenation on most of preference." into tm-dev am: 610538e1 am: 17675047 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18515218



Change-Id: I0e30a9c258df97364b0ef848ed669d73e5a9b75a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 304a3fd3 17675047

res/layout/accessibility_launch_activity_preference.xml

+1 −0
Original line number Diff line number Diff line
@@ -33,5 +33,6 @@ 
        android:layout_gravity="center_vertical"

        android:ellipsize="end"

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

        android:hyphenationFrequency="normalFast"

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

</LinearLayout>

res/layout/accessibility_shortcut_secondary_action.xml

+2 −0
Original line number Diff line number Diff line
@@ -59,6 +59,7 @@ 
                android:layout_height="wrap_content"

                android:singleLine="true"

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

                android:hyphenationFrequency="normalFast"

                android:ellipsize="marquee" />



            <TextView
@@ -69,6 +70,7 @@ 
                android:layout_alignStart="@android:id/title"

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

                android:textColor="?android:attr/textColorSecondary"

                android:hyphenationFrequency="normalFast"

                android:maxLines="10" />



        </RelativeLayout>

res/layout/apn_preference_layout.xml

+1 −0
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ 
            android:textAppearance="?android:attr/textAppearanceListItemSecondary"

            android:textColor="?android:attr/textColorSecondary"

            android:focusable="false"

            android:hyphenationFrequency="normalFast"

            android:maxLines="2" />



    </RelativeLayout>

res/layout/app_preference_item.xml

+2 −0
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ 
            android:paddingEnd="7dip"

            android:ellipsize="marquee"

            android:duplicateParentState="true"

            android:hyphenationFrequency="normalFast"

            />

        <TextView

            android:id="@android:id/summary"
@@ -67,6 +68,7 @@ 
            android:ellipsize="marquee"

            android:visibility="gone"

            android:duplicateParentState="true"

            android:hyphenationFrequency="normalFast"

            />

    </LinearLayout>

    <TextView

res/layout/battery_active_view.xml

+1 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 
        android:layout_height="wrap_content"

        android:textAlignment="viewStart"

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

        android:hyphenationFrequency="normalFast"

        android:textColor="?android:attr/textColorSecondary" />



    <com.android.settings.fuelgauge.BatteryActiveView