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

Commit 0fa523bb authored by Vadim Tryshev's avatar Vadim Tryshev Committed by Android (Google) Code Review
Browse files

Merge "Removing logging for verifying internal Launcher state from tests" into main

parents 47a85e46 dae8b65d

src/com/android/launcher3/BaseActivity.java

+0 −6
Original line number Diff line number Diff line
@@ -16,8 +16,6 @@ 


package com.android.launcher3;



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

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

import static com.android.launcher3.util.FlagDebugUtils.appendFlag;

import static com.android.launcher3.util.FlagDebugUtils.formatFlagChange;

import static com.android.launcher3.util.SystemUiController.UI_STATE_FULLSCREEN_TASK;
@@ -310,9 +308,6 @@ public abstract class BaseActivity extends Activity implements ActivityContext { 
     * Sets the activity to appear as paused.

     */

    public void setPaused() {

        if (sDebugTracing) {

            Log.d(ACTIVITY_NOT_RESUMED_AFTER_BACK, "Activity setPaused: " + this, new Throwable());

        }

        removeActivityFlags(ACTIVITY_STATE_RESUMED | ACTIVITY_STATE_DEFERRED_RESUMED);

    }
@@ -320,7 +315,6 @@ public abstract class BaseActivity extends Activity implements ActivityContext { 
     * Sets the activity to appear as resumed.

     */

    public void setResumed() {

        if (sDebugTracing) Log.d(ACTIVITY_NOT_RESUMED_AFTER_BACK, "Activity setResumed: " + this);

        addActivityFlags(ACTIVITY_STATE_RESUMED | ACTIVITY_STATE_USER_ACTIVE);

        removeActivityFlags(ACTIVITY_STATE_USER_WILL_BE_ACTIVE);

    }

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

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

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

    public static final String UIOBJECT_STALE_ELEMENT = "b/319501259";

    public static final String ACTIVITY_NOT_RESUMED_AFTER_BACK = "b/322823209";

    public static final String GET_FROM_RECENTS_FAILURE = "b/321775748";

    public static final String SUCCESSFUL_GESTURE_MISMATCH_EVENTS = "b/324940434";

    public static final String TEST_DRAG_APP_ICON_TO_MULTIPLE_WORKSPACES_FAILURE = "b/326908466";