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

Commit 90982ba3 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Treat all apps predictions as all app icons when animating icons to... 

Merge "Treat all apps predictions as all app icons when animating icons to their original position" into tm-qpr-dev am: ce12869f am: 9d9895c1

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



Change-Id: I29ee913fa3d83b3c05a705a71cc87cfc92b64764
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 83f326ad 9d9895c1

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

+2 −1
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
package com.android.launcher3.taskbar;



import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_ALL_APPS;

import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_PREDICTION;

import static com.android.launcher3.LauncherSettings.Favorites.ITEM_TYPE_DEEP_SHORTCUT;



import android.animation.Animator;
@@ -435,7 +436,7 @@ public class TaskbarDragController extends DragController<BaseTaskbarContext> im 
        if (tag instanceof ItemInfo) {

            ItemInfo item = (ItemInfo) tag;

            TaskbarViewController taskbarViewController = mControllers.taskbarViewController;

            if (item.container == CONTAINER_ALL_APPS) {

            if (item.container == CONTAINER_ALL_APPS || item.container == CONTAINER_PREDICTION) {

                // Since all apps closes when the drag starts, target the all apps button instead.

                target = taskbarViewController.getAllAppsButtonView();

            } else if (item.container >= 0) {