From 139fa375cd4f8619c0171fd5a1c795c06531a7c8 Mon Sep 17 00:00:00 2001 From: Mill Chen Date: Sat, 26 Jun 2021 02:18:16 +0800 Subject: [PATCH] Add line spacing multiplier for CollapsingToolbarLayout Since there is a problem with a small line spacing between multiline title of collapsing toolbar in a few locales, that caused the title is overlapping with each other. Enlarging the line spacing by using lineSpacingMultiplier to fix it. Fix: 183223866 Test: visual verified 1) Change to MY locale 2) Navigate to Settings > Sounds & vibration > Do not disturb > Alarms & other interruptions 3) Observe the title and check if it is overlapping with each other Change-Id: I87f0af5151a6367bc623ac07b15e04c39b51c6ca --- src/com/android/settings/core/SettingsBaseActivity.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/com/android/settings/core/SettingsBaseActivity.java b/src/com/android/settings/core/SettingsBaseActivity.java index fd6ca5069a1..74494a75117 100644 --- a/src/com/android/settings/core/SettingsBaseActivity.java +++ b/src/com/android/settings/core/SettingsBaseActivity.java @@ -61,6 +61,7 @@ public class SettingsBaseActivity extends FragmentActivity implements CategoryHa private static final int DEFAULT_REQUEST = -1; private static final int FULLY_EXPANDED_OFFSET = 0; private static final int TOOLBAR_MAX_LINE_NUMBER = 2; + private static final float TOOLBAR_LINE_SPACING_MULTIPLIER = 1.1f; private static final String KEY_IS_TOOLBAR_COLLAPSED = "is_toolbar_collapsed"; protected CategoryMixin mCategoryMixin; @@ -307,6 +308,8 @@ public class SettingsBaseActivity extends FragmentActivity implements CategoryHa getResources().getDimensionPixelSize( R.dimen.scrim_visible_height_trigger_three_lines)); mCollapsingToolbarLayout.setLayoutParams(lp); + mCollapsingToolbarLayout + .setLineSpacingMultiplier(TOOLBAR_LINE_SPACING_MULTIPLIER); } else if (count == TOOLBAR_MAX_LINE_NUMBER) { final ViewGroup.LayoutParams lp = mCollapsingToolbarLayout.getLayoutParams(); lp.height = getResources() @@ -315,6 +318,8 @@ public class SettingsBaseActivity extends FragmentActivity implements CategoryHa getResources().getDimensionPixelSize( R.dimen.scrim_visible_height_trigger_two_lines)); mCollapsingToolbarLayout.setLayoutParams(lp); + mCollapsingToolbarLayout + .setLineSpacingMultiplier(TOOLBAR_LINE_SPACING_MULTIPLIER); } } });