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

Commit e3ce4c89 authored by Grace Kloba's avatar Grace Kloba Committed by Android Git Automerger
Browse files

am 2dc78498: Merge "Remove fixed size restriction on the SurfaceView before... 

am 2dc78498: Merge "Remove fixed size restriction on the SurfaceView before setting it to the full screen content view." into froyo

Merge commit '2dc78498' into froyo-plus-aosp

* commit '2dc78498':
  Remove fixed size restriction on the SurfaceView
parents f57f147b 2dc78498

core/java/android/webkit/PluginFullScreenHolder.java

+10 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ package android.webkit; 
import android.app.Dialog;

import android.view.KeyEvent;

import android.view.MotionEvent;

import android.view.SurfaceView;

import android.view.View;

import android.view.ViewGroup;
@@ -51,6 +52,15 @@ class PluginFullScreenHolder extends Dialog { 
        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;

    }