commit 31786aba2c35a7757aa440c745bb2cfe460b8e56
author Kazuhiro Inaba <kinaba@google.com> Sat Jul 30 12:30:36 2016 +0000
committer android-build-merger <android-build-merger@google.com> Sat Jul 30 12:30:36 2016 +0000
tree 2ed0f9fd3f975ffffea65e2afa68805d6fd1addc
parent c6bc64e1065488e7cf9feeb29f40bec3c9b57479
parent ad0f7793c7574cb563f8001497a2af425ceee1b7

Cap minimum visibilty of floating windows by the real size.
am: ad0f7793c7

Change-Id: I735bfec6451a9349b453ced5aec210be44b76615

services/core/java/com/android/server/wm/WindowState.java

diff --git a/services/core/java/com/android/server/wm/WindowState.java b/services/core/java/com/android/server/wm/WindowState.java
index 94226ca..a00ac5d 100644
--- a/services/core/java/com/android/server/wm/WindowState.java
+++ b/services/core/java/com/android/server/wm/WindowState.java
@@ -829,10 +829,10 @@
             final int height = Math.min(mFrame.height(), mContentFrame.height());
             final int width = Math.min(mContentFrame.width(), mFrame.width());
             final DisplayMetrics displayMetrics = getDisplayContent().getDisplayMetrics();
-            final int minVisibleHeight = WindowManagerService.dipToPixel(
-                    MINIMUM_VISIBLE_HEIGHT_IN_DP, displayMetrics);
-            final int minVisibleWidth = WindowManagerService.dipToPixel(
-                    MINIMUM_VISIBLE_WIDTH_IN_DP, displayMetrics);
+            final int minVisibleHeight = Math.min(height, WindowManagerService.dipToPixel(
+                    MINIMUM_VISIBLE_HEIGHT_IN_DP, displayMetrics));
+            final int minVisibleWidth = Math.min(width, WindowManagerService.dipToPixel(
+                    MINIMUM_VISIBLE_WIDTH_IN_DP, displayMetrics));
             final int top = Math.max(mContentFrame.top,
                     Math.min(mFrame.top, mContentFrame.bottom - minVisibleHeight));
             final int left = Math.max(mContentFrame.left + minVisibleWidth - width,