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

Commit c6ea631d authored by Robin Lee's avatar Robin Lee Committed by Automerger Merge Worker
Browse files

Merge "Test Recents Transition sleep re-entry" into udc-dev am: 24dada83 am: 4c670a95 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22707221



Change-Id: I3e4a544369edf082208b7fecbd3cbaa3fe8c1c39
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a7b125be 4c670a95

libs/WindowManager/Shell/src/com/android/wm/shell/recents/RecentsTransitionHandler.java

+8 −5
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ import android.window.TransitionRequestInfo; 
import android.window.WindowContainerToken;

import android.window.WindowContainerTransaction;



import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.protolog.common.ProtoLog;

import com.android.wm.shell.common.ShellExecutor;

import com.android.wm.shell.protolog.ShellProtoLogGroup;
@@ -97,7 +98,8 @@ public class RecentsTransitionHandler implements Transitions.TransitionHandler { 
        mMixers.remove(mixer);

    }



    void startRecentsTransition(PendingIntent intent, Intent fillIn, Bundle options,

    @VisibleForTesting

    public IBinder startRecentsTransition(PendingIntent intent, Intent fillIn, Bundle options,

            IApplicationThread appThread, IRecentsAnimationRunner listener) {

        ProtoLog.v(ShellProtoLogGroup.WM_SHELL_RECENTS_TRANSITION,

                "RecentsTransitionHandler.startRecentsTransition");
@@ -121,12 +123,13 @@ public class RecentsTransitionHandler implements Transitions.TransitionHandler { 
        if (mixer != null) {

            mixer.setRecentsTransition(transition);

        }

        if (transition == null) {

            controller.cancel("startRecentsTransition");

            return;

        }

        if (transition != null) {

            controller.setTransition(transition);

            mControllers.add(controller);

        } else {

            controller.cancel("startRecentsTransition");

        }

        return transition;

    }



    @Override

libs/WindowManager/Shell/tests/unittest/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ android_test { 
        "truth-prebuilt",

        "testables",

        "platform-test-annotations",

        "frameworks-base-testutils",

        "servicestests-utils",

    ],



    libs: [

libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/transition/ShellTransitionTests.java

+160 −52

File changed.

Preview size limit exceeded, changes collapsed.

services/tests/wmtests/src/com/android/server/wm/StubTransaction.java→services/tests/servicestests/utils/com/android/server/testutils/StubTransaction.java

+3 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package com.android.server.wm;

package com.android.server.testutils;



import android.annotation.NonNull;

import android.annotation.Nullable;
@@ -30,6 +30,8 @@ import android.view.InputWindowHandle; 
import android.view.Surface;

import android.view.SurfaceControl;



import com.android.server.testutils.StubTransaction;



import java.util.HashSet;

import java.util.concurrent.Executor;

services/tests/wmtests/src/com/android/server/wm/DimmerTests.java

+1 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ import android.view.SurfaceControl; 
import android.view.SurfaceSession;



import com.android.server.wm.SurfaceAnimator.AnimationType;

import com.android.server.testutils.StubTransaction;



import org.junit.Before;

import org.junit.Test;