commit 5a0c1e11011f54232d0f0bf4cdfda1e9527e3f2e
author TreeHugger Robot <treehugger-gerrit@google.com> Wed May 30 04:30:49 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed May 30 04:30:49 2018 +0000
tree 2ab0bec77d17a7e00a227561810fd88bed2c930c
parent babf190396a24afde25a29903a05ecd2a1d65eb7
parent bf770d72cffd5c1e74007fe792a9042267e3c066

Merge "Fix unwanted PIP window dismissal when moving to the bottom" into pi-dev

packages/SystemUI/src/com/android/systemui/pip/phone/PipMotionHelper.java

diff --git a/packages/SystemUI/src/com/android/systemui/pip/phone/PipMotionHelper.java b/packages/SystemUI/src/com/android/systemui/pip/phone/PipMotionHelper.java
index 31d8cbb..ad84130 100644
--- a/packages/SystemUI/src/com/android/systemui/pip/phone/PipMotionHelper.java
+++ b/packages/SystemUI/src/com/android/systemui/pip/phone/PipMotionHelper.java
@@ -225,9 +225,10 @@
      */
     boolean shouldDismissPip() {
         Point displaySize = new Point();
-        mContext.getDisplay().getSize(displaySize);
-        if (mBounds.bottom > displaySize.y) {
-            float offscreenFraction = (float) (mBounds.bottom - displaySize.y) / mBounds.height();
+        mContext.getDisplay().getRealSize(displaySize);
+        final int y = displaySize.y - mStableInsets.bottom;
+        if (mBounds.bottom > y) {
+            float offscreenFraction = (float) (mBounds.bottom - y) / mBounds.height();
             return offscreenFraction >= DISMISS_OFFSCREEN_FRACTION;
         }
         return false;