commit 087ad301138818a68698a3caf599c824cdb643a3
author Charles Chen <charlesccchen@google.com> Fri Mar 27 01:46:40 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Mar 27 01:46:40 2020 +0000
tree ac67a7fe6cdb6d3bbd844b0e523be039af95488a
parent ff5a99d22930d2a10beb252a7ac2949ddbb7d7d8
parent 9d7a2210782c20d1c63eb2ed565cd1d83ce33998

Report bounds instead of size in WindowMetrics am: 9e174f5e93 am: 53e907be5b am: ee1588d7c3 am: 9d7a221078

Change-Id: I94b8808825cffdc79af0a253b43542f0ec6d801a

bridge/src/com/android/layoutlib/bridge/android/view/WindowManagerImpl.java

diff --git a/bridge/src/com/android/layoutlib/bridge/android/view/WindowManagerImpl.java b/bridge/src/com/android/layoutlib/bridge/android/view/WindowManagerImpl.java
index c79e45a..f7f1446 100644
--- a/bridge/src/com/android/layoutlib/bridge/android/view/WindowManagerImpl.java
+++ b/bridge/src/com/android/layoutlib/bridge/android/view/WindowManagerImpl.java
@@ -112,7 +112,7 @@
     public WindowMetrics getCurrentWindowMetrics() {
         final Rect bound = getCurrentBounds(mContext);
 
-        return new WindowMetrics(toSize(bound), computeWindowInsets());
+        return new WindowMetrics(bound, computeWindowInsets());
     }
 
     private static Rect getCurrentBounds(Context context) {
@@ -123,11 +123,7 @@
 
     @Override
     public WindowMetrics getMaximumWindowMetrics() {
-        return new WindowMetrics(toSize(getMaximumBounds()), computeWindowInsets());
-    }
-
-    private Size toSize(Rect frame) {
-        return new Size(frame.width(), frame.height());
+        return new WindowMetrics(getMaximumBounds(), computeWindowInsets());
     }
 
     private Rect getMaximumBounds() {