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

Commit d7a8be06 authored by Jon Miranda's avatar Jon Miranda Committed by Automerger Merge Worker
Browse files

Merge "Add debug logs for bad launcher state." into tm-dev am: e8b17448 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17155096

Change-Id: Ic4e13fa90a0156509738d7e404d733b2c4b791c9
parents 18ebd464 e8b17448

quickstep/src/com/android/launcher3/QuickstepTransitionManager.java

+23 −0
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ import static com.android.launcher3.config.FeatureFlags.SEPARATE_RECENTS_ACTIVIT 
import static com.android.launcher3.dragndrop.DragLayer.ALPHA_INDEX_TRANSITIONS;

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

import static com.android.launcher3.statehandlers.DepthController.DEPTH;

import static com.android.launcher3.testing.TestProtocol.BAD_STATE;

import static com.android.launcher3.util.window.RefreshRateTracker.getSingleFrameMs;

import static com.android.launcher3.views.FloatingIconView.SHAPE_PROGRESS_DURATION;

import static com.android.launcher3.views.FloatingIconView.getFloatingIconView;
@@ -77,6 +78,7 @@ import android.os.Looper; 
import android.os.SystemProperties;

import android.os.UserHandle;

import android.provider.Settings;

import android.util.Log;

import android.util.Pair;

import android.util.Size;

import android.view.SurfaceControl;
@@ -135,6 +137,7 @@ import com.android.systemui.shared.system.WindowManagerWrapper; 
import com.android.wm.shell.startingsurface.IStartingWindowListener;



import java.util.ArrayList;

import java.util.Arrays;

import java.util.LinkedHashMap;

import java.util.List;
@@ -611,9 +614,28 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener 
        RecentsView overview = mLauncher.getOverviewPanel();

        ObjectAnimator alpha = ObjectAnimator.ofFloat(overview,

                RecentsView.CONTENT_ALPHA, alphas);

        Log.d(BAD_STATE, "QTM composeViewContentAnimator alphas=" + Arrays.toString(alphas));

        alpha.addListener(new AnimatorListenerAdapter() {

            @Override

            public void onAnimationStart(Animator animation) {

                Log.d(BAD_STATE, "QTM composeViewContentAnimator onStart");

            }



            @Override

            public void onAnimationCancel(Animator animation) {

                float alpha = overview == null ? -1 : RecentsView.CONTENT_ALPHA.get(overview);

                Log.d(BAD_STATE, "QTM composeViewContentAnimator onCancel, alpha=" + alpha);

            }



            @Override

            public void onAnimationEnd(Animator animation) {

                Log.d(BAD_STATE, "QTM composeViewContentAnimator onEnd");

            }

        });

        alpha.setDuration(CONTENT_ALPHA_DURATION);

        alpha.setInterpolator(LINEAR);

        anim.play(alpha);

        Log.d(BAD_STATE, "QTM composeViewContentAnimator setFreezeVisibility=true");

        overview.setFreezeViewVisibility(true);



        ObjectAnimator scaleAnim = ObjectAnimator.ofFloat(overview, SCALE_PROPERTY, scales);
@@ -622,6 +644,7 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener 
        anim.play(scaleAnim);



        return () -> {

            Log.d(BAD_STATE, "QTM composeViewContentAnimator onEnd setFreezeVisibility=false");

            overview.setFreezeViewVisibility(false);

            SCALE_PROPERTY.set(overview, 1f);

            mLauncher.getStateManager().reapplyState();

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

+12 −2
Original line number Diff line number Diff line
@@ -26,12 +26,14 @@ import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_SC 
import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_TRANSLATE_X;

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

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

import static com.android.launcher3.testing.TestProtocol.BAD_STATE;

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

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

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

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



import android.util.FloatProperty;

import android.util.Log;



import androidx.annotation.NonNull;
@@ -65,7 +67,10 @@ public abstract class BaseRecentsViewStateController<T extends RecentsView> 
        ADJACENT_PAGE_HORIZONTAL_OFFSET.set(mRecentsView, scaleAndOffset[1]);

        TASK_SECONDARY_TRANSLATION.set(mRecentsView, 0f);



        getContentAlphaProperty().set(mRecentsView, state.overviewUi ? 1f : 0);

        float recentsAlpha = state.overviewUi ? 1f : 0;

        Log.d(BAD_STATE, "BaseRecentsViewStateController setState state=" + state

                + ", alpha=" + recentsAlpha);

        getContentAlphaProperty().set(mRecentsView, recentsAlpha);

        getTaskModalnessProperty().set(mRecentsView, state.getOverviewModalness());

        RECENTS_GRID_PROGRESS.set(mRecentsView,

                state.displayOverviewTasksAsGrid(mLauncher.getDeviceProfile()) ? 1f : 0f);
@@ -74,6 +79,8 @@ public abstract class BaseRecentsViewStateController<T extends RecentsView> 
    @Override

    public void setStateWithAnimation(LauncherState toState, StateAnimationConfig config,

            PendingAnimation builder) {

        Log.d(BAD_STATE, "BaseRecentsViewStateController setStateWithAnimation state=" + toState

                + ", config.skipOverview=" + config.hasAnimationFlag(SKIP_OVERVIEW));

        if (config.hasAnimationFlag(SKIP_OVERVIEW)) {

            return;

        }
@@ -97,7 +104,10 @@ public abstract class BaseRecentsViewStateController<T extends RecentsView> 
        setter.setFloat(mRecentsView, TASK_SECONDARY_TRANSLATION, 0f,

                config.getInterpolator(ANIM_OVERVIEW_TRANSLATE_Y, LINEAR));



        setter.setFloat(mRecentsView, getContentAlphaProperty(), toState.overviewUi ? 1 : 0,

        float recentsAlpha = toState.overviewUi ? 1 : 0;

        Log.d(BAD_STATE, "BaseRecentsViewStateController setStateWithAnimationInternal toState="

                + toState + ", alpha=" + recentsAlpha);

        setter.setFloat(mRecentsView, getContentAlphaProperty(), recentsAlpha,

                config.getInterpolator(ANIM_OVERVIEW_FADE, AGGRESSIVE_EASE_IN_OUT));



        setter.setFloat(

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

+21 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ import static com.android.launcher3.states.StateAnimationConfig.ANIM_WORKSPACE_S 
import static com.android.launcher3.states.StateAnimationConfig.SKIP_ALL_ANIMATIONS;

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

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

import static com.android.launcher3.testing.TestProtocol.BAD_STATE;

import static com.android.launcher3.touch.BothAxesSwipeDetector.DIRECTION_RIGHT;

import static com.android.launcher3.touch.BothAxesSwipeDetector.DIRECTION_UP;

import static com.android.launcher3.util.window.RefreshRateTracker.getSingleFrameMs;
@@ -54,6 +55,7 @@ import android.animation.Animator.AnimatorListener; 
import android.animation.AnimatorListenerAdapter;

import android.animation.ValueAnimator;

import android.graphics.PointF;

import android.util.Log;

import android.view.MotionEvent;

import android.view.animation.Interpolator;
@@ -224,6 +226,7 @@ public class NoButtonQuickSwitchTouchController implements TouchController, 
        // Set RecentView's initial properties.

        RECENTS_SCALE_PROPERTY.set(mRecentsView, fromState.getOverviewScaleAndOffset(mLauncher)[0]);

        ADJACENT_PAGE_HORIZONTAL_OFFSET.set(mRecentsView, 1f);

        Log.d(BAD_STATE, "NBQSTC setupOverviewAnimators setContentAlpha=1");

        mRecentsView.setContentAlpha(1);

        mRecentsView.setFullscreenProgress(fromState.getOverviewFullscreenProgress());

        mLauncher.getActionsView().getVisibilityAlpha().setValue(
@@ -242,6 +245,24 @@ public class NoButtonQuickSwitchTouchController implements TouchController, 
                QUICK_SWITCH.getWorkspaceScrimColor(mLauncher), LINEAR);

        if (mRecentsView.getTaskViewCount() == 0) {

            xAnim.addFloat(mRecentsView, CONTENT_ALPHA, 0f, 1f, LINEAR);

            Log.d(BAD_STATE, "NBQSTC setupOverviewAnimators from: 0 to: 1");

            xAnim.addListener(new AnimatorListenerAdapter() {

                @Override

                public void onAnimationStart(Animator animation) {

                    Log.d(BAD_STATE, "NBQSTC setupOverviewAnimators onStart");

                }



                @Override

                public void onAnimationCancel(Animator animation) {

                    float alpha = mRecentsView == null ? -1 : CONTENT_ALPHA.get(mRecentsView);

                    Log.d(BAD_STATE, "NBQSTC setupOverviewAnimators onCancel, alpha=" + alpha);

                }



                @Override

                public void onAnimationEnd(Animator animation) {

                    Log.d(BAD_STATE, "NBQSTC setupOverviewAnimators onEnd");

                }

            });

        }

        mXOverviewAnim = xAnim.createPlaybackController();

        mXOverviewAnim.dispatchOnStart();

quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/QuickSwitchTouchController.java

+3 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_TR 
import static com.android.launcher3.states.StateAnimationConfig.ANIM_VERTICAL_PROGRESS;

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

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

import static com.android.launcher3.testing.TestProtocol.BAD_STATE;

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

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

import static com.android.quickstep.views.RecentsView.RECENTS_SCALE_PROPERTY;
@@ -36,6 +37,7 @@ import static com.android.quickstep.views.RecentsView.UPDATE_SYSUI_FLAGS_THRESHO 
import static com.android.systemui.shared.system.ActivityManagerWrapper.CLOSE_SYSTEM_WINDOWS_REASON_RECENTS;

import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_OVERVIEW_DISABLED;



import android.util.Log;

import android.view.MotionEvent;



import com.android.launcher3.Launcher;
@@ -112,6 +114,7 @@ public class QuickSwitchTouchController extends AbstractStateChangeTouchControll 
        RECENTS_SCALE_PROPERTY.set(mOverviewPanel,

                QUICK_SWITCH.getOverviewScaleAndOffset(mLauncher)[0] * 0.85f);

        ADJACENT_PAGE_HORIZONTAL_OFFSET.set(mOverviewPanel, 1f);

        Log.d(BAD_STATE, "QuickSwitchTouchController initCurrentAnimation setContentAlpha=1");

        mOverviewPanel.setContentAlpha(1);



        mCurrentAnimation = mLauncher.getStateManager()

quickstep/src/com/android/quickstep/RecentsActivity.java

+3 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ import static com.android.launcher3.QuickstepTransitionManager.STATUS_BAR_TRANSI 
import static com.android.launcher3.Utilities.createHomeIntent;

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

import static com.android.launcher3.graphics.SysUiScrim.SYSUI_PROGRESS;

import static com.android.launcher3.testing.TestProtocol.BAD_STATE;

import static com.android.launcher3.testing.TestProtocol.OVERVIEW_STATE_ORDINAL;

import static com.android.quickstep.TaskUtils.taskIsATargetWithMode;

import static com.android.quickstep.TaskViewUtils.createRecentsWindowAnimator;
@@ -38,6 +39,7 @@ import android.content.res.Configuration; 
import android.os.Bundle;

import android.os.Handler;

import android.os.Looper;

import android.util.Log;

import android.view.Display;

import android.view.SurfaceControl.Transaction;

import android.view.View;
@@ -312,6 +314,7 @@ public final class RecentsActivity extends StatefulActivity<RecentsState> { 
    protected void onStart() {

        // Set the alpha to 1 before calling super, as it may get set back to 0 due to

        // onActivityStart callback.

        Log.d(BAD_STATE, "RecentsActivity onStart mFallbackRecentsView.setContentAlpha(1)");

        mFallbackRecentsView.setContentAlpha(1);

        super.onStart();

        mFallbackRecentsView.updateLocusId();