From bee1fb9363efb26cd7aee166fe24331061e33ad4 Mon Sep 17 00:00:00 2001 From: Dianne Hackborn Date: Wed, 8 May 2013 15:51:26 -0700 Subject: [PATCH] DO NOT MERGE. Fix issue #8868003: Recents thumbnails scale... ...+ zoom to wrong place We need to make sure the overscan insets are never negative. Change-Id: I6ca82acc2a6c887085a5d14d03a55ea78451e4b6 --- services/java/com/android/server/wm/WindowState.java | 8 ++++---- 1 file 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 e53a721dac360..dfb22a70161ee 100644 --- a/services/java/com/android/server/wm/WindowState.java +++ b/services/java/com/android/server/wm/WindowState.java @@ -534,10 +534,10 @@ final class WindowState implements WindowManagerPolicy.WindowState { if (visible.bottom > frame.bottom) visible.bottom = frame.bottom; final Rect overscanInsets = mOverscanInsets; - overscanInsets.left = overscan.left-frame.left; - overscanInsets.top = overscan.top-frame.top; - overscanInsets.right = frame.right-overscan.right; - overscanInsets.bottom = frame.bottom-overscan.bottom; + overscanInsets.left = overscan.left > frame.left ? overscan.left-frame.left : 0; + overscanInsets.top = overscan.top > frame.top ? overscan.top-frame.top : 0; + overscanInsets.right = overscan.right < frame.right ? frame.right-overscan.right : 0; + overscanInsets.bottom = overscan.bottom < frame.bottom ? frame.bottom-overscan.bottom : 0; final Rect contentInsets = mContentInsets; contentInsets.left = content.left-frame.left;