From fbfd4ef12ea03149d319eb8a0c17031f07e3b19e Mon Sep 17 00:00:00 2001 From: Mill Chen Date: Mon, 28 Jun 2021 18:24:44 +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: Ib35ae0edb6fb168293bdb39a926bad5049eece34 --- .../collapsingtoolbar/CollapsingToolbarBaseActivity.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/packages/SettingsLib/CollapsingToolbarBaseActivity/src/com/android/settingslib/collapsingtoolbar/CollapsingToolbarBaseActivity.java b/packages/SettingsLib/CollapsingToolbarBaseActivity/src/com/android/settingslib/collapsingtoolbar/CollapsingToolbarBaseActivity.java index dbcecf1fe5b9c..f0743923ce691 100644 --- a/packages/SettingsLib/CollapsingToolbarBaseActivity/src/com/android/settingslib/collapsingtoolbar/CollapsingToolbarBaseActivity.java +++ b/packages/SettingsLib/CollapsingToolbarBaseActivity/src/com/android/settingslib/collapsingtoolbar/CollapsingToolbarBaseActivity.java @@ -40,6 +40,7 @@ public class CollapsingToolbarBaseActivity extends SettingsTransitionActivity im private static final int TOOLBAR_MAX_LINE_NUMBER = 2; private static final int FULLY_EXPANDED_OFFSET = 0; + private static final float TOOLBAR_LINE_SPACING_MULTIPLIER = 1.1f; private static final String KEY_IS_TOOLBAR_COLLAPSED = "is_toolbar_collapsed"; @Nullable @@ -193,6 +194,8 @@ public class CollapsingToolbarBaseActivity extends SettingsTransitionActivity im 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() @@ -201,6 +204,8 @@ public class CollapsingToolbarBaseActivity extends SettingsTransitionActivity im getResources().getDimensionPixelSize( R.dimen.scrim_visible_height_trigger_two_lines)); mCollapsingToolbarLayout.setLayoutParams(lp); + mCollapsingToolbarLayout + .setLineSpacingMultiplier(TOOLBAR_LINE_SPACING_MULTIPLIER); } } });