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

Commit 5487e82d authored by Xin Li's avatar Xin Li
Browse files

DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5713463) into stage-aosp-master 

Bug: 134405016
Change-Id: I279b64afeef1fff82e47faf8a65da7e3454e9604
parents e4aaef8c 6070b987

go/quickstep/src/com/android/quickstep/FallbackActivityControllerHelper.java

+3 −0
Original line number Diff line number Diff line
@@ -113,4 +113,7 @@ public final class FallbackActivityControllerHelper extends 
    public int getContainerType() {

        return LauncherLogProto.ContainerType.SIDELOADED_LAUNCHER;

    }



    @Override

    public void onLaunchTaskSuccess(RecentsActivity activity) { }

}

go/quickstep/src/com/android/quickstep/LauncherActivityControllerHelper.java

+5 −0
Original line number Diff line number Diff line
@@ -104,4 +104,9 @@ public final class LauncherActivityControllerHelper extends GoActivityControlHel 
        return launcher != null ? launcher.getStateManager().getState().containerType

                : LauncherLogProto.ContainerType.APP;

    }



    @Override

    public void onLaunchTaskSuccess(Launcher launcher) {

        launcher.getStateManager().moveToRestState();

    }

}

quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/states/BackgroundAppState.java

+2 −1
Original line number Diff line number Diff line
@@ -81,7 +81,8 @@ public class BackgroundAppState extends OverviewState { 


    @Override

    public int getVisibleElements(Launcher launcher) {

        return super.getVisibleElements(launcher) & ~RECENTS_CLEAR_ALL_BUTTON;

        return super.getVisibleElements(launcher)

                & ~RECENTS_CLEAR_ALL_BUTTON & ~VERTICAL_SWIPE_INDICATOR;

    }



    @Override

quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/states/QuickSwitchState.java

+2 −0
Original line number Diff line number Diff line
@@ -57,6 +57,8 @@ public class QuickSwitchState extends BackgroundAppState { 
                if (!success) {

                    launcher.getStateManager().goToState(OVERVIEW);

                    tasktolaunch.notifyTaskLaunchFailed(TAG);

                } else {

                    launcher.getStateManager().moveToRestState();

                }

            }, new Handler(Looper.getMainLooper()));

        } else {

quickstep/recents_ui_overrides/src/com/android/quickstep/FallbackActivityControllerHelper.java

+5 −0
Original line number Diff line number Diff line
@@ -230,4 +230,9 @@ public final class FallbackActivityControllerHelper implements 
        // TODO: probably go back to overview instead.

        activity.<RecentsView>getOverviewPanel().startHome();

    }



    @Override

    public void onLaunchTaskSuccess(RecentsActivity activity) {

        activity.onTaskLaunched();

    }

}