Revert "Test that presentation not dismiss after display resize"
Revert submission 12501006-presentation_window_context
Reason for revert: Bug: 171027173 and Bug: 171064994
Reverted Changes:
Ib5c4a33ee:Migrate Presentation to WindowContext
I61a9eddd7:Test that presentation not dismiss after display r...
Change-Id: Ic6fe60cc3c876b4c49374c8ff269741bc342336f
(cherry picked from commit 0d3c1faecbbb4a89b8184ba0d17a17eb6b2057d9)
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/projection/ProjectedPresentation.java b/apps/CtsVerifier/src/com/android/cts/verifier/projection/ProjectedPresentation.java
index 452e591..53d715a 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/projection/ProjectedPresentation.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/projection/ProjectedPresentation.java
@@ -31,6 +31,8 @@
// This theme is required to prevent an extra view from obscuring the presentation
super(outerContext, display, android.R.style.Theme_Holo_Light_NoActionBar_TranslucentDecor);
+ getWindow().setType(WindowManager.LayoutParams.TYPE_PRIVATE_PRESENTATION);
+
// So we can control the input
getWindow().addFlags(WindowManager.LayoutParams.FLAG_LOCAL_FOCUS_MODE);
getWindow().addFlags(WindowManager.LayoutParams.FLAG_HARDWARE_ACCELERATED);
diff --git a/tests/framework/base/windowmanager/src/android/server/wm/PresentationTest.java b/tests/framework/base/windowmanager/src/android/server/wm/PresentationTest.java
index 6383d29..4b34c9b 100644
--- a/tests/framework/base/windowmanager/src/android/server/wm/PresentationTest.java
+++ b/tests/framework/base/windowmanager/src/android/server/wm/PresentationTest.java
@@ -46,7 +46,7 @@
if ((display.getFlags() & Display.FLAG_PRESENTATION) != Display.FLAG_PRESENTATION) {
assertNoPresentationDisplayed();
} else {
- assertPresentationOnDisplayAndMatchesDisplayMetrics(display.getDisplayId());
+ assertPresentationOnDisplay(display.getDisplayId());
}
}
}
@@ -63,11 +63,11 @@
.isEqualTo(Display.FLAG_PRESENTATION);
launchPresentationActivity(display.mId);
- assertPresentationOnDisplayAndMatchesDisplayMetrics(display.mId);
+ assertPresentationOnDisplay(display.mId);
}
@Test
- public void testPresentationNotDismissAfterResizeDisplay() {
+ public void testPresentationDismissAfterResizeDisplay() {
final VirtualDisplaySession virtualDisplaySession = createManagedVirtualDisplaySession();
WindowManagerState.DisplayContent display = virtualDisplaySession
.setPresentationDisplay(true)
@@ -79,14 +79,14 @@
.isEqualTo(Display.FLAG_PRESENTATION);
launchPresentationActivity(display.mId);
- assertPresentationOnDisplayAndMatchesDisplayMetrics(display.mId);
+ assertPresentationOnDisplay(display.mId);
virtualDisplaySession.resizeDisplay();
- assertTrue("Presentation must not dismiss on external public display even if"
- + "display resize", mWmState.waitForWithAmState(
- state -> isPresentationOnDisplay(state, display.mId),
- "Presentation window still shows"));
+ assertTrue("Presentation must dismiss on external public display",
+ mWmState.waitForWithAmState(
+ state -> !isPresentationOnDisplay(state, display.mId),
+ "Presentation window dismiss"));
}
@Test
@@ -117,17 +117,13 @@
assertThat(presentationWindows).isEmpty();
}
- private void assertPresentationOnDisplayAndMatchesDisplayMetrics(int displayId) {
+ private void assertPresentationOnDisplay(int displayId) {
final List<WindowManagerState.WindowState> presentationWindows =
mWmState.getWindowsByPackageName(
Components.PRESENTATION_ACTIVITY.getPackageName(), TYPE_PRESENTATION);
assertThat(presentationWindows).hasSize(1);
WindowManagerState.WindowState presentationWindowState = presentationWindows.get(0);
assertThat(presentationWindowState.getDisplayId()).isEqualTo(displayId);
-
- WindowManagerState.DisplayContent display = mWmState.getDisplay(displayId);
- assertThat(display.getDisplayRect()).isEqualTo(
- presentationWindowState.mFullConfiguration.windowConfiguration.getBounds());
}
private void launchPresentationActivity(int displayId) {
diff --git a/tests/framework/base/windowmanager/src/android/server/wm/WindowTest.java b/tests/framework/base/windowmanager/src/android/server/wm/WindowTest.java
index 0438fd1..ee80068 100644
--- a/tests/framework/base/windowmanager/src/android/server/wm/WindowTest.java
+++ b/tests/framework/base/windowmanager/src/android/server/wm/WindowTest.java
@@ -826,6 +826,7 @@
public ProjectedPresentation(Context outerContext, Display display) {
super(outerContext, display);
+ getWindow().setType(WindowManager.LayoutParams.TYPE_PRIVATE_PRESENTATION);
getWindow().addFlags(WindowManager.LayoutParams.FLAG_LOCAL_FOCUS_MODE);
}
diff --git a/tests/tests/display/src/android/display/cts/DisplayTest.java b/tests/tests/display/src/android/display/cts/DisplayTest.java
index ba2e74c..03c8220 100644
--- a/tests/tests/display/src/android/display/cts/DisplayTest.java
+++ b/tests/tests/display/src/android/display/cts/DisplayTest.java
@@ -563,6 +563,7 @@
WindowManager.LayoutParams params = getWindow().getAttributes();
params.preferredDisplayModeId = mModeId;
+ params.type = WindowManager.LayoutParams.TYPE_APPLICATION_OVERLAY;
params.setTitle("CtsTestPresentation");
getWindow().setAttributes(params);
}
diff --git a/tests/tests/media/src/android/media/cts/EncodeVirtualDisplayTest.java b/tests/tests/media/src/android/media/cts/EncodeVirtualDisplayTest.java
index b7efc83..e81b263 100755
--- a/tests/tests/media/src/android/media/cts/EncodeVirtualDisplayTest.java
+++ b/tests/tests/media/src/android/media/cts/EncodeVirtualDisplayTest.java
@@ -612,6 +612,7 @@
super.onCreate(savedInstanceState);
setTitle("Encode Virtual Test");
+ getWindow().setType(WindowManager.LayoutParams.TYPE_PRIVATE_PRESENTATION);
// Create a solid color image to use as the content of the presentation.
ImageView view = new ImageView(getContext());
diff --git a/tests/tests/media/src/android/media/cts/EncodeVirtualDisplayWithCompositionTestImpl.java b/tests/tests/media/src/android/media/cts/EncodeVirtualDisplayWithCompositionTestImpl.java
index 64d1254..36c24ef 100644
--- a/tests/tests/media/src/android/media/cts/EncodeVirtualDisplayWithCompositionTestImpl.java
+++ b/tests/tests/media/src/android/media/cts/EncodeVirtualDisplayWithCompositionTestImpl.java
@@ -1200,6 +1200,7 @@
// This theme is required to prevent an extra view from obscuring the presentation
super(outerContext, display,
android.R.style.Theme_Holo_Light_NoActionBar_TranslucentDecor);
+ getWindow().setType(WindowManager.LayoutParams.TYPE_PRIVATE_PRESENTATION);
getWindow().addFlags(WindowManager.LayoutParams.FLAG_LOCAL_FOCUS_MODE);
getWindow().addFlags(WindowManager.LayoutParams.FLAG_HARDWARE_ACCELERATED);
}
diff --git a/tests/tests/media/src/android/media/cts/RemoteVirtualDisplayService.java b/tests/tests/media/src/android/media/cts/RemoteVirtualDisplayService.java
index 38cd279..eac2c89 100644
--- a/tests/tests/media/src/android/media/cts/RemoteVirtualDisplayService.java
+++ b/tests/tests/media/src/android/media/cts/RemoteVirtualDisplayService.java
@@ -173,6 +173,7 @@
// This theme is required to prevent an extra view from obscuring the presentation
super(outerContext, display,
android.R.style.Theme_Holo_Light_NoActionBar_TranslucentDecor);
+ getWindow().setType(WindowManager.LayoutParams.TYPE_PRIVATE_PRESENTATION);
getWindow().addFlags(WindowManager.LayoutParams.FLAG_HARDWARE_ACCELERATED);
}
