Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 77dc179b: As embedded and full screen shares the same view, we have to replace the AbsoluteLayout with ViewGroup.Layout before setting it to the dialog as dialog\'s FrameLayout doesn\'t accept AbsoluteLayout.

Browse Source 
Merge commit '77dc179baa7b8fb405633fd46324e336285d10e2' into eclair-mr2-plus-aosp

* commit '77dc179baa7b8fb405633fd46324e336285d10e2':
  As embedded and full screen shares the same view,
This commit is contained in:
Grace Kloba
2010-01-26 10:09:39 -08:00
committed by Android Git Automerger
parent 1f7747adb6 77dc179baa
commit cf0957ce4b
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/java/android/webkit/WebView.java
View File

@@ -5796,6 +5796,13 @@ public class WebView extends AbsoluteLayout
} }
mFullScreenHolder = new PluginFullScreenHolder( mFullScreenHolder = new PluginFullScreenHolder(
WebView.this, data.mNpp); WebView.this, data.mNpp);
// as we are sharing the View between full screen and
// embedded mode, we have to remove the
// AbsoluteLayout.LayoutParams set by embedded mode to
// ViewGroup.LayoutParams before adding it to the dialog
data.mView.setLayoutParams(new ViewGroup.LayoutParams(
ViewGroup.LayoutParams.FILL_PARENT,
ViewGroup.LayoutParams.FILL_PARENT));
mFullScreenHolder.setContentView(data.mView); mFullScreenHolder.setContentView(data.mView);
mFullScreenHolder.setCancelable(false); mFullScreenHolder.setCancelable(false);
mFullScreenHolder.setCanceledOnTouchOutside(false); mFullScreenHolder.setCanceledOnTouchOutside(false);