From 35661f7d6562f7091fee8a92c250ae0a27b0312b Mon Sep 17 00:00:00 2001 From: josephpv Date: Tue, 23 Apr 2024 12:12:25 +0000 Subject: [PATCH] Add line break strategy to remove header hyphenation This change sets line break strategy and the max lines limit for the private space setup choose lock screen header Screenshot: go/ss/8CFXUAUkKXAZiPM.png Bug: 331538317 Test: Manual Change-Id: I8c8bd8d130dc0d61d050d274ac0b734a6c5e3d21 --- .../settings/privatespace/PrivateSpaceSetLockFragment.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/com/android/settings/privatespace/PrivateSpaceSetLockFragment.java b/src/com/android/settings/privatespace/PrivateSpaceSetLockFragment.java index 830b45e2796..28ac97fb0b0 100644 --- a/src/com/android/settings/privatespace/PrivateSpaceSetLockFragment.java +++ b/src/com/android/settings/privatespace/PrivateSpaceSetLockFragment.java @@ -16,6 +16,8 @@ package com.android.settings.privatespace; +import static android.text.Layout.BREAK_STRATEGY_SIMPLE; + import static com.android.settings.privatespace.PrivateSpaceSetupActivity.EXTRA_ACTION_TYPE; import static com.android.settings.privatespace.PrivateSpaceSetupActivity.SET_LOCK_ACTION; @@ -47,6 +49,7 @@ import com.google.android.setupdesign.GlifLayout; */ public class PrivateSpaceSetLockFragment extends InstrumentedFragment { private static final String TAG = "PrivateSpaceSetLockFrag"; + private static final int HEADER_TEXT_MAX_LINES = 4; @Override public View onCreateView( @@ -60,6 +63,8 @@ public class PrivateSpaceSetLockFragment extends InstrumentedFragment { GlifLayout rootView = (GlifLayout) inflater.inflate(R.layout.private_space_setlock_screen, container, false); + rootView.getHeaderTextView().setBreakStrategy(BREAK_STRATEGY_SIMPLE); + rootView.getHeaderTextView().setMaxLines(HEADER_TEXT_MAX_LINES); final FooterBarMixin mixin = rootView.getMixin(FooterBarMixin.class); mixin.setPrimaryButton( new FooterButton.Builder(getContext())