PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I1e600321182b83edebe65bbc932222b4ea7bc4f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Edgar Wang
2022-05-30 04:34:50 +00:00
committed by Automerger Merge Worker
parent 22c4b4009b 610538e10b
commit 7e712ef660
21 changed files with 34 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
res/layout/accessibility_launch_activity_preference.xml
View File

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

2
res/layout/accessibility_shortcut_secondary_action.xml
View File

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

1
res/layout/apn_preference_layout.xml
View File

@@ -51,6 +51,7 @@
android:textAppearance="?android:attr/textAppearanceListItemSecondary"
android:textColor="?android:attr/textColorSecondary"
android:focusable="false"
android:hyphenationFrequency="normalFast"
android:maxLines="2" />
</RelativeLayout>

2
res/layout/app_preference_item.xml
View File

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

1
res/layout/battery_active_view.xml
View File

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

2
res/layout/homepage_preference.xml
View File

@@ -62,6 +62,7 @@
android:layout_height="wrap_content"
android:singleLine="true"
android:textAppearance="?android:attr/textAppearanceListItem"
android:hyphenationFrequency="normalFast"
android:ellipsize="marquee"/>
<TextView
@@ -75,6 +76,7 @@
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="?android:attr/textColorSecondary"
android:maxLines="4"
android:hyphenationFrequency="normalFast"
style="@style/PreferenceSummaryTextStyle"/>
</RelativeLayout>
</LinearLayout>

2
res/layout/horizontal_preference.xml
View File

@@ -30,6 +30,7 @@
android:textAppearance="?android:attr/textAppearanceListItem"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:hyphenationFrequency="normalFast"
android:layout_weight="1" />
<TextView
@@ -39,6 +40,7 @@
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:layout_weight="1"
android:hyphenationFrequency="normalFast"
android:gravity="end|bottom" />
</LinearLayout>

2
res/layout/notification_app.xml
View File

@@ -38,6 +38,7 @@
android:ellipsize="end"
android:singleLine="true"
android:textAlignment="viewStart"
android:hyphenationFrequency="normalFast"
android:textAppearance="?android:attr/textAppearanceMedium" />
<TextView
@@ -50,6 +51,7 @@
android:singleLine="true"
android:textAlignment="viewStart"
android:textColor="?android:attr/textColorSecondary"
android:hyphenationFrequency="normalFast"
android:textAppearance="?android:attr/textAppearanceSmall" />
<View

2
res/layout/preference_app_restrictions.xml
View File

@@ -61,6 +61,7 @@
android:singleLine="true"
android:textAppearance="?android:attr/textAppearanceMedium"
android:ellipsize="marquee"
android:hyphenationFrequency="normalFast"
android:fadingEdge="horizontal"/>
<TextView
android:id="@android:id/summary"
@@ -74,6 +75,7 @@
android:textSize="13sp"
android:textColor="?android:attr/textColorSecondary"
android:focusable="false"
android:hyphenationFrequency="normalFast"
android:maxLines="4" />
</RelativeLayout>
</LinearLayout>

1
res/layout/preference_balance_slider.xml
View File

@@ -45,6 +45,7 @@
android:textAppearance="?android:attr/textAppearanceListItem"
android:textColor="?android:attr/textColorPrimary"
android:ellipsize="marquee"
android:hyphenationFrequency="normalFast"
android:fadingEdge="horizontal"/>
<LinearLayout
android:id="@android:id/widget_frame"

1
res/layout/preference_icon.xml
View File

@@ -57,6 +57,7 @@
android:layout_below="@android:id/title"
android:layout_alignStart="@android:id/title"
android:textAppearance="?android:attr/textAppearanceSmall"
android:hyphenationFrequency="normalFast"
android:maxLines="2" />
</RelativeLayout>

2
res/layout/preference_labeled_slider.xml
View File

@@ -35,6 +35,7 @@
android:fadingEdge="horizontal"
android:singleLine="true"
android:textAppearance="?android:attr/textAppearanceListItem"
android:hyphenationFrequency="normalFast"
android:textColor="?android:attr/textColorPrimary" />
<TextView
@@ -44,6 +45,7 @@
android:layout_below="@android:id/title"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textAlignment="viewStart"
android:hyphenationFrequency="normalFast"
android:textColor="?android:attr/textColorSecondary" />
<include

2
res/layout/preference_multiline_title.xml
View File

@@ -38,6 +38,7 @@
android:textColor="?android:attr/textColorPrimary"
android:textAlignment="center"
android:ellipsize="marquee"
android:hyphenationFrequency="normalFast"
android:fadingEdge="horizontal" />
<TextView
@@ -50,6 +51,7 @@
android:textAlignment="viewStart"
android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Body1"
android:textColor="?android:attr/textColorSecondary"
android:hyphenationFrequency="normalFast"
android:maxLines="10" />
</RelativeLayout>

1
res/layout/preference_progress_category.xml
View File

@@ -47,6 +47,7 @@
android:layout_weight="1"
android:layout_gravity="start|center"
android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Body2"
android:hyphenationFrequency="normalFast"
android:textColor="?android:attr/colorAccent"/>
<ProgressBar

1
res/layout/preference_radio_with_extra_widget.xml
View File

@@ -75,6 +75,7 @@
android:layout_weight="1"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textAlignment="viewStart"
android:hyphenationFrequency="normalFast"
android:textColor="?android:attr/textColorSecondary" />
</LinearLayout>
<LinearLayout

1
res/layout/preference_single_target.xml
View File

@@ -76,6 +76,7 @@
android:layout_alignStart="@android:id/title"
android:textAppearance="?android:attr/textAppearanceListItemSecondary"
android:textColor="?android:attr/textColorSecondary"
android:hyphenationFrequency="normalFast"
android:maxLines="10" />
</RelativeLayout>

1
res/layout/preference_two_target_radio.xml
View File

@@ -73,6 +73,7 @@
android:layout_alignStart="@android:id/title"
android:textAppearance="?android:attr/textAppearanceListItemSecondary"
android:textColor="?android:attr/textColorSecondary"
android:hyphenationFrequency="normalFast"
android:maxLines="10" />
</RelativeLayout>

2
res/layout/radio_with_summary.xml
View File

@@ -33,6 +33,7 @@
android:gravity="center_vertical"
android:paddingStart="20dp"
android:drawableStart="?android:attr/listChoiceIndicatorSingle"
android:hyphenationFrequency="normalFast"
android:ellipsize="marquee" />
@@ -43,6 +44,7 @@
android:paddingStart="52dp"
android:textAppearance="?android:attr/textAppearanceListItemSecondary"
android:textColor="?android:attr/textColorSecondary"
android:hyphenationFrequency="normalFast"
android:maxLines="10" />
</com.android.settings.CheckableLinearLayout>

2
res/layout/running_services_app_item.xml
View File

@@ -55,6 +55,7 @@
android:ellipsize="marquee"
android:fadingEdge="horizontal"
android:maxLines="2"
android:hyphenationFrequency="normalFast"
android:textAppearance="?android:attr/textAppearanceListItem"/>
<TextView
@@ -63,6 +64,7 @@
android:layout_height="wrap_content"
android:textDirection="locale"
android:textAppearance="?android:attr/textAppearanceSmall"
android:hyphenationFrequency="normalFast"
android:textColor="?android:attr/textColorSecondary"/>
</LinearLayout>

2
res/layout/settings_summary_preference.xml
View File

@@ -32,6 +32,7 @@
android:paddingTop="0dp"
android:textColor="?android:attr/textColorPrimary"
android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Display1"
android:hyphenationFrequency="normalFast"
/>
<TextView android:id="@android:id/summary"
@@ -40,6 +41,7 @@
android:textAppearance="?android:attr/textAppearanceListItemSecondary"
android:textColor="?android:attr/textColorSecondary"
android:paddingBottom="5dp"
android:hyphenationFrequency="normalFast"
android:maxLines="10" />
<ProgressBar

3
src/com/android/settings/core/SettingsBaseActivity.java
View File

@@ -15,6 +15,8 @@
*/
package com.android.settings.core;
import static android.text.Layout.HYPHENATION_FREQUENCY_NORMAL_FAST;
import android.annotation.LayoutRes;
import android.app.ActivityManager;
import android.content.ComponentName;
@@ -106,6 +108,7 @@ public class SettingsBaseActivity extends FragmentActivity implements CategoryHa
mAppBarLayout = findViewById(R.id.app_bar);
if (mCollapsingToolbarLayout != null) {
mCollapsingToolbarLayout.setLineSpacingMultiplier(TOOLBAR_LINE_SPACING_MULTIPLIER);
mCollapsingToolbarLayout.setHyphenationFrequency(HYPHENATION_FREQUENCY_NORMAL_FAST);
}
disableCollapsingToolbarLayoutScrollingBehavior();
} else {