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

Commit 03e384c3 authored by Winson Chung's avatar Winson Chung Committed by Automerger Merge Worker
Browse files

Merge "Only refresh the launcher resume state when the task launch fails" into... 

Merge "Only refresh the launcher resume state when the task launch fails" into udc-dev am: e04071e1 am: 48526706

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23151004



Change-Id: Ida864ed458f2e27b1455530b6094628852de02cb
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents deb445d4 48526706

quickstep/src/com/android/launcher3/taskbar/LauncherTaskbarUIController.java

+4 −0
Original line number Diff line number Diff line
@@ -197,6 +197,10 @@ public class LauncherTaskbarUIController extends TaskbarUIController { 
        return mTaskbarLauncherStateController.applyState(fromInit ? 0 : duration, startAnimation);

    }



    public void refreshResumedState() {

        onLauncherResumedOrPaused(mLauncher.hasBeenResumed());

    }



    /**

     * Create Taskbar animation when going from an app to Launcher as part of recents transition.

     * @param toState If known, the state we will end up in when reaching Launcher.

quickstep/src/com/android/launcher3/taskbar/TaskbarLauncherStateController.java

+0 −4
Original line number Diff line number Diff line
@@ -207,10 +207,6 @@ public class TaskbarLauncherStateController { 
                    com.android.launcher3.taskbar.Utilities.setOverviewDragState(

                            mControllers, finalState.disallowTaskbarGlobalDrag(),

                            disallowLongClick, finalState.allowTaskbarInitialSplitSelection());

                    // LauncherTaskbarUIController depends on the state when checking whether

                    // to handle resume, so it should also be poked if current state changes

                    mLauncher.getTaskbarUIController().onLauncherResumedOrPaused(

                            mLauncher.hasBeenResumed());

                }

            };

quickstep/src/com/android/launcher3/taskbar/TaskbarUIController.java

+5 −0
Original line number Diff line number Diff line
@@ -318,4 +318,9 @@ public class TaskbarUIController { 
        }

        return null;

    }



    /**

     * Refreshes the resumed state of this ui controller.

     */

    public void refreshResumedState() {}

}

quickstep/src/com/android/quickstep/views/TaskView.java

+7 −0
Original line number Diff line number Diff line
@@ -849,6 +849,13 @@ public class TaskView extends FrameLayout implements Reusable { 
                    // QuickstepTransitionManager.createWallpaperOpenAnimations when launcher

                    // shows again

                    getRecentsView().startHome(false /* animated */);

                    RecentsView rv = getRecentsView();

                    if (rv != null && rv.mSizeStrategy.getTaskbarController() != null) {

                        // LauncherTaskbarUIController depends on the launcher state when checking

                        // whether to handle resume, but that can come in before startHome() changes

                        // the state, so force-refresh here to ensure the taskbar is updated

                        rv.mSizeStrategy.getTaskbarController().refreshResumedState();

                    }

                });

            }

            // Indicate success once the system has indicated that the transition has started