From 656e3af44432be6a2ba60289b8e787fad2506ceb Mon Sep 17 00:00:00 2001 From: Craig Mautner Date: Thu, 6 Sep 2012 15:04:22 -0700 Subject: [PATCH] Convert resized() method to new parameters. When the BaseIWindow.resized method got switched from taking (int x, int y, ...) to taking (Rect, ...) the SurfaceView.MyWindow override never got updated. Fixes bug 6992324. Change-Id: Id0b9625559ae0100336f4573f09d313138c8a6e7 --- core/java/android/view/SurfaceView.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/core/java/android/view/SurfaceView.java b/core/java/android/view/SurfaceView.java index fdf1c226b510d..973c7f6328591 100644 --- a/core/java/android/view/SurfaceView.java +++ b/core/java/android/view/SurfaceView.java @@ -615,21 +615,22 @@ public class SurfaceView extends View { mSurfaceView = new WeakReference(surfaceView); } - public void resized(int w, int h, Rect contentInsets, + @Override + public void resized(Rect frame, Rect contentInsets, Rect visibleInsets, boolean reportDraw, Configuration newConfig) { SurfaceView surfaceView = mSurfaceView.get(); if (surfaceView != null) { if (DEBUG) Log.v( - "SurfaceView", surfaceView + " got resized: w=" + - w + " h=" + h + ", cur w=" + mCurWidth + " h=" + mCurHeight); + "SurfaceView", surfaceView + " got resized: w=" + frame.width() + + " h=" + frame.height() + ", cur w=" + mCurWidth + " h=" + mCurHeight); surfaceView.mSurfaceLock.lock(); try { if (reportDraw) { surfaceView.mUpdateWindowNeeded = true; surfaceView.mReportDrawNeeded = true; surfaceView.mHandler.sendEmptyMessage(UPDATE_WINDOW_MSG); - } else if (surfaceView.mWinFrame.width() != w - || surfaceView.mWinFrame.height() != h) { + } else if (surfaceView.mWinFrame.width() != frame.width() + || surfaceView.mWinFrame.height() != frame.height()) { surfaceView.mUpdateWindowNeeded = true; surfaceView.mHandler.sendEmptyMessage(UPDATE_WINDOW_MSG); }