diff options
| author | Craig Mautner <cmautner@google.com> | 2012-09-06 15:07:46 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-09-06 15:07:46 -0700 |
| commit | 5851c6e63879ce7c08d345e80db9a2872657a59f (patch) | |
| tree | 126f2bc3784fc47c157a7b88d27dfc24ab5ce838 | |
| parent | a6b5eca796e3d70f29a42b32d742807f5b38aad9 (diff) | |
| parent | 656e3af44432be6a2ba60289b8e787fad2506ceb (diff) | |
| download | frameworks_base-5851c6e63879ce7c08d345e80db9a2872657a59f.zip frameworks_base-5851c6e63879ce7c08d345e80db9a2872657a59f.tar.gz frameworks_base-5851c6e63879ce7c08d345e80db9a2872657a59f.tar.bz2 | |
Merge "Convert resized() method to new parameters." into jb-mr1-dev
| -rw-r--r-- | core/java/android/view/SurfaceView.java | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/core/java/android/view/SurfaceView.java b/core/java/android/view/SurfaceView.java index fdf1c22..973c7f6 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>(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); } |