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

Commit b7b88b66 authored by Alex Chau's avatar Alex Chau Committed by Android (Google) Code Review
Browse files

Merge "Add logging to help debug flake when swiping home to overview." into tm-qpr-dev

parents 65d95a8d 24b95540

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

+9 −0
Original line number Diff line number Diff line
@@ -31,11 +31,13 @@ import android.animation.AnimatorSet; 
import android.annotation.TargetApi;

import android.os.Build;

import android.util.FloatProperty;

import android.util.Log;

import android.util.Pair;



import androidx.annotation.NonNull;



import com.android.launcher3.LauncherState;

import com.android.launcher3.Utilities;

import com.android.launcher3.anim.AnimatorListeners;

import com.android.launcher3.anim.PendingAnimation;

import com.android.launcher3.anim.PropertySetter;
@@ -88,6 +90,13 @@ public final class RecentsViewStateController extends 
            // While animating into recents, update the visible task data as needed

            builder.addOnFrameCallback(() -> mRecentsView.loadVisibleTaskData(FLAG_UPDATE_ALL));

            mRecentsView.updateEmptyMessage();

            // TODO(b/238461210): Remove logging once root cause of flake detected.

            if (Utilities.IS_RUNNING_IN_TEST_HARNESS) {

                Log.d("b/238461210", "RecentsView#setStateWithAnimationInternal getCurrentPage(): "

                                + mRecentsView.getCurrentPage()

                                + ", getScrollForPage(getCurrentPage())): "

                                + mRecentsView.getScrollForPage(mRecentsView.getCurrentPage()));

            }

        } else {

            builder.addListener(

                    AnimatorListeners.forSuccessCallback(mRecentsView::resetTaskVisuals));

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

+7 −0
Original line number Diff line number Diff line
@@ -1505,6 +1505,13 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T 
            // Restore mCurrentPage but don't call setCurrentPage() as that clobbers the scroll.

            mCurrentPage = previousCurrentPage;

        } else {

            // TODO(b/238461210): Remove logging once root cause of flake detected.

            if (Utilities.IS_RUNNING_IN_TEST_HARNESS) {

                Log.d("b/238461210", "RecentsView#applyLoadPlan() -> !settlingOnNewTask -> "

                                + "previousCurrentPage: " + previousCurrentPage

                                + ", getScrollForPage(previousCurrentPage): "

                                + getScrollForPage(previousCurrentPage));

            }

            setCurrentPage(previousCurrentPage);

        }

src/com/android/launcher3/PagedView.java

+7 −0
Original line number Diff line number Diff line
@@ -772,6 +772,13 @@ public abstract class PagedView<T extends View & PageIndicator> extends ViewGrou 
        }



        if (mScroller.isFinished() && pageScrollChanged) {

            // TODO(b/238461210): Remove logging once root cause of flake detected.

            if (Utilities.IS_RUNNING_IN_TEST_HARNESS && !(this instanceof Workspace)) {

                Log.d("b/238461210", this.getClass().getSimpleName() + "#onLayout() -> "

                        + "if(mScroller.isFinished() && pageScrollChanged) -> getNextPage(): "

                        + getNextPage() + ", getScrollForPage(getNextPage()): "

                        + getScrollForPage(getNextPage()));

            }

            setCurrentPage(getNextPage());

        }

        onPageScrollsInitialized();