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

Commit 38943296 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix that adds home button back to CollapsingToolbarDelegate view" into main

parents 47a857bc 32c577d8

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

+2 −4
Original line number Diff line number Diff line
@@ -342,10 +342,8 @@ public class CollapsingToolbarDelegate { 
            return;

        }



        if (!SettingsThemeHelper.isExpressiveTheme(inflater.getContext())) {

        mCollapsingToolbarLayout.removeAllViews();

        inflater.inflate(R.layout.support_toolbar, mCollapsingToolbarLayout);

        }



        final androidx.appcompat.widget.Toolbar supportToolbar =

                mCollapsingToolbarLayout.findViewById(R.id.support_action_bar);