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

Commit 5c9a1ef5 authored by Hyunyoung Song's avatar Hyunyoung Song Committed by Android (Google) Code Review
Browse files

Merge "Log Launcher transitions to WW" into ub-launcher3-rvc-dev

parents ce629ff8 801f81fb

quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/NavBarToHomeTouchController.java

+6 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import static com.android.launcher3.allapps.AllAppsTransitionController.ALL_APPS 
import static com.android.launcher3.anim.Interpolators.DEACCEL_3;

import static com.android.launcher3.config.FeatureFlags.ENABLE_ALL_APPS_EDU;

import static com.android.launcher3.config.FeatureFlags.ENABLE_QUICKSTEP_LIVE_TILE;

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

import static com.android.launcher3.touch.AbstractStateChangeTouchController.SUCCESS_TRANSITION_PROGRESS;

import static com.android.quickstep.views.RecentsView.ADJACENT_PAGE_OFFSET;

import static com.android.systemui.shared.system.ActivityManagerWrapper.CLOSE_SYSTEM_WINDOWS_REASON_RECENTS;
@@ -44,6 +45,7 @@ import com.android.launcher3.anim.Interpolators; 
import com.android.launcher3.anim.PendingAnimation;

import com.android.launcher3.compat.AccessibilityManagerCompat;

import com.android.launcher3.config.FeatureFlags;

import com.android.launcher3.logging.StatsLogManager;

import com.android.launcher3.states.StateAnimationConfig;

import com.android.launcher3.testing.TestProtocol;

import com.android.launcher3.touch.SingleAxisSwipeDetector;
@@ -246,5 +248,9 @@ public class NavBarToHomeTouchController implements TouchController, 
                startContainerType,

                mEndState.containerType,

                mLauncher.getWorkspace().getCurrentPage());

        mLauncher.getStatsLogManager().logger()

                .withSrcState(StatsLogManager.containerTypeToAtomState(mStartState.containerType))

                .withDstState(StatsLogManager.containerTypeToAtomState(mEndState.containerType))

                .log(LAUNCHER_HOME_GESTURE);

    }

}

quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonQuickSwitchTouchController.java

+12 −0
Original line number Diff line number Diff line
@@ -28,6 +28,10 @@ import static com.android.launcher3.anim.Interpolators.DEACCEL_5; 
import static com.android.launcher3.anim.Interpolators.LINEAR;

import static com.android.launcher3.anim.Interpolators.scrollInterpolatorForVelocity;

import static com.android.launcher3.anim.PropertySetter.NO_ANIM_PROPERTY_SETTER;

import static com.android.launcher3.logging.StatsLogManager.LAUNCHER_STATE_HOME;

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

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

import static com.android.launcher3.logging.StatsLogManager.getLauncherAtomEvent;

import static com.android.launcher3.states.StateAnimationConfig.ANIM_ALL_APPS_FADE;

import static com.android.launcher3.states.StateAnimationConfig.ANIM_VERTICAL_PROGRESS;

import static com.android.launcher3.states.StateAnimationConfig.ANIM_WORKSPACE_FADE;
@@ -61,6 +65,7 @@ import com.android.launcher3.anim.AnimatorPlaybackController; 
import com.android.launcher3.anim.PendingAnimation;

import com.android.launcher3.config.FeatureFlags;

import com.android.launcher3.graphics.OverviewScrim;

import com.android.launcher3.logging.StatsLogManager;

import com.android.launcher3.states.StateAnimationConfig;

import com.android.launcher3.touch.BaseSwipeDetector;

import com.android.launcher3.touch.BothAxesSwipeDetector;
@@ -429,6 +434,13 @@ public class NoButtonQuickSwitchTouchController implements TouchController, 
                mStartState.containerType,

                targetState.containerType,

                mLauncher.getWorkspace().getCurrentPage());

        mLauncher.getStatsLogManager().logger()

                .withSrcState(LAUNCHER_STATE_HOME)

                .withDstState(StatsLogManager.containerTypeToAtomState(targetState.containerType))

                .log(getLauncherAtomEvent(mStartState.containerType, targetState.containerType,

                        targetState.ordinal > mStartState.ordinal

                                ? LAUNCHER_UNKNOWN_SWIPEUP

                                : LAUNCHER_UNKNOWN_SWIPEDOWN));

        mLauncher.getStateManager().goToState(targetState, false, this::clearState);

    }

quickstep/recents_ui_overrides/src/com/android/quickstep/BaseSwipeUpHandlerV2.java

+28 −0
Original line number Diff line number Diff line
@@ -22,6 +22,12 @@ import static com.android.launcher3.anim.Interpolators.LINEAR; 
import static com.android.launcher3.anim.Interpolators.OVERSHOOT_1_2;

import static com.android.launcher3.config.FeatureFlags.ENABLE_QUICKSTEP_LIVE_TILE;

import static com.android.launcher3.config.FeatureFlags.UNSTABLE_SPRINGS;

import static com.android.launcher3.logging.StatsLogManager.LAUNCHER_STATE_BACKGROUND;

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

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

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

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

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

import static com.android.launcher3.util.DefaultDisplay.getSingleFrameMs;

import static com.android.launcher3.util.SystemUiController.UI_STATE_OVERVIEW;

import static com.android.quickstep.GestureState.GestureEndTarget.HOME;
@@ -62,6 +68,7 @@ import com.android.launcher3.Utilities; 
import com.android.launcher3.anim.AnimationSuccessListener;

import com.android.launcher3.anim.AnimatorPlaybackController;

import com.android.launcher3.anim.Interpolators;

import com.android.launcher3.logging.StatsLogManager;

import com.android.launcher3.logging.UserEventDispatcher;

import com.android.launcher3.statemanager.StatefulActivity;

import com.android.launcher3.userevent.nano.LauncherLogProto.Action.Direction;
@@ -891,6 +898,27 @@ public abstract class BaseSwipeUpHandlerV2<T extends StatefulActivity<?>, Q exte 
                ContainerType.NAVBAR, ContainerType.APP,

                endTarget.containerType,

                pageIndex);

        StatsLogManager.EventEnum event;

        switch (endTarget) {

            case HOME:

                event = LAUNCHER_HOME_GESTURE;

                break;

            case RECENTS:

                event = LAUNCHER_OVERVIEW_GESTURE;

                break;

            case LAST_TASK:

            case NEW_TASK:

                event = (mLogDirection == Direction.LEFT)

                        ? LAUNCHER_QUICKSWITCH_LEFT

                        : LAUNCHER_QUICKSWITCH_RIGHT;

                break;

            default:

                event = IGNORE;

        }

        StatsLogManager.newInstance(mContext).logger()

                .withSrcState(LAUNCHER_STATE_BACKGROUND)

                .withDstState(StatsLogManager.containerTypeToAtomState(endTarget.containerType))

                .log(event);

    }



    /** Animates to the given progress, where 0 is the current app and 1 is overview. */

quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/OverviewWithoutFocusInputConsumer.java

+19 −2
Original line number Diff line number Diff line
@@ -15,6 +15,9 @@ 
 */

package com.android.quickstep.inputconsumers;



import static com.android.launcher3.logging.StatsLogManager.LAUNCHER_STATE_HOME;

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



import android.content.Context;

import android.content.Intent;

import android.graphics.PointF;
@@ -22,9 +25,10 @@ import android.view.MotionEvent; 


import com.android.launcher3.BaseActivity;

import com.android.launcher3.BaseDraggingActivity;

import com.android.launcher3.logging.StatsLogUtils;

import com.android.launcher3.logger.LauncherAtom;

import com.android.launcher3.testing.TestLogging;

import com.android.launcher3.testing.TestProtocol;

import com.android.launcher3.userevent.nano.LauncherLogProto;

import com.android.launcher3.userevent.nano.LauncherLogProto.Action.Direction;

import com.android.launcher3.userevent.nano.LauncherLogProto.Action.Touch;

import com.android.quickstep.GestureState;
@@ -40,11 +44,13 @@ public class OverviewWithoutFocusInputConsumer implements InputConsumer, 
    private final Context mContext;

    private final InputMonitorCompat mInputMonitor;

    private final TriggerSwipeUpTouchTracker mTriggerSwipeUpTracker;

    private final GestureState mGestureState;



    public OverviewWithoutFocusInputConsumer(Context context,

            RecentsAnimationDeviceState deviceState, GestureState gestureState,

            InputMonitorCompat inputMonitor, boolean disableHorizontalSwipe) {

        mContext = context;

        mGestureState = gestureState;

        mInputMonitor = inputMonitor;

        mTriggerSwipeUpTracker = new TriggerSwipeUpTouchTracker(context, disableHorizontalSwipe,

                deviceState.getNavBarPosition(), this::onInterceptTouch, this);
@@ -81,10 +87,21 @@ public class OverviewWithoutFocusInputConsumer implements InputConsumer, 
        BaseActivity activity = BaseDraggingActivity.fromContext(mContext);

        int pageIndex = -1; // This number doesn't reflect workspace page index.

                            // It only indicates that launcher client screen was shown.

        int containerType = StatsLogUtils.getContainerTypeFromState(activity.getCurrentState());

        int containerType = (mGestureState != null && mGestureState.getEndTarget() != null)

                ? mGestureState.getEndTarget().containerType

                : LauncherLogProto.ContainerType.WORKSPACE;

        activity.getUserEventDispatcher().logActionOnContainer(

                wasFling ? Touch.FLING : Touch.SWIPE, Direction.UP, containerType, pageIndex);

        activity.getUserEventDispatcher().setPreviousHomeGesture(true);

        activity.getStatsLogManager().logger()

                .withSrcState(LAUNCHER_STATE_HOME)

                .withDstState(LAUNCHER_STATE_HOME)

                .withContainerInfo(LauncherAtom.ContainerInfo.newBuilder()

                        .setWorkspace(

                                LauncherAtom.WorkspaceContainer.newBuilder()

                                        .setPageIndex(-1))

                        .build())

                .log(LAUNCHER_HOME_GESTURE);

    }



    @Override

quickstep/src/com/android/quickstep/logging/StatsLogCompatManager.java

+2 −3
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ import static com.android.systemui.shared.system.SysUiStatsLog.LAUNCHER_UICHANGE 
import static com.android.systemui.shared.system.SysUiStatsLog.LAUNCHER_UICHANGED__DST_STATE__BACKGROUND;

import static com.android.systemui.shared.system.SysUiStatsLog.LAUNCHER_UICHANGED__DST_STATE__HOME;

import static com.android.systemui.shared.system.SysUiStatsLog.LAUNCHER_UICHANGED__DST_STATE__OVERVIEW;

import static com.android.systemui.shared.system.SysUiStatsLog.LAUNCHER_UICHANGED__SRC_STATE__HOME;



import android.content.Context;

import android.util.Log;
@@ -179,8 +178,8 @@ public class StatsLogCompatManager extends StatsLogManager { 
        private InstanceId mInstanceId = DEFAULT_INSTANCE_ID;

        private OptionalInt mRank = OptionalInt.empty();

        private Optional<ContainerInfo> mContainerInfo = Optional.empty();

        private int mSrcState = LAUNCHER_UICHANGED__SRC_STATE__HOME;

        private int mDstState = LAUNCHER_UICHANGED__DST_STATE__BACKGROUND;

        private int mSrcState = LAUNCHER_STATE_UNSPECIFIED;

        private int mDstState = LAUNCHER_STATE_UNSPECIFIED;

        private Optional<FromState> mFromState = Optional.empty();

        private Optional<ToState> mToState = Optional.empty();

        private Optional<String> mEditText = Optional.empty();