diff options
| author | Grace Kloba <klobag@google.com> | 2010-04-19 12:14:17 -0700 |
|---|---|---|
| committer | Grace Kloba <klobag@google.com> | 2010-04-19 12:14:17 -0700 |
| commit | 6edb3792d83e6e299a9d330db938075634e76d14 (patch) | |
| tree | b91af694a1a23509e165ebf4cc0a503462f410b8 /core/java/android/webkit/PluginFullScreenHolder.java | |
| parent | 1892013643537f5fc330f5b0a02a0e9cb08b1134 (diff) | |
| download | frameworks_base-6edb3792d83e6e299a9d330db938075634e76d14.zip frameworks_base-6edb3792d83e6e299a9d330db938075634e76d14.tar.gz frameworks_base-6edb3792d83e6e299a9d330db938075634e76d14.tar.bz2 | |
Remove fixed size restriction on the SurfaceView
before setting it to the full screen content view.
Fix http://b/issue?id=2607352
Diffstat (limited to 'core/java/android/webkit/PluginFullScreenHolder.java')
| -rw-r--r-- | core/java/android/webkit/PluginFullScreenHolder.java | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/core/java/android/webkit/PluginFullScreenHolder.java b/core/java/android/webkit/PluginFullScreenHolder.java index 6d9e108..1deca67 100644 --- a/core/java/android/webkit/PluginFullScreenHolder.java +++ b/core/java/android/webkit/PluginFullScreenHolder.java @@ -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; } |