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

Commit 19d9da75 authored by Tom Hsu's avatar Tom Hsu Committed by Automerger Merge Worker
Browse files

Merge "Add function of text hyphenate to buttons." into tm-dev am: a2a6d884 am: abf3e09a 

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



Change-Id: I7ceb673bedccaeff34da0a250726ff6cdfd2e00e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b2d7ea25 abf3e09a

packages/SettingsLib/ActionButtonsPreference/res/layout-v31/settingslib_action_buttons.xml

+8 −4
Original line number Diff line number Diff line
@@ -28,7 +28,8 @@ 
        style="@style/SettingsLibActionButton"

        android:layout_width="0dp"

        android:layout_height="match_parent"

        android:layout_weight="1"/>

        android:layout_weight="1"

        android:hyphenationFrequency="normalFast"/>



    <View

        android:id="@+id/divider1"
@@ -43,7 +44,8 @@ 
        style="@style/SettingsLibActionButton"

        android:layout_width="0dp"

        android:layout_height="match_parent"

        android:layout_weight="1"/>

        android:layout_weight="1"

        android:hyphenationFrequency="normalFast"/>



    <View

        android:id="@+id/divider2"
@@ -58,7 +60,8 @@ 
        style="@style/SettingsLibActionButton"

        android:layout_width="0dp"

        android:layout_height="match_parent"

        android:layout_weight="1"/>

        android:layout_weight="1"

        android:hyphenationFrequency="normalFast"/>



    <View

        android:id="@+id/divider3"
@@ -73,5 +76,6 @@ 
        style="@style/SettingsLibActionButton"

        android:layout_width="0dp"

        android:layout_height="match_parent"

        android:layout_weight="1"/>

        android:layout_weight="1"

        android:hyphenationFrequency="normalFast"/>

</LinearLayout>