Merge "Enable hyphenation on most of preference." into tm-dev am: 610538e10b
am: 66c9a88946
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18515218 Change-Id: Ia4a1b520c3f14593a81a0435c07b1d0b35c06e1e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -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 {
|
||||
|
Reference in New Issue
Block a user