diff options
| author | Craig Mautner <cmautner@google.com> | 2013-05-10 23:32:01 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-05-10 23:32:02 +0000 |
| commit | 6f52f90307712e7bd575a736b08acdffab2ef17c (patch) | |
| tree | 26bfe21585791a5edb0504c10535ed3635594a25 | |
| parent | 83d551898d4a441475e9582cd573cebb563a6ef3 (diff) | |
| parent | c36c8e6f1fb6974ec9b3111d284b243fbb56cab8 (diff) | |
| download | frameworks_base-6f52f90307712e7bd575a736b08acdffab2ef17c.zip frameworks_base-6f52f90307712e7bd575a736b08acdffab2ef17c.tar.gz frameworks_base-6f52f90307712e7bd575a736b08acdffab2ef17c.tar.bz2 | |
Merge "Fix issue #8868003: Recents thumbnails scale..."
| -rw-r--r-- | services/java/com/android/server/wm/WindowState.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/services/java/com/android/server/wm/WindowState.java b/services/java/com/android/server/wm/WindowState.java index c45d786..116ed8c 100644 --- a/services/java/com/android/server/wm/WindowState.java +++ b/services/java/com/android/server/wm/WindowState.java @@ -537,10 +537,10 @@ final class WindowState implements WindowManagerPolicy.WindowState { Math.min(mVisibleFrame.right, mFrame.right), Math.min(mVisibleFrame.bottom, mFrame.bottom)); - mOverscanInsets.set(mOverscanFrame.left - mFrame.left, - mOverscanFrame.top - mFrame.top, - mFrame.right - mOverscanFrame.right, - mFrame.bottom - mOverscanFrame.bottom); + mOverscanInsets.set(Math.max(mOverscanFrame.left - mFrame.left, 0), + Math.max(mOverscanFrame.top - mFrame.top, 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, |