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

Commit e5713c88 authored by Nergi Rahardi's avatar Nergi Rahardi Committed by Android (Google) Code Review
Browse files

Merge "Add method to remove OnItemSelectedListener" into main

parents 00eff4ee 9537574f

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

+5 −0
Original line number Diff line number Diff line
@@ -183,6 +183,11 @@ public class CollapsingToolbarAppCompatActivity extends AppCompatActivity implem 
        getToolbarDelegate().setOnItemSelectedListener(listener);

    }



    @Override

    public void removeOnItemSelectedListener() {

        getToolbarDelegate().removeOnItemSelectedListener();

    }



    @Override

    public boolean onSupportNavigateUp() {

        if (getSupportFragmentManager().getBackStackEntryCount() > 0) {

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

+5 −0
Original line number Diff line number Diff line
@@ -175,6 +175,11 @@ public class CollapsingToolbarBaseActivity extends FragmentActivity implements 
        getToolbarDelegate().setOnItemSelectedListener(listener);

    }



    @Override

    public void removeOnItemSelectedListener() {

        getToolbarDelegate().removeOnItemSelectedListener();

    }



    @Override

    public boolean onNavigateUp() {

        if (getSupportFragmentManager().getBackStackEntryCount() > 0) {

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

+10 −0
Original line number Diff line number Diff line
@@ -294,6 +294,16 @@ public class CollapsingToolbarDelegate { 
        }

    }



    /**

     * Removes the item selected listener for the floating toolbar.

     */

    public void removeOnItemSelectedListener() {

        var layout = getToolbarItemsLayout();

        if (layout != null) {

            layout.removeOnItemSelectedListener();

        }

    }



    /**

     * Sets the selected toolbar item by its zero-based index.

     */

packages/SettingsLib/CollapsingToolbarBaseActivity/src/com/android/settingslib/collapsingtoolbar/FloatingToolbarHandler.kt

+5 −0
Original line number Diff line number Diff line
@@ -46,4 +46,9 @@ interface FloatingToolbarHandler { 
     * [ToolbarItem] is selected.

     */

    fun setOnItemSelectedListener(listener: ScrollableToolbarItemLayout.OnItemSelectedListener)



    /**

     * Stops listening to [ToolbarItem] selection changes

     */

    fun removeOnItemSelectedListener()

}
 
 No newline at end of file

packages/SettingsLib/CollapsingToolbarBaseActivity/src/com/android/settingslib/collapsingtoolbar/widget/ScrollableToolbarItemLayout.kt

+4 −0
Original line number Diff line number Diff line
@@ -52,6 +52,10 @@ class ScrollableToolbarItemLayout(context: Context, attrs: AttributeSet?) : 
        onItemSelectedListener = listener

    }



    fun removeOnItemSelectedListener() {

        onItemSelectedListener = null

    }



    fun onItemSelected(dataList: List<ToolbarItem>) {

        toolbarItemList = dataList.take(MAX_ITEMS)

        setupItems()