Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e1cd1d2f authored by Mill Chen's avatar Mill Chen Committed by Automerger Merge Worker
Browse files

Merge "Add line spacing multiplier for CollapsingToolbarLayout" into sc-dev... 

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

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

Change-Id: If19d03ea47aa10605dae25ab47909f850a84fd25
parents 7736c056 eef295b6

packages/SettingsLib/CollapsingToolbarBaseActivity/src/com/android/settingslib/collapsingtoolbar/CollapsingToolbarBaseActivity.java

+5 −0
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ public class CollapsingToolbarBaseActivity extends FragmentActivity implements 


    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
@@ -194,6 +195,8 @@ public class CollapsingToolbarBaseActivity extends FragmentActivity implements 
                            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()
@@ -202,6 +205,8 @@ public class CollapsingToolbarBaseActivity extends FragmentActivity implements 
                            getResources().getDimensionPixelSize(

                                    R.dimen.scrim_visible_height_trigger_two_lines));

                    mCollapsingToolbarLayout.setLayoutParams(lp);

                    mCollapsingToolbarLayout

                            .setLineSpacingMultiplier(TOOLBAR_LINE_SPACING_MULTIPLIER);

                }

            }

        });