Merge "Remove fixed size restriction on the SurfaceView before setting it to...

import android.app.Dialog;

import android.view.KeyEvent;

import android.view.MotionEvent;

import android.view.SurfaceView;

import android.view.View;

import android.view.ViewGroup;

        contentView.setLayoutParams(new ViewGroup.LayoutParams(

                ViewGroup.LayoutParams.MATCH_PARENT,

                ViewGroup.LayoutParams.MATCH_PARENT));

        // fixed size is only used either during pinch zoom or surface is too

        // big. Make sure it is not fixed size before setting it to the full

        // screen content view

        if (contentView instanceof SurfaceView) {

            final SurfaceView sView = (SurfaceView) contentView;

            if (sView.isFixedSize()) {

                sView.getHolder().setSizeFromLayout();

            }

        }

        super.setContentView(contentView);

        mContentView = contentView;

    }