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

Commit 3b261839 authored by Winson Chung's avatar Winson Chung Committed by Android (Google) Code Review
Browse files

Merge "Revert "Generating fake “to Recents” events for overview NOT from... 

Merge "Revert "Generating fake “to Recents” events for overview NOT from task"" into ub-launcher3-master
parents cfab8c5d 53daa2ca

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

+0 −48
Original line number Original line Diff line number Diff line
@@ -24,7 +24,6 @@ import static com.android.launcher3.touch.SwipeDetector.VERTICAL; 
import static com.android.quickstep.TouchInteractionService.EDGE_NAV_BAR;

import static com.android.quickstep.TouchInteractionService.EDGE_NAV_BAR;





import android.graphics.Rect;

import android.graphics.Rect;

import android.metrics.LogMaker;

import android.view.MotionEvent;

import android.view.MotionEvent;





import com.android.launcher3.DeviceProfile;

import com.android.launcher3.DeviceProfile;
@@ -35,40 +34,6 @@ import com.android.launcher3.dragndrop.DragLayer; 
import com.android.launcher3.util.VerticalSwipeController;

import com.android.launcher3.util.VerticalSwipeController;

import com.android.quickstep.RecentsView;

import com.android.quickstep.RecentsView;





class EventLogTags {

    private EventLogTags() {

    }  // don't instantiate



    /** 524292 sysui_multi_action (content|4) */

    public static final int SYSUI_MULTI_ACTION = 524292;



    public static void writeSysuiMultiAction(Object[] content) {

        android.util.EventLog.writeEvent(SYSUI_MULTI_ACTION, content);

    }

}



class MetricsLogger {

    private static MetricsLogger sMetricsLogger;



    private static MetricsLogger getLogger() {

        if (sMetricsLogger == null) {

            sMetricsLogger = new MetricsLogger();

        }

        return sMetricsLogger;

    }



    protected void saveLog(Object[] rep) {

        EventLogTags.writeSysuiMultiAction(rep);

    }



    public void write(LogMaker content) {

        if (content.getType() == 0/*MetricsEvent.TYPE_UNKNOWN*/) {

            content.setType(4/*MetricsEvent.TYPE_ACTION*/);

        }

        saveLog(content.serialize());

    }

}



/**

/**

 * Extension of {@link VerticalSwipeController} to go from NORMAL to OVERVIEW.

 * Extension of {@link VerticalSwipeController} to go from NORMAL to OVERVIEW.

 */

 */
@@ -77,8 +42,6 @@ public class EdgeSwipeController extends VerticalSwipeController implements 




    private static final Rect sTempRect = new Rect();

    private static final Rect sTempRect = new Rect();





    private final MetricsLogger mMetricsLogger = new MetricsLogger();



    public EdgeSwipeController(Launcher l) {

    public EdgeSwipeController(Launcher l) {

        super(l, NORMAL, OVERVIEW, l.getDeviceProfile().isVerticalBarLayout()

        super(l, NORMAL, OVERVIEW, l.getDeviceProfile().isVerticalBarLayout()

                ? HORIZONTAL : VERTICAL);

                ? HORIZONTAL : VERTICAL);
@@ -107,17 +70,6 @@ public class EdgeSwipeController extends VerticalSwipeController implements 




    @Override

    @Override

    protected void onTransitionComplete(boolean wasFling, boolean stateChanged) {

    protected void onTransitionComplete(boolean wasFling, boolean stateChanged) {

        if (stateChanged && mToState instanceof OverviewState) {

            // Mimic ActivityMetricsLogger.logAppTransitionMultiEvents() logging for

            // "Recents" activity for app transition tests.

            final LogMaker builder = new LogMaker(761/*APP_TRANSITION*/);

            builder.setPackageName("com.android.systemui");

            builder.addTaggedData(871/*FIELD_CLASS_NAME*/,

                    "com.android.systemui.recents.RecentsActivity");

            builder.addTaggedData(319/*APP_TRANSITION_DELAY_MS*/,

                    0/* zero time */);

            mMetricsLogger.write(builder);

        }

        // TODO: Log something

        // TODO: Log something

    }

    }

src/com/android/launcher3/util/VerticalSwipeController.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -62,7 +62,7 @@ public abstract class VerticalSwipeController extends AnimatorListenerAdapter 
    private boolean mNoIntercept;

    private boolean mNoIntercept;





    private AnimatorPlaybackController mCurrentAnimation;

    private AnimatorPlaybackController mCurrentAnimation;

    protected LauncherState mToState;

    private LauncherState mToState;





    private float mStartProgress;

    private float mStartProgress;

    // Ratio of transition process [0, 1] to drag displacement (px)

    // Ratio of transition process [0, 1] to drag displacement (px)