Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add line spacing multiplier for CollapsingToolbarLayout" into sc-dev am: f639c4ebe4

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15126412

Change-Id: Ia98f818f372b2f74e0db2e41cba69ac34e4b8990
This commit is contained in:
Mill Chen
2021-06-28 17:52:07 +00:00
committed by Automerger Merge Worker
parent daaa10c785 f639c4ebe4
commit 4fa1acf1af
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/SettingsLib/CollapsingToolbarBaseActivity/src/com/android/settingslib/collapsingtoolbar/CollapsingToolbarBaseActivity.java
View File

@@ -41,6 +41,7 @@ public class CollapsingToolbarBaseActivity extends FragmentActivity implements
private static final int TOOLBAR_MAX_LINE_NUMBER = 2; private static final int TOOLBAR_MAX_LINE_NUMBER = 2;
private static final int FULLY_EXPANDED_OFFSET = 0; 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"; private static final String KEY_IS_TOOLBAR_COLLAPSED = "is_toolbar_collapsed";
@Nullable @Nullable
@@ -194,6 +195,8 @@ public class CollapsingToolbarBaseActivity extends FragmentActivity implements
getResources().getDimensionPixelSize( getResources().getDimensionPixelSize(
R.dimen.scrim_visible_height_trigger_three_lines)); R.dimen.scrim_visible_height_trigger_three_lines));
mCollapsingToolbarLayout.setLayoutParams(lp); mCollapsingToolbarLayout.setLayoutParams(lp);
mCollapsingToolbarLayout
.setLineSpacingMultiplier(TOOLBAR_LINE_SPACING_MULTIPLIER);
} else if (count == TOOLBAR_MAX_LINE_NUMBER) { } else if (count == TOOLBAR_MAX_LINE_NUMBER) {
final ViewGroup.LayoutParams lp = mCollapsingToolbarLayout.getLayoutParams(); final ViewGroup.LayoutParams lp = mCollapsingToolbarLayout.getLayoutParams();
lp.height = getResources() lp.height = getResources()
@@ -202,6 +205,8 @@ public class CollapsingToolbarBaseActivity extends FragmentActivity implements
getResources().getDimensionPixelSize( getResources().getDimensionPixelSize(
R.dimen.scrim_visible_height_trigger_two_lines)); R.dimen.scrim_visible_height_trigger_two_lines));
mCollapsingToolbarLayout.setLayoutParams(lp); mCollapsingToolbarLayout.setLayoutParams(lp);
mCollapsingToolbarLayout
.setLineSpacingMultiplier(TOOLBAR_LINE_SPACING_MULTIPLIER);
} }
} }
}); });