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

Commit 53ca4cd6 authored by Tony Huang's avatar Tony Huang Committed by Automerger Merge Worker
Browse files

Merge "Fix RemoteTransitionTest" into udc-dev am: 596240b3 am: bf39f3f3 am: 7f366376 

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



Change-Id: Iaa52285ca0bcc3f0dce9c6838cbe4ac38f807f7f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0cd2c777 7f366376

libs/WindowManager/Shell/src/com/android/wm/shell/util/TransitionUtil.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -311,7 +311,7 @@ public class TransitionUtil { 




    private static RemoteAnimationTarget getDividerTarget(TransitionInfo.Change change,

    private static RemoteAnimationTarget getDividerTarget(TransitionInfo.Change change,

            SurfaceControl leash) {

            SurfaceControl leash) {

        return new RemoteAnimationTarget(-1 /* taskId */, -1 /* mode */,

        return new RemoteAnimationTarget(-1 /* taskId */, newModeToLegacyMode(change.getMode()),

                leash, false /* isTranslucent */, null /* clipRect */,

                leash, false /* isTranslucent */, null /* clipRect */,

                null /* contentInsets */, Integer.MAX_VALUE /* prefixOrderIndex */,

                null /* contentInsets */, Integer.MAX_VALUE /* prefixOrderIndex */,

                new android.graphics.Point(0, 0) /* position */, change.getStartAbsBounds(),

                new android.graphics.Point(0, 0) /* position */, change.getStartAbsBounds(),

packages/SystemUI/tests/src/com/android/systemui/shared/system/RemoteTransitionTest.java

+3 −3
Original line number Original line Diff line number Diff line
@@ -24,13 +24,13 @@ import static android.view.RemoteAnimationTarget.MODE_OPENING; 
import static android.view.WindowManager.TRANSIT_CHANGE;

import static android.view.WindowManager.TRANSIT_CHANGE;

import static android.view.WindowManager.TRANSIT_CLOSE;

import static android.view.WindowManager.TRANSIT_CLOSE;

import static android.view.WindowManager.TRANSIT_OPEN;

import static android.view.WindowManager.TRANSIT_OPEN;

import static android.window.TransitionInfo.FLAG_FIRST_CUSTOM;

import static android.window.TransitionInfo.FLAG_IN_TASK_WITH_EMBEDDED_ACTIVITY;

import static android.window.TransitionInfo.FLAG_IN_TASK_WITH_EMBEDDED_ACTIVITY;

import static android.window.TransitionInfo.FLAG_IS_WALLPAPER;

import static android.window.TransitionInfo.FLAG_IS_WALLPAPER;

import static android.window.TransitionInfo.FLAG_SHOW_WALLPAPER;

import static android.window.TransitionInfo.FLAG_SHOW_WALLPAPER;

import static android.window.TransitionInfo.FLAG_TRANSLUCENT;

import static android.window.TransitionInfo.FLAG_TRANSLUCENT;





import static com.android.dx.mockito.inline.extended.ExtendedMockito.doReturn;

import static com.android.dx.mockito.inline.extended.ExtendedMockito.doReturn;

import static com.android.wm.shell.common.split.SplitScreenConstants.FLAG_IS_DIVIDER_BAR;





import static org.junit.Assert.assertEquals;

import static org.junit.Assert.assertEquals;

import static org.junit.Assert.assertTrue;

import static org.junit.Assert.assertTrue;
@@ -76,7 +76,7 @@ public class RemoteTransitionTest extends SysuiTestCase { 
                .addChange(TRANSIT_CLOSE, 0 /* flags */,

                .addChange(TRANSIT_CLOSE, 0 /* flags */,

                        createTaskInfo(2 /* taskId */, ACTIVITY_TYPE_STANDARD))

                        createTaskInfo(2 /* taskId */, ACTIVITY_TYPE_STANDARD))

                .addChange(TRANSIT_OPEN, FLAG_IS_WALLPAPER, null /* taskInfo */)

                .addChange(TRANSIT_OPEN, FLAG_IS_WALLPAPER, null /* taskInfo */)

                .addChange(TRANSIT_CHANGE, FLAG_FIRST_CUSTOM, null /* taskInfo */)

                .addChange(TRANSIT_CHANGE, FLAG_IS_DIVIDER_BAR, null /* taskInfo */)

                .build();

                .build();

        // Check apps extraction

        // Check apps extraction

        RemoteAnimationTarget[] wrapped = RemoteAnimationTargetCompat.wrapApps(combined,

        RemoteAnimationTarget[] wrapped = RemoteAnimationTargetCompat.wrapApps(combined,
@@ -107,7 +107,7 @@ public class RemoteTransitionTest extends SysuiTestCase { 
        RemoteAnimationTarget[] nonApps = RemoteAnimationTargetCompat.wrapNonApps(combined,

        RemoteAnimationTarget[] nonApps = RemoteAnimationTargetCompat.wrapNonApps(combined,

                false /* wallpapers */, mock(SurfaceControl.Transaction.class), null /* leashes */);

                false /* wallpapers */, mock(SurfaceControl.Transaction.class), null /* leashes */);

        assertEquals(1, nonApps.length);

        assertEquals(1, nonApps.length);

        assertTrue(nonApps[0].prefixOrderIndex < closeLayer);

        assertTrue(nonApps[0].prefixOrderIndex == Integer.MAX_VALUE);

        assertEquals(MODE_CHANGING, nonApps[0].mode);

        assertEquals(MODE_CHANGING, nonApps[0].mode);

    }

    }