commit 23c2b8c8ec10ce797b9e9c509bb7bec388d37ec8
author Android Build Merger (Role) <noreply-android-build-merger@google.com> Tue Jun 05 15:37:50 2018 +0000
committer Android Build Merger (Role) <noreply-android-build-merger@google.com> Tue Jun 05 15:37:50 2018 +0000
tree 63945c5a79ba4ccda3e63ee81fc431579c233a69
parent 6e680f9bf6e6b6406194502d2cf44a235c4bdffc
parent 678be9b823d09e2caee630bc5575950ec0007cad

[automerger] Use getLocationOnScreen() to determine home bounds am: 678be9b823

Change-Id: I8e5fd78aabdb623d43772a805a5d53440f27dead

quickstep/src/com/android/quickstep/WindowTransformSwipeHandler.java

diff --git a/quickstep/src/com/android/quickstep/WindowTransformSwipeHandler.java b/quickstep/src/com/android/quickstep/WindowTransformSwipeHandler.java
index c94174b..cb13625 100644
--- a/quickstep/src/com/android/quickstep/WindowTransformSwipeHandler.java
+++ b/quickstep/src/com/android/quickstep/WindowTransformSwipeHandler.java
@@ -589,7 +589,15 @@
                     new Point(minimizedHomeBounds.width(), minimizedHomeBounds.height()));
             dp.updateInsets(homeContentInsets);
         } else {
-            overviewStackBounds = new Rect(0, 0, dp.widthPx, dp.heightPx);
+            if (mActivity != null) {
+                int loc[] = new int[2];
+                View rootView = mActivity.getRootView();
+                rootView.getLocationOnScreen(loc);
+                overviewStackBounds = new Rect(loc[0], loc[1], loc[0] + rootView.getWidth(),
+                        loc[1] + rootView.getHeight());
+            } else {
+                overviewStackBounds = new Rect(0, 0, dp.widthPx, dp.heightPx);
+            }
             // If we are not in multi-window mode, home insets should be same as system insets.
             Rect insets = new Rect();
             WindowManagerWrapper.getInstance().getStableInsets(insets);