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

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

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

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 '77dc179b' into eclair-mr2-plus-aosp

* commit '77dc179b':
  As embedded and full screen shares the same view,
parents 1f7747ad 77dc179b

core/java/android/webkit/WebView.java

+7 −0
Original line number Original line Diff line number Diff line
@@ -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);