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

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

Merge "OverviewActions: Renaming overview_actions_container and... 

Merge "OverviewActions: Renaming overview_actions_container and setActionsView" into ub-launcher3-master
parents 31234050 e7dd35ef

quickstep/recents_ui_overrides/res/layout/fallback_recents_activity.xml

+1 −1
Original line number Diff line number Diff line
@@ -31,6 +31,6 @@ 


    <include

        android:id="@+id/overview_actions_view"

        layout="@layout/overview_actions_holder" />

        layout="@layout/overview_actions_container" />



</com.android.quickstep.fallback.RecentsRootView>

quickstep/recents_ui_overrides/src/com/android/quickstep/views/RecentsView.java

+2 −3
Original line number Diff line number Diff line
@@ -90,7 +90,6 @@ import com.android.launcher3.DeviceProfile; 
import com.android.launcher3.Insettable;

import com.android.launcher3.InsettableFrameLayout;

import com.android.launcher3.InvariantDeviceProfile;

import com.android.launcher3.Launcher;

import com.android.launcher3.LauncherState;

import com.android.launcher3.PagedView;

import com.android.launcher3.R;
@@ -482,7 +481,7 @@ public abstract class RecentsView<T extends BaseActivity> extends PagedView impl 
        mIPinnedStackAnimationListener.setActivity(mActivity);

        SystemUiProxy.INSTANCE.get(getContext()).setPinnedStackAnimationListener(

                mIPinnedStackAnimationListener);

        addActionsView();

        setActionsView();

    }



    @Override
@@ -2121,7 +2120,7 @@ public abstract class RecentsView<T extends BaseActivity> extends PagedView impl 
        }

    }



    private void addActionsView() {

    private void setActionsView() {

        if (mActionsView == null && ENABLE_OVERVIEW_ACTIONS.get()

                && SysUINavigationMode.removeShelfFromOverview(mActivity)) {

            mActionsView = ((ViewGroup) getParent()).findViewById(R.id.overview_actions_view);

res/layout/launcher.xml

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ 


        <include

            android:id="@+id/overview_actions_view"

            layout="@layout/overview_actions_holder" />

            layout="@layout/overview_actions_container" />



        <!-- Keep these behind the workspace so that they are not visible when

         we go into AllApps -->