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

Commit 3cc871c8 authored by Stefan Maftei's avatar Stefan Maftei Committed by Android (Google) Code Review
Browse files

Merge "[Expressive design] Add toolbar buttons initialization API" into main

parents 16157f75 400f6687

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

+18 −3
Original line number Diff line number Diff line
@@ -179,9 +179,9 @@ public class CollapsingToolbarDelegate { 
            }

        }



        mPrimaryButton = view.findViewById(R.id.primary_button);

        mSecondaryButton = view.findViewById(R.id.secondary_button);

        mActionButton = view.findViewById(R.id.action_button);

        initToolbarPrimaryButton(view.findViewById(R.id.primary_button));

        initToolbarSecondaryButton(view.findViewById(R.id.secondary_button));

        initToolbarActionButton(view.findViewById(R.id.action_button));



        initFloatingToolbar(context, view.findViewById(R.id.floating_toolbar));

        return view;
@@ -209,6 +209,21 @@ public class CollapsingToolbarDelegate { 
        autoSetCollapsingToolbarLayoutScrolling(appBarLayout);

    }



    /** Initialize toolbar's primary button. */

    public void initToolbarPrimaryButton(MaterialButton primaryButton) {

        mPrimaryButton = primaryButton;

    }



    /** Initialize toolbar's secondary button. */

    public void initToolbarSecondaryButton(MaterialButton secondaryButton) {

        mSecondaryButton = secondaryButton;

    }



    /** Initialize toolbar's action button. */

    public void initToolbarActionButton(MaterialButton actionButton) {

        mActionButton = actionButton;

    }



    /**

     * Initialize the floating toolbar.

     * @param context