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

Commit fd96b35b authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix ShellTransitionTests on landscape devices" into tm-qpr-dev am: 5394471e am: 85e287b6 

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



Change-Id: I97a5efe98ef2450556f66e5234ebbd86a27a8587
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5f397a24 85e287b6

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

+8 −25
Original line number Original line Diff line number Diff line
@@ -61,8 +61,6 @@ import android.os.Handler; 
import android.os.IBinder;

import android.os.IBinder;

import android.os.Looper;

import android.os.Looper;

import android.os.RemoteException;

import android.os.RemoteException;

import android.view.IDisplayWindowListener;

import android.view.IWindowManager;

import android.view.Surface;

import android.view.Surface;

import android.view.SurfaceControl;

import android.view.SurfaceControl;

import android.view.WindowManager;

import android.view.WindowManager;
@@ -84,6 +82,7 @@ import androidx.test.platform.app.InstrumentationRegistry; 
import com.android.wm.shell.ShellTestCase;

import com.android.wm.shell.ShellTestCase;

import com.android.wm.shell.TestShellExecutor;

import com.android.wm.shell.TestShellExecutor;

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

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

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

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

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

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

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

import com.android.wm.shell.sysui.ShellInit;

import com.android.wm.shell.sysui.ShellInit;
@@ -1035,16 +1034,13 @@ public class ShellTransitionTests extends ShellTestCase { 
    }

    }





    private DisplayController createTestDisplayController() {

    private DisplayController createTestDisplayController() {

        IWindowManager mockWM = mock(IWindowManager.class);

        DisplayLayout displayLayout = mock(DisplayLayout.class);

        final IDisplayWindowListener[] displayListener = new IDisplayWindowListener[1];

        doReturn(Surface.ROTATION_180).when(displayLayout).getUpsideDownRotation();

        try {

        // By default we ignore nav bar in deciding if a seamless rotation is allowed.

            doReturn(new int[]{DEFAULT_DISPLAY}).when(mockWM).registerDisplayWindowListener(any());

        doReturn(true).when(displayLayout).allowSeamlessRotationDespiteNavBarMoving();

        } catch (RemoteException e) {



            // No remote stuff happening, so this can't be hit

        DisplayController out = mock(DisplayController.class);

        }

        doReturn(displayLayout).when(out).getDisplayLayout(DEFAULT_DISPLAY);

        ShellInit shellInit = new ShellInit(mMainExecutor);

        DisplayController out = new DisplayController(mContext, mockWM, shellInit, mMainExecutor);

        shellInit.init();

        return out;

        return out;

    }

    }
@@ -1055,17 +1051,4 @@ public class ShellTransitionTests extends ShellTestCase { 
        shellInit.init();

        shellInit.init();

        return t;

        return t;

    }

    }

//

//    private class TestDisplayController extends DisplayController {

//        private final DisplayLayout mTestDisplayLayout;

//        TestDisplayController() {

//            super(mContext, mock(IWindowManager.class), mMainExecutor);

//            mTestDisplayLayout = new DisplayLayout();

//            mTestDisplayLayout.

//        }

//

//        @Override

//        DisplayLayout

//    }



}
 
}