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

Commit 58a8c127 authored by Alex Chau's avatar Alex Chau
Browse files

Revert "Remove logs for bug investigation" 

This reverts commit dad61a00.

Reason for revert: b/279059025

Change-Id: Id8fcd1ddf67d7df0a23c81e3ddf3849c26c529bd
parent 3e43b8a9

quickstep/src/com/android/launcher3/uioverrides/states/QuickstepAtomicAnimationFactory.java

+4 −0
Original line number Diff line number Diff line
@@ -55,12 +55,14 @@ import static com.android.launcher3.states.StateAnimationConfig.ANIM_WORKSPACE_T 
import static com.android.quickstep.views.RecentsView.RECENTS_SCALE_PROPERTY;



import android.animation.ValueAnimator;

import android.util.Log;



import com.android.launcher3.CellLayout;

import com.android.launcher3.Hotseat;

import com.android.launcher3.LauncherState;

import com.android.launcher3.Workspace;

import com.android.launcher3.states.StateAnimationConfig;

import com.android.launcher3.testing.shared.TestProtocol;

import com.android.launcher3.touch.AllAppsSwipeController;

import com.android.launcher3.uioverrides.QuickstepLauncher;

import com.android.launcher3.util.DisplayController;
@@ -94,6 +96,8 @@ public class QuickstepAtomicAnimationFactory extends 
    @Override

    public void prepareForAtomicAnimation(LauncherState fromState, LauncherState toState,

            StateAnimationConfig config) {

        Log.d(TestProtocol.OVERVIEW_OVER_HOME, "creating animation fromState: "

                + fromState + " toState: " + toState);

        RecentsView overview = mActivity.getOverviewPanel();

        if ((fromState == OVERVIEW || fromState == OVERVIEW_SPLIT_SELECT) && toState == NORMAL) {

            overview.switchToScreenshot(() ->

quickstep/src/com/android/quickstep/views/LauncherRecentsView.java

+4 −1
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 
package com.android.quickstep.views;



import static android.app.ActivityTaskManager.INVALID_TASK_ID;



import static com.android.launcher3.LauncherState.ALL_APPS;

import static com.android.launcher3.LauncherState.CLEAR_ALL_BUTTON;

import static com.android.launcher3.LauncherState.EDIT_MODE;
@@ -31,6 +30,7 @@ import android.annotation.TargetApi; 
import android.content.Context;

import android.os.Build;

import android.util.AttributeSet;

import android.util.Log;

import android.view.MotionEvent;



import androidx.annotation.Nullable;
@@ -44,6 +44,7 @@ import com.android.launcher3.statehandlers.DepthController; 
import com.android.launcher3.statehandlers.DesktopVisibilityController;

import com.android.launcher3.statemanager.StateManager;

import com.android.launcher3.statemanager.StateManager.StateListener;

import com.android.launcher3.testing.shared.TestProtocol;

import com.android.launcher3.uioverrides.QuickstepLauncher;

import com.android.launcher3.util.PendingSplitSelectInfo;

import com.android.launcher3.util.SplitConfigurationOptions;
@@ -173,6 +174,8 @@ public class LauncherRecentsView extends RecentsView<QuickstepLauncher, Launcher 
    @Override

    public void setOverviewStateEnabled(boolean enabled) {

        super.setOverviewStateEnabled(enabled);

        Log.d(TestProtocol.OVERVIEW_OVER_HOME, "overview state enabled state has changed: "

                + enabled);

        if (enabled) {

            LauncherState state = mActivity.getStateManager().getState();

            boolean hasClearAllButton = (state.getVisibleElements(mActivity)

src/com/android/launcher3/statemanager/StateManager.java

+9 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ import android.animation.AnimatorListenerAdapter; 
import android.animation.AnimatorSet;

import android.os.Handler;

import android.os.Looper;

import android.util.Log;



import androidx.annotation.FloatRange;
@@ -35,6 +36,7 @@ import com.android.launcher3.anim.AnimatorPlaybackController; 
import com.android.launcher3.anim.PendingAnimation;

import com.android.launcher3.states.StateAnimationConfig;

import com.android.launcher3.states.StateAnimationConfig.AnimationFlags;

import com.android.launcher3.testing.shared.TestProtocol;



import java.io.PrintWriter;

import java.util.ArrayList;
@@ -225,6 +227,7 @@ public class StateManager<STATE_TYPE extends BaseState<STATE_TYPE>> { 


    private void goToState(

            STATE_TYPE state, boolean animated, long delay, AnimatorListener listener) {

        Log.d(TestProtocol.OVERVIEW_OVER_HOME, "go to state " + state);



        animated &= areAnimatorsEnabled();

        if (mActivity.isInState(state)) {
@@ -380,6 +383,8 @@ public class StateManager<STATE_TYPE extends BaseState<STATE_TYPE>> { 
        mState = state;

        mActivity.onStateSetStart(mState);



        Log.d(TestProtocol.OVERVIEW_OVER_HOME, "Notifying listeners for state transition start"

                + " to state: " + state.toString());

        for (int i = mListeners.size() - 1; i >= 0; i--) {

            mListeners.get(i).onStateTransitionStart(state);

        }
@@ -397,6 +402,8 @@ public class StateManager<STATE_TYPE extends BaseState<STATE_TYPE>> { 
            setRestState(null);

        }



        Log.d(TestProtocol.OVERVIEW_OVER_HOME, "Notifying " + mListeners.size() + " listeners "

                + "for end transition for state: " + state.toString());

        for (int i = mListeners.size() - 1; i >= 0; i--) {

            mListeners.get(i).onStateTransitionComplete(state);

        }
@@ -434,6 +441,7 @@ public class StateManager<STATE_TYPE extends BaseState<STATE_TYPE>> { 
     * Cancels the current animation.

     */

    public void cancelAnimation() {

        Log.d(TestProtocol.OVERVIEW_OVER_HOME, "current animation cancelled");

        mConfig.reset();

        // It could happen that a new animation is set as a result of an endListener on the

        // existing animation.
@@ -457,6 +465,7 @@ public class StateManager<STATE_TYPE extends BaseState<STATE_TYPE>> { 
     * @param toState The state we are animating towards.

     */

    public void setCurrentAnimation(AnimatorSet anim, STATE_TYPE toState) {

        Log.d(TestProtocol.OVERVIEW_OVER_HOME, "setting animation to " + toState.toString());

        cancelAnimation();

        setCurrentAnimation(anim);

        anim.addListener(createStateAnimationListener(toState));

tests/shared/com/android/launcher3/testing/shared/TestProtocol.java

+1 −0
Original line number Diff line number Diff line
@@ -160,6 +160,7 @@ public final class TestProtocol { 
    public static final String TWO_TASKBAR_LONG_CLICKS = "b/262282528";

    public static final String ICON_MISSING = "b/282963545";

    public static final String WORKSPACE_LONG_PRESS = "b/311099513";

    public static final String OVERVIEW_OVER_HOME = "b/279059025";



    public static final String REQUEST_EMULATE_DISPLAY = "emulate-display";

    public static final String REQUEST_STOP_EMULATE_DISPLAY = "stop-emulate-display";