Revert "Update WM CTS tests for display specific insets."
This reverts commit 9b90a72f22c235e6192286a5401205c52cf04c20.
Bug: 69241956
Bug: 64148922
Change-Id: Iea3068382a09ea95364cc04e9711ccc71f663923
(cherry picked from commit 033e044bc416563160b92373b67c436b4833ad14)
diff --git a/tests/framework/base/activitymanager/util/src/android/server/am/WindowManagerState.java b/tests/framework/base/activitymanager/util/src/android/server/am/WindowManagerState.java
index 7002bba..b169527 100644
--- a/tests/framework/base/activitymanager/util/src/android/server/am/WindowManagerState.java
+++ b/tests/framework/base/activitymanager/util/src/android/server/am/WindowManagerState.java
@@ -16,7 +16,6 @@
package android.server.am;
-import static android.view.Display.DEFAULT_DISPLAY;
import static android.app.WindowConfiguration.ACTIVITY_TYPE_STANDARD;
import static android.app.WindowConfiguration.ACTIVITY_TYPE_UNDEFINED;
import static android.app.WindowConfiguration.WINDOWING_MODE_UNDEFINED;
@@ -32,7 +31,6 @@
import android.support.test.InstrumentationRegistry;
import android.view.nano.DisplayInfoProto;
-import com.android.server.wm.proto.nano.DisplayFramesProto;
import com.android.server.wm.proto.nano.AppTransitionProto;
import com.android.server.wm.proto.nano.AppWindowTokenProto;
import com.android.server.wm.proto.nano.ConfigurationContainerProto;
@@ -99,6 +97,7 @@
private String mLastTransition = null;
private String mAppTransitionState = null;
private String mInputMethodWindowAppToken = null;
+ private Rect mStableBounds = new Rect();
private Rect mDefaultPinnedStackBounds = new Rect();
private Rect mPinnedStackMovementBounds = new Rect();
private final LinkedList<String> mSysDump = new LinkedList();
@@ -196,7 +195,7 @@
mDisplayStacks.put(display.mDisplayId, stacks);
// use properties from the default display only
- if (display.getDisplayId() == DEFAULT_DISPLAY) {
+ if (display.getDisplayId() == ActivityAndWindowManagersState.DEFAULT_DISPLAY_ID) {
if (displayProto.dockedStackDividerController != null) {
mIsDockedStackMinimized =
displayProto.dockedStackDividerController.minimizedDock;
@@ -216,6 +215,9 @@
String hash_code = Integer.toHexString(identifierProto.hashCode);
mWindowStates.add(windowMap.get(hash_code));
}
+ if (state.policy != null) {
+ mStableBounds = extract(state.policy.stableBounds);
+ }
if (state.inputMethodWindow != null) {
mInputMethodWindowAppToken = Integer.toHexString(state.inputMethodWindow.hashCode);
}
@@ -535,7 +537,7 @@
}
Rect getStableBounds() {
- return getDisplay(DEFAULT_DISPLAY).mStableBounds;
+ return mStableBounds;
}
Rect getDefaultPinnedStackBounds() {
@@ -574,6 +576,7 @@
mLastTransition = null;
mInputMethodWindowAppToken = null;
mIsDockedStackMinimized = false;
+ mStableBounds.setEmpty();
mDefaultPinnedStackBounds.setEmpty();
mPinnedStackMovementBounds.setEmpty();
mRotation = 0;
@@ -701,7 +704,6 @@
private Rect mDisplayRect = new Rect();
private Rect mAppRect = new Rect();
private int mDpi;
- private Rect mStableBounds;
public Display(DisplayProto proto) {
super(proto.windowContainer);
@@ -721,10 +723,6 @@
mDisplayRect.set(0, 0, infoProto.logicalWidth, infoProto.logicalHeight);
mAppRect.set(0, 0, infoProto.logicalWidth, infoProto.logicalHeight);
}
- final DisplayFramesProto displayFramesProto = proto.displayFrames;
- if (displayFramesProto != null) {
- mStableBounds = extract(displayFramesProto.stableBounds);
- }
}
private void addWindowsFromTokenProto(WindowTokenProto proto) {
