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

Commit 7fb4f997 authored by Vinit Nayak's avatar Vinit Nayak
Browse files

Add metrics sources for split invocation 

* See design doc in bug description for
usage/details

Bug: 231369744
Change-Id: I0c0ec11e924e387c523b5ac5feb7cabf78eaa748
parent 56c92899

quickstep/src/com/android/launcher3/popup/QuickstepSystemShortcut.java

+11 −5
Original line number Diff line number Diff line
@@ -15,14 +15,16 @@ 
 */

package com.android.launcher3.popup;



import static com.android.launcher3.util.SplitConfigurationOptions.getLogEventForPosition;



import android.content.Intent;

import android.graphics.Bitmap;

import android.graphics.drawable.BitmapDrawable;

import android.graphics.drawable.Drawable;

import android.os.UserHandle;

import android.util.Log;

import android.view.View;



import com.android.launcher3.logging.StatsLogManager;

import com.android.launcher3.model.data.ItemInfo;

import com.android.launcher3.model.data.WorkspaceItemInfo;

import com.android.launcher3.uioverrides.QuickstepLauncher;
@@ -70,9 +72,10 @@ public interface QuickstepSystemShortcut { 
            }



            RecentsView recentsView = mTarget.getOverviewPanel();

            StatsLogManager.EventEnum splitEvent = getLogEventForPosition(mPosition.stagePosition);

            recentsView.initiateSplitSelect(

                    new SplitSelectSource(mOriginalView, new BitmapDrawable(bitmap), intent,

                            mPosition, mItemInfo.user));

                            mPosition, mItemInfo, splitEvent));

        }

    }
@@ -82,15 +85,18 @@ public interface QuickstepSystemShortcut { 
        public final Drawable drawable;

        public final Intent intent;

        public final SplitPositionOption position;

        public final UserHandle user;

        public final ItemInfo mItemInfo;

        public final StatsLogManager.EventEnum splitEvent;



        public SplitSelectSource(View view, Drawable drawable, Intent intent,

                SplitPositionOption position, UserHandle user) {

                SplitPositionOption position, ItemInfo itemInfo,

                StatsLogManager.EventEnum splitEvent) {

            this.view = view;

            this.drawable = drawable;

            this.intent = intent;

            this.position = position;

            this.user = user;

            this.mItemInfo = itemInfo;

            this.splitEvent = splitEvent;

        }

    }

}

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

+6 −5
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ import android.graphics.Point; 
import android.graphics.Rect;

import android.graphics.drawable.Drawable;

import android.os.UserHandle;

import android.util.Pair;

import android.view.DragEvent;

import android.view.MotionEvent;

import android.view.SurfaceControl;
@@ -42,7 +43,6 @@ import android.window.SurfaceSyncer; 
import androidx.annotation.Nullable;



import com.android.internal.logging.InstanceId;

import com.android.internal.logging.InstanceIdSequence;

import com.android.launcher3.AbstractFloatingView;

import com.android.launcher3.BubbleTextView;

import com.android.launcher3.DragSource;
@@ -69,6 +69,7 @@ import com.android.launcher3.testing.TestLogging; 
import com.android.launcher3.testing.shared.TestProtocol;

import com.android.launcher3.util.IntSet;

import com.android.launcher3.util.ItemInfoMatcher;

import com.android.quickstep.util.LogUtils;

import com.android.systemui.shared.recents.model.Task;



import java.io.PrintWriter;
@@ -359,11 +360,11 @@ public class TaskbarDragController extends DragController<BaseTaskbarContext> im 
        }



        if (clipDescription != null && intent != null) {

            Pair<InstanceId, com.android.launcher3.logging.InstanceId> instanceIds =

                    LogUtils.getShellShareableInstanceId();

            // Need to share the same InstanceId between launcher3 and WM Shell (internal).

            InstanceId internalInstanceId = new InstanceIdSequence(

                    com.android.launcher3.logging.InstanceId.INSTANCE_ID_MAX).newInstanceId();

            com.android.launcher3.logging.InstanceId launcherInstanceId =

                    new com.android.launcher3.logging.InstanceId(internalInstanceId.getId());

            InstanceId internalInstanceId = instanceIds.first;

            com.android.launcher3.logging.InstanceId launcherInstanceId = instanceIds.second;



            intent.putExtra(ClipDescription.EXTRA_LOGGING_INSTANCE_ID, internalInstanceId);

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

+18 −3
Original line number Diff line number Diff line
@@ -15,14 +15,20 @@ 
 */

package com.android.launcher3.taskbar;



import static com.android.launcher3.util.SplitConfigurationOptions.getLogEventForPosition;



import android.content.ClipDescription;

import android.content.Intent;

import android.content.pm.LauncherApps;

import android.graphics.Point;

import android.os.Bundle;

import android.util.Pair;

import android.view.MotionEvent;

import android.view.View;



import androidx.annotation.NonNull;



import com.android.internal.logging.InstanceId;

import com.android.launcher3.AbstractFloatingView;

import com.android.launcher3.BubbleTextView;

import com.android.launcher3.LauncherSettings;
@@ -47,6 +53,7 @@ import com.android.launcher3.util.ShortcutUtil; 
import com.android.launcher3.util.SplitConfigurationOptions.SplitPositionOption;

import com.android.launcher3.views.ActivityContext;

import com.android.quickstep.SystemUiProxy;

import com.android.quickstep.util.LogUtils;



import java.io.PrintWriter;

import java.util.HashMap;
@@ -263,8 +270,14 @@ public class TaskbarPopupController implements TaskbarControllers.LoggableTaskba 


        @Override

        public void onClick(View view) {

            AbstractFloatingView.closeAllOpenViews(mTarget);

            Pair<InstanceId, com.android.launcher3.logging.InstanceId> instanceIds =

                    LogUtils.getShellShareableInstanceId();

            mTarget.getStatsLogManager().logger()

                    .withItemInfo(mItemInfo)

                    .withInstanceId(instanceIds.second)

                    .log(getLogEventForPosition(mPosition.stagePosition));



            AbstractFloatingView.closeAllOpenViews(mTarget);

            if (mItemInfo.itemType == LauncherSettings.Favorites.ITEM_TYPE_DEEP_SHORTCUT) {

                WorkspaceItemInfo workspaceItemInfo = (WorkspaceItemInfo) mItemInfo;

                SystemUiProxy.INSTANCE.get(mTarget).startShortcut(
@@ -272,7 +285,8 @@ public class TaskbarPopupController implements TaskbarControllers.LoggableTaskba 
                        workspaceItemInfo.getDeepShortcutId(),

                        mPosition.stagePosition,

                        null,

                        workspaceItemInfo.user);

                        workspaceItemInfo.user,

                        instanceIds.first);

            } else {

                SystemUiProxy.INSTANCE.get(mTarget).startIntent(

                        mTarget.getSystemService(LauncherApps.class).getMainActivityLaunchIntent(
@@ -281,7 +295,8 @@ public class TaskbarPopupController implements TaskbarControllers.LoggableTaskba 
                                mItemInfo.user),

                        new Intent(),

                        mPosition.stagePosition,

                        null);

                        null,

                        instanceIds.first);

            }

        }

    }

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

+20 −5
Original line number Diff line number Diff line
@@ -17,24 +17,29 @@ package com.android.launcher3.taskbar; 


import static com.android.launcher3.accessibility.LauncherAccessibilityDelegate.DEEP_SHORTCUTS;

import static com.android.launcher3.accessibility.LauncherAccessibilityDelegate.SHORTCUTS_AND_NOTIFICATIONS;

import static com.android.wm.shell.common.split.SplitScreenConstants.SPLIT_POSITION_BOTTOM_OR_RIGHT;

import static com.android.wm.shell.common.split.SplitScreenConstants.SPLIT_POSITION_TOP_OR_LEFT;

import static com.android.launcher3.util.SplitConfigurationOptions.STAGE_POSITION_BOTTOM_OR_RIGHT;

import static com.android.launcher3.util.SplitConfigurationOptions.STAGE_POSITION_TOP_OR_LEFT;

import static com.android.launcher3.util.SplitConfigurationOptions.getLogEventForPosition;



import android.content.Intent;

import android.content.pm.LauncherApps;

import android.util.Pair;

import android.view.KeyEvent;

import android.view.View;



import com.android.internal.logging.InstanceId;

import com.android.launcher3.BubbleTextView;

import com.android.launcher3.LauncherSettings;

import com.android.launcher3.R;

import com.android.launcher3.accessibility.BaseAccessibilityDelegate;

import com.android.launcher3.config.FeatureFlags;

import com.android.launcher3.logging.StatsLogManager;

import com.android.launcher3.model.data.ItemInfo;

import com.android.launcher3.model.data.WorkspaceItemInfo;

import com.android.launcher3.notification.NotificationListener;

import com.android.launcher3.util.ShortcutUtil;

import com.android.quickstep.SystemUiProxy;

import com.android.quickstep.util.LogUtils;



import java.util.List;
@@ -49,10 +54,12 @@ public class TaskbarShortcutMenuAccessibilityDelegate 
    public static final int MOVE_TO_BOTTOM_OR_RIGHT = R.id.action_move_to_bottom_or_right;



    private final LauncherApps mLauncherApps;

    private final StatsLogManager mStatsLogManager;



    public TaskbarShortcutMenuAccessibilityDelegate(TaskbarActivityContext context) {

        super(context);

        mLauncherApps = context.getSystemService(LauncherApps.class);

        mStatsLogManager = context.getStatsLogManager();



        mActions.put(DEEP_SHORTCUTS, new LauncherAction(DEEP_SHORTCUTS,

                R.string.action_deep_shortcut, KeyEvent.KEYCODE_S));
@@ -82,7 +89,14 @@ public class TaskbarShortcutMenuAccessibilityDelegate 
                && (action == MOVE_TO_TOP_OR_LEFT || action == MOVE_TO_BOTTOM_OR_RIGHT)) {

            WorkspaceItemInfo info = (WorkspaceItemInfo) item;

            int side = action == MOVE_TO_TOP_OR_LEFT

                    ? SPLIT_POSITION_TOP_OR_LEFT : SPLIT_POSITION_BOTTOM_OR_RIGHT;

                    ? STAGE_POSITION_TOP_OR_LEFT : STAGE_POSITION_BOTTOM_OR_RIGHT;



            Pair<InstanceId, com.android.launcher3.logging.InstanceId> instanceIds =

                    LogUtils.getShellShareableInstanceId();

            mStatsLogManager.logger()

                    .withItemInfo(item)

                    .withInstanceId(instanceIds.second)

                    .log(getLogEventForPosition(side));



            if (info.itemType == LauncherSettings.Favorites.ITEM_TYPE_DEEP_SHORTCUT) {

                SystemUiProxy.INSTANCE.get(mContext).startShortcut(
@@ -90,14 +104,15 @@ public class TaskbarShortcutMenuAccessibilityDelegate 
                        info.getDeepShortcutId(),

                        side,

                        /* bundleOpts= */ null,

                        info.user);

                        info.user,

                        instanceIds.first);

            } else {

                SystemUiProxy.INSTANCE.get(mContext).startIntent(

                        mLauncherApps.getMainActivityLaunchIntent(

                                item.getIntent().getComponent(),

                                /* startActivityOptions= */null,

                                item.user),

                        new Intent(), side, null);

                        new Intent(), side, null, instanceIds.first);

            }

            return true;

        } else if (action == DEEP_SHORTCUTS || action == SHORTCUTS_AND_NOTIFICATIONS) {

quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java

+3 −3
Original line number Diff line number Diff line
@@ -192,7 +192,7 @@ public class QuickstepLauncher extends Launcher { 
        RecentsView overviewPanel = (RecentsView) getOverviewPanel();

        SplitSelectStateController controller =

                new SplitSelectStateController(this, mHandler, getStateManager(),

                        getDepthController());

                        getDepthController(), getStatsLogManager());

        overviewPanel.init(mActionsView, controller);

        mActionsView.updateDimension(getDeviceProfile(), overviewPanel.getLastComputedTaskSize());

        mActionsView.updateVerticalMargin(DisplayController.getNavigationMode(this));
@@ -899,8 +899,8 @@ public class QuickstepLauncher extends Launcher { 
            outState.putIBinder(PENDING_SPLIT_SELECT_INFO, ObjectWrapper.wrap(

                    new PendingSplitSelectInfo(

                            splitSelectStateController.getInitialTaskId(),

                            splitSelectStateController.getActiveSplitStagePosition()

                    )

                            splitSelectStateController.getActiveSplitStagePosition(),

                            splitSelectStateController.getSplitEvent())

            ));

            outState.putInt(RUNTIME_STATE, OVERVIEW.ordinal);

        }