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

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

Merge "Fix back button circle style in expressive theme" into main

parents 2354e729 91baee8d

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

+8 −0
Original line number Diff line number Diff line
@@ -30,6 +30,8 @@ import androidx.annotation.Nullable; 
import androidx.coordinatorlayout.widget.CoordinatorLayout;

import androidx.fragment.app.Fragment;



import com.android.settingslib.widget.SettingsThemeHelper;



import com.google.android.material.appbar.AppBarLayout;

import com.google.android.material.appbar.CollapsingToolbarLayout;
@@ -43,6 +45,12 @@ public abstract class CollapsingToolbarBaseFragment extends Fragment { 
        @Override

        public ActionBar setActionBar(Toolbar toolbar) {

            requireActivity().setActionBar(toolbar);

            // In CollapsingToolbarDelegate we won't be setting the up indicator style if the action

            // bar being returned is null. Return the action bar object if the expressive theme is

            // enabled in order to set the up indication style correctly.

            if (SettingsThemeHelper.isExpressiveTheme(requireContext())) {

                return requireActivity().getActionBar();

            }

            return null;

        }