Fix testGetWindowVisibleDisplayFrame in multiwindow mode
When mAttachInfo is null, View.getWindowVisibleDisplayFrame
returns the size of the real display (adjusted for system
decorations). This causes the test to fail in multiwindow
mode when the activity-specific display is smaller than the
real display.
Fix this by using the application context to retrieve the
real size of the display instead.
Bug: 28850117
Test: run cts-dev -d --module CtsViewTestCases --test
android.view.cts.ViewTest#testGetWindowVisibleDisplayFrame
passes in both fullscreen and multi-window mode.
Change-Id: Ibffd65c0ca1d8bd8637202add5451f40ea73df40
diff --git a/tests/tests/view/src/android/view/cts/ViewTest.java b/tests/tests/view/src/android/view/cts/ViewTest.java
index 19e267d..3006ddf 100644
--- a/tests/tests/view/src/android/view/cts/ViewTest.java
+++ b/tests/tests/view/src/android/view/cts/ViewTest.java
@@ -37,6 +37,7 @@
import android.graphics.drawable.ColorDrawable;
import android.graphics.drawable.Drawable;
import android.graphics.drawable.StateListDrawable;
+import android.hardware.display.DisplayManager;
import android.os.Bundle;
import android.os.Parcelable;
import android.os.SystemClock;
@@ -76,7 +77,6 @@
import android.view.ViewGroup;
import android.view.ViewParent;
import android.view.ViewTreeObserver;
-import android.view.WindowManager;
import android.view.accessibility.AccessibilityEvent;
import android.view.animation.AlphaAnimation;
import android.view.animation.Animation;
@@ -3374,8 +3374,9 @@
Rect outRect = new Rect();
View view = new View(mActivity);
// mAttachInfo is null
- WindowManager wm = (WindowManager)mActivity.getSystemService(Context.WINDOW_SERVICE);
- Display d = wm.getDefaultDisplay();
+ DisplayManager dm = (DisplayManager) mActivity.getApplicationContext().getSystemService(
+ Context.DISPLAY_SERVICE);
+ Display d = dm.getDisplay(Display.DEFAULT_DISPLAY);
view.getWindowVisibleDisplayFrame(outRect);
assertEquals(0, outRect.left);
assertEquals(0, outRect.top);
