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

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

am cf0957ce: am 77dc179b: As embedded and full screen shares the same view, we... 

am cf0957ce: 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.

Merge commit 'cf0957ce'

* commit 'cf0957ce':
  As embedded and full screen shares the same view,
parents 09ac3c3c cf0957ce

core/java/android/webkit/WebView.java

+7 −0
Original line number Diff line number Diff line
@@ -5985,6 +5985,13 @@ public class WebView extends AbsoluteLayout 
                        }

                        mFullScreenHolder = new PluginFullScreenHolder(

                                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.setCancelable(false);

                        mFullScreenHolder.setCanceledOnTouchOutside(false);