Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f645da5b authored by Craig Mautner's avatar Craig Mautner Committed by The Android Automerger
Browse files

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
parent 31498ed1

core/java/android/view/SurfaceView.java

+6 −5
Original line number Diff line number Diff line
@@ -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);

                    }