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

Commit e14948d0 authored by Tracy Zhou's avatar Tracy Zhou Committed by Android (Google) Code Review
Browse files

Merge "Show hotseat instead of stashed taskbar handle after entering stage... 

Merge "Show hotseat instead of stashed taskbar handle after entering stage split from fullscreen app via keyboard shortcut" into main
parents ebc98585 e9f46354

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

+5 −0
Original line number Diff line number Diff line
@@ -253,6 +253,11 @@ public class LauncherTaskbarUIController extends TaskbarUIController { 
        return mTaskbarLauncherStateController.createAnimToLauncher(toState, callbacks, duration);

    }



    public void updateTaskbarLauncherStateGoingHome() {

        mTaskbarLauncherStateController.updateStateForFlag(FLAG_VISIBLE, true);

        mTaskbarLauncherStateController.applyState();

    }



    public boolean isDraggingItem() {

        return mControllers.taskbarDragController.isDragging();

    }

quickstep/src/com/android/quickstep/util/SplitWithKeyboardShortcutController.java

+11 −1
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ import androidx.annotation.BinderThread; 


import com.android.launcher3.R;

import com.android.launcher3.anim.PendingAnimation;

import com.android.launcher3.taskbar.LauncherTaskbarUIController;

import com.android.launcher3.uioverrides.QuickstepLauncher;

import com.android.quickstep.OverviewComponentObserver;

import com.android.quickstep.RecentsAnimationCallbacks;
@@ -150,7 +151,16 @@ public class SplitWithKeyboardShortcutController { 
            anim.addListener(new AnimatorListenerAdapter() {

                @Override

                public void onAnimationStart(Animator animation) {

                    controller.finish(true /* toRecents */, null /* onFinishComplete */,

                    controller.finish(

                            true /* toRecents */,

                            () -> {

                                LauncherTaskbarUIController controller =

                                        mLauncher.getTaskbarUIController();

                                if (controller != null) {

                                    controller.updateTaskbarLauncherStateGoingHome();

                                }



                            },

                            false /* sendUserLeaveHint */);

                }