Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add tests for VR preferred display id calculation"

Browse Source
This commit is contained in:
Louis Chang
2018-10-25 07:08:28 +00:00
committed by Android (Google) Code Review
parent 86d0d9d8e5 e60d55b174
commit 1332beacbe
1 changed files with 31 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
services/tests/servicestests/src/com/android/server/am/LaunchParamsControllerTests.java
View File

@@ -17,6 +17,8 @@
package com.android.server.am;
import static android.app.WindowConfiguration.WINDOWING_MODE_FREEFORM;
import static android.view.Display.DEFAULT_DISPLAY;
import static android.view.Display.INVALID_DISPLAY;
import static com.android.server.am.LaunchParamsController.LaunchParamsModifier.RESULT_CONTINUE;
import static com.android.server.am.LaunchParamsController.LaunchParamsModifier.RESULT_DONE;
@@ -188,6 +190,35 @@ public class LaunchParamsControllerTests extends ActivityTestsBase {
assertEquals(result, positioner2.getLaunchParams());
}
/**
* Tests preferred display id calculation for VR.
*/
@Test
public void testVrPreferredDisplay() {
final int vr2dDisplayId = 1;
mService.mVr2dDisplayId = vr2dDisplayId;
final LaunchParams result = new LaunchParams();
final ActivityRecord vrActivity = new ActivityBuilder(mService).build();
vrActivity.requestedVrComponent = vrActivity.realActivity;
// VR activities should always land on default display.
mController.calculate(null /*task*/, null /*layout*/, vrActivity /*activity*/,
null /*source*/, null /*options*/, result);
assertEquals(DEFAULT_DISPLAY, result.mPreferredDisplayId);
// Otherwise, always lands on VR 2D display.
final ActivityRecord vr2dActivity = new ActivityBuilder(mService).build();
mController.calculate(null /*task*/, null /*layout*/, vr2dActivity /*activity*/,
null /*source*/, null /*options*/, result);
assertEquals(vr2dDisplayId, result.mPreferredDisplayId);
mController.calculate(null /*task*/, null /*layout*/, null /*activity*/, null /*source*/,
null /*options*/, result);
assertEquals(vr2dDisplayId, result.mPreferredDisplayId);
mService.mVr2dDisplayId = INVALID_DISPLAY;
}
/**
* Ensures that {@link LaunchParamsModifier} requests specifying display id during
* layout are honored.