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

Commit 3aa0a120 authored by Edgar Wang's avatar Edgar Wang Committed by Android (Google) Code Review
Browse files

Merge "Enable hyphenation on most of preference." into tm-dev

parents fc6eb70e c3ba4319

packages/SettingsLib/AppPreference/res/layout/preference_app.xml

+2 −0
Original line number Diff line number Diff line
@@ -55,6 +55,7 @@ 
            android:ellipsize="marquee"

            android:fadingEdge="horizontal"

            android:maxLines="2"

            android:hyphenationFrequency="normalFast"

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



        <TextView
@@ -62,6 +63,7 @@ 
            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:textDirection="locale"

            android:hyphenationFrequency="normalFast"

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

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

packages/SettingsLib/CollapsingToolbarBaseActivity/src/com/android/settingslib/collapsingtoolbar/CollapsingToolbarDelegate.java

+5 −0
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 


package com.android.settingslib.collapsingtoolbar;



import static android.text.Layout.HYPHENATION_FREQUENCY_NORMAL_FAST;



import android.app.ActionBar;

import android.os.Build;

import android.view.LayoutInflater;
@@ -82,6 +84,9 @@ public class CollapsingToolbarDelegate { 
        mAppBarLayout = view.findViewById(R.id.app_bar);

        if (mCollapsingToolbarLayout != null && Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {

            mCollapsingToolbarLayout.setLineSpacingMultiplier(TOOLBAR_LINE_SPACING_MULTIPLIER);

            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {

                mCollapsingToolbarLayout.setHyphenationFrequency(HYPHENATION_FREQUENCY_NORMAL_FAST);

            }

        }

        disableCollapsingToolbarLayoutScrollingBehavior();

        mToolbar = view.findViewById(R.id.action_bar);

packages/SettingsLib/CollapsingToolbarBaseActivity/src/com/android/settingslib/collapsingtoolbar/widget/CollapsingCoordinatorLayout.java

+5 −0
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 


package com.android.settingslib.collapsingtoolbar.widget;



import static android.text.Layout.HYPHENATION_FREQUENCY_NORMAL_FAST;



import android.app.ActionBar;

import android.app.Activity;

import android.content.Context;
@@ -106,6 +108,9 @@ public class CollapsingCoordinatorLayout extends CoordinatorLayout { 
        mAppBarLayout = findViewById(R.id.app_bar);

        if (mCollapsingToolbarLayout != null) {

            mCollapsingToolbarLayout.setLineSpacingMultiplier(TOOLBAR_LINE_SPACING_MULTIPLIER);

            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {

                mCollapsingToolbarLayout.setHyphenationFrequency(HYPHENATION_FREQUENCY_NORMAL_FAST);

            }

            if (!TextUtils.isEmpty(mToolbarTitle)) {

                mCollapsingToolbarLayout.setTitle(mToolbarTitle);

            }

packages/SettingsLib/FooterPreference/res/layout-v31/preference_footer.xml

+1 −0
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ 
            android:paddingTop="16dp"

            android:paddingBottom="8dp"

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

            android:hyphenationFrequency="normalFast"

            android:ellipsize="marquee" />



        <com.android.settingslib.widget.LinkTextView

packages/SettingsLib/RadioButtonPreference/res/layout/preference_radio.xml

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

            android:layout_height="wrap_content"

            android:maxLines="2"

            android:hyphenationFrequency="normalFast"

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



        <LinearLayout
@@ -80,6 +81,7 @@ 
                android:layout_weight="1"

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

                android:textAlignment="viewStart"

                android:hyphenationFrequency="normalFast"

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



            <TextView