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

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

Merge "Unifying multiple definitions of MainThreadInitializedObject" into ub-launcher3-master

parents 4e414864 7244d459

quickstep/src/com/android/launcher3/uioverrides/BackButtonAlphaHandler.java

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ public class BackButtonAlphaHandler implements LauncherStateManager.StateHandler 


    public BackButtonAlphaHandler(Launcher launcher) {

        mLauncher = launcher;

        mOverviewInteractionState = OverviewInteractionState.getInstance(mLauncher);

        mOverviewInteractionState = OverviewInteractionState.INSTANCE.get(mLauncher);

    }



    @Override

quickstep/src/com/android/launcher3/uioverrides/LandscapeEdgeSwipeController.java

+1 −1
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ public class LandscapeEdgeSwipeController extends AbstractStateChangeTouchContro 
    protected void onSwipeInteractionCompleted(LauncherState targetState, int logAction) {

        super.onSwipeInteractionCompleted(targetState, logAction);

        if (mStartState == NORMAL && targetState == OVERVIEW) {

            RecentsModel.getInstance(mLauncher).onOverviewShown(true, TAG);

            RecentsModel.INSTANCE.get(mLauncher).onOverviewShown(true, TAG);

        }

    }

}

quickstep/src/com/android/launcher3/uioverrides/OverviewState.java

+1 −1
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ public class OverviewState extends LauncherState { 
    public void onStateDisabled(Launcher launcher) {

        RecentsView rv = launcher.getOverviewPanel();

        rv.setOverviewStateEnabled(false);

        RecentsModel.getInstance(launcher).resetAssistCache();

        RecentsModel.INSTANCE.get(launcher).resetAssistCache();

    }



    @Override

quickstep/src/com/android/launcher3/uioverrides/PortraitStatesTouchController.java

+1 −1
Original line number Diff line number Diff line
@@ -256,7 +256,7 @@ public class PortraitStatesTouchController extends AbstractStateChangeTouchContr 
    protected void onSwipeInteractionCompleted(LauncherState targetState, int logAction) {

        super.onSwipeInteractionCompleted(targetState, logAction);

        if (mStartState == NORMAL && targetState == OVERVIEW) {

            RecentsModel.getInstance(mLauncher).onOverviewShown(true, TAG);

            RecentsModel.INSTANCE.get(mLauncher).onOverviewShown(true, TAG);

        }

    }

quickstep/src/com/android/launcher3/uioverrides/TaskViewTouchController.java

+1 −1
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ public abstract class TaskViewTouchController<T extends BaseDraggingActivity> 
                    if (mRecentsView.isTaskViewVisible(view) && mActivity.getDragLayer()

                            .isEventOverView(view, ev)) {

                        mTaskBeingDragged = view;

                        if (!OverviewInteractionState.getInstance(mActivity)

                        if (!OverviewInteractionState.INSTANCE.get(mActivity)

                                .isSwipeUpGestureEnabled()) {

                            // Don't allow swipe down to open if we don't support swipe up

                            // to enter overview.