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

Commit a36e5f13 authored by Schneider Victor-tulias's avatar Schneider Victor-tulias
Browse files

Treat all apps predictions as all app icons when animating icons to their original position 

Taskbar all apps predictions were being ignored when animating a cancelled drag to their original position. This was causing a null pointer since they no longer had a view parent that could be used. These icons will now animated to the taskbar all apps icon.

Fixes: 236669335
Test: cancelled drags of taskbar icons, predicted taskbar icons, taskbar all apps icons and taskbar all apps prediction icons
Change-Id: I2a9a1ed4120927a08b8c8341ad36dfdb95fef608
parent 3bc7b93e

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) {