commit 15fd63b5c4b799efaf7bfffdcbb442c2652bf063
author Adrian Roos <roosa@google.com> Tue Dec 09 15:06:40 2014 +0000
committer The Android Automerger <android-build@google.com> Tue Dec 09 15:17:04 2014 -0800
tree 7b5a9fac63007d6a42d99b0a464452d600848b4c
parent a98d3462bef2e8fd4e0800b35cbafea0d50741a0

Revert "Fix calculation of overscan insets in WindowState."

This reverts commit ff778fe450ca2d0e554aa6aee7a9da1cda46d4d5.

Bug: 18659737
Change-Id: I1efc59edfb8ded946cc14f5c4d6f532ac291bd81

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 ba89f23..021a6e4 100644
--- a/services/core/java/com/android/server/wm/WindowState.java
+++ b/services/core/java/com/android/server/wm/WindowState.java
@@ -617,8 +617,8 @@
 
         mOverscanInsets.set(Math.max(mOverscanFrame.left - mFrame.left, 0),
                 Math.max(mOverscanFrame.top - mFrame.top, 0),
-                Math.min(mFrame.right - mOverscanFrame.right, 0),
-                Math.min(mFrame.bottom - mOverscanFrame.bottom, 0));
+                Math.max(mFrame.right - mOverscanFrame.right, 0),
+                Math.max(mFrame.bottom - mOverscanFrame.bottom, 0));
 
         mContentInsets.set(mContentFrame.left - mFrame.left,
                 mContentFrame.top - mFrame.top,