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

Commit 1a8cf0a9 authored by Tony Wickham's avatar Tony Wickham
Browse files

Log app launches via taskbar drag and drop 

- This also goes through the app predictions pipeline to update
  hotseat predictions

Fixes: 316940471
Test: Drag apps to split screen, ensure taskbar predictions update
      (also verify by logging AppPredictor#notifyAppTargetEvent)
Flag: None
Change-Id: I844414ecb56b4e36a2c94d913c1fb37abf056593
parent 1c7bc492

quickstep/src/com/android/launcher3/model/AppEventProducer.java

+6 −1
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_HOTSEAT 
import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_PREDICTION;

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

import static com.android.launcher3.logger.LauncherAtomExtensions.ExtendedContainers.ContainerCase.DEVICE_SEARCH_RESULT_CONTAINER;

import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_APP_LAUNCH_DRAGDROP;

import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_APP_LAUNCH_TAP;

import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_DISMISS_PREDICTION_UNDO;

import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_FOLDER_CONVERTED_TO_ICON;
@@ -132,7 +133,8 @@ public class AppEventProducer implements StatsLogConsumer { 
                || event == LAUNCHER_TASK_LAUNCH_SWIPE_DOWN

                || event == LAUNCHER_TASK_LAUNCH_TAP

                || event == LAUNCHER_QUICKSWITCH_RIGHT

                || event == LAUNCHER_QUICKSWITCH_LEFT) {

                || event == LAUNCHER_QUICKSWITCH_LEFT

                || event == LAUNCHER_APP_LAUNCH_DRAGDROP) {

            sendEvent(atomInfo, ACTION_LAUNCH, CONTAINER_PREDICTION);

        } else if (event == LAUNCHER_ITEM_DROPPED_ON_DONT_SUGGEST) {

            sendEvent(atomInfo, ACTION_DISMISS, CONTAINER_PREDICTION);
@@ -287,6 +289,9 @@ public class AppEventProducer implements StatsLogConsumer { 
            case SHORTCUTS_CONTAINER: {

                return "deep-shortcuts";

            }

            case TASK_BAR_CONTAINER: {

                return "taskbar";

            }

            case FOLDER: {

                FolderContainer fc = ci.getFolder();

                switch (fc.getParentContainerCase()) {

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

+4 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import static com.android.launcher3.LauncherSettings.Favorites.ITEM_TYPE_DEEP_SH 
import static com.android.launcher3.LauncherSettings.Favorites.ITEM_TYPE_SEARCH_ACTION;

import static com.android.launcher3.logger.LauncherAtom.ContainerInfo.ContainerCase.EXTENDED_CONTAINERS;

import static com.android.launcher3.logger.LauncherAtomExtensions.ExtendedContainers.ContainerCase.DEVICE_SEARCH_RESULT_CONTAINER;

import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_APP_LAUNCH_DRAGDROP;



import android.animation.Animator;

import android.animation.AnimatorListenerAdapter;
@@ -517,6 +518,9 @@ public class TaskbarDragController extends DragController<BaseTaskbarContext> im 
                // Note, this must be done last to ensure no AutohideSuspendFlags are active, as

                // that will prevent us from stashing until the timeout.

                mControllers.taskbarStashController.updateAndAnimateTransientTaskbar(true);



                mActivity.getStatsLogManager().logger().withItemInfo(mDragObject.dragInfo)

                        .log(LAUNCHER_APP_LAUNCH_DRAGDROP);

            }

        }

    }

src/com/android/launcher3/logging/StatsLogManager.java

+3 −0
Original line number Diff line number Diff line
@@ -117,6 +117,9 @@ public class StatsLogManager implements ResourceBasedOverride { 
        @UiEvent(doc = "Task launched from overview using SWIPE DOWN")

        LAUNCHER_TASK_LAUNCH_SWIPE_DOWN(340),



        @UiEvent(doc = "App launched by dragging and dropping, probably from taskbar")

        LAUNCHER_APP_LAUNCH_DRAGDROP(1552),



        @UiEvent(doc = "TASK dismissed from overview using SWIPE UP")

        LAUNCHER_TASK_DISMISS_SWIPE_UP(341),