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

Commit f18305ac authored by Randy Pfohl's avatar Randy Pfohl Committed by Android (Google) Code Review
Browse files

Merge changes I3394267d,Idf9ef20e into udc-qpr-dev 

* changes:
  Adding some logging to track test failure in post submit
  enable testWidgets for postsubmit for long term debugging
parents 09892161 ecffb20b

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

+3 −1
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ import android.os.Bundle; 
import android.os.Handler;

import android.os.Looper;

import android.os.Trace;

import android.util.Log;

import android.view.Display;

import android.view.RemoteAnimationAdapter;

import android.view.RemoteAnimationTarget;
@@ -59,7 +60,6 @@ import com.android.launcher3.R; 
import com.android.launcher3.anim.AnimatorPlaybackController;

import com.android.launcher3.anim.PendingAnimation;

import com.android.launcher3.compat.AccessibilityManagerCompat;

import com.android.launcher3.config.FeatureFlags;

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

import com.android.launcher3.statemanager.StateManager;

import com.android.launcher3.statemanager.StateManager.AtomicAnimationFactory;
@@ -67,6 +67,7 @@ import com.android.launcher3.statemanager.StateManager.StateHandler; 
import com.android.launcher3.statemanager.StatefulActivity;

import com.android.launcher3.taskbar.FallbackTaskbarUIController;

import com.android.launcher3.taskbar.TaskbarManager;

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

import com.android.launcher3.util.ActivityOptionsWrapper;

import com.android.launcher3.util.ActivityTracker;

import com.android.launcher3.util.RunnableList;
@@ -404,6 +405,7 @@ public final class RecentsActivity extends StatefulActivity<RecentsState> { 
    }



    public void startHome() {

        Log.d(TestProtocol.INCORRECT_HOME_STATE, "start home from recents activity");

        RecentsView recentsView = getOverviewPanel();

        recentsView.switchToScreenshot(() -> recentsView.finishRecentsAnimation(true,

                this::startHomeInternal));

quickstep/src/com/android/quickstep/TaskAnimationManager.java

+4 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ import androidx.annotation.UiThread; 


import com.android.launcher3.Utilities;

import com.android.launcher3.config.FeatureFlags;

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

import com.android.launcher3.util.DisplayController;

import com.android.quickstep.TopTaskTracker.CachedTaskInfo;

import com.android.quickstep.util.ActiveGestureLog;
@@ -179,6 +180,9 @@ public class TaskAnimationManager implements RecentsAnimationCallbacks.RecentsAn 
                        RecentsView recentsView =

                                activityInterface.getCreatedActivity().getOverviewPanel();

                        if (recentsView != null) {

                            Log.d(TestProtocol.INCORRECT_HOME_STATE,

                                    "finish recents animation on "

                                            + compat.taskInfo.description);

                            recentsView.finishRecentsAnimation(true, null);

                        }

                        return;

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

+2 −0
Original line number Diff line number Diff line
@@ -5296,6 +5296,8 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T 
        cleanupRemoteTargets();



        if (mRecentsAnimationController == null) {

            Log.d(TestProtocol.INCORRECT_HOME_STATE, "finish recents animation but recents "

                    + "animation controller was null. returning.");

            if (onFinishComplete != null) {

                onFinishComplete.run();

            }

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

+1 −1
Original line number Diff line number Diff line
@@ -161,7 +161,7 @@ public final class TestProtocol { 
    public static final String LAUNCH_SPLIT_PAIR = "b/288939273";



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



    public static final String INCORRECT_HOME_STATE = "b/293191790";

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

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

    public static final String REQUEST_IS_EMULATE_DISPLAY_RUNNING = "is-emulate-display-running";

tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java

+5 −1
Original line number Diff line number Diff line
@@ -19,6 +19,8 @@ package com.android.launcher3.ui; 
import static androidx.test.InstrumentationRegistry.getInstrumentation;



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

import static com.android.launcher3.util.rule.TestStabilityRule.LOCAL;

import static com.android.launcher3.util.rule.TestStabilityRule.PLATFORM_POSTSUBMIT;



import static com.google.common.truth.Truth.assertThat;
@@ -61,6 +63,7 @@ import com.android.launcher3.util.TestUtil; 
import com.android.launcher3.util.Wait;

import com.android.launcher3.util.rule.ScreenRecordRule.ScreenRecord;

import com.android.launcher3.util.rule.TISBindRule;

import com.android.launcher3.util.rule.TestStabilityRule.Stability;

import com.android.launcher3.widget.picker.WidgetsFullSheet;

import com.android.launcher3.widget.picker.WidgetsRecyclerView;
@@ -329,7 +332,8 @@ public class TaplTestsLauncher3 extends AbstractLauncherUiTest { 
    }



    @Test

    @Ignore // b/293191790

    @Stability(flavors = LOCAL | PLATFORM_POSTSUBMIT) // b/293191790

    @ScreenRecord

    @PortraitLandscape

    public void testWidgets() throws Exception {

        // Test opening widgets.