diff options
| author | Derek Sollenberger <djsollen@google.com> | 2010-03-09 17:38:49 -0500 |
|---|---|---|
| committer | Derek Sollenberger <djsollen@google.com> | 2010-03-15 08:36:19 -0400 |
| commit | c28ff44b1e48c7232065b0a81f64a7accb9d2ebf (patch) | |
| tree | 332e9f30ad3628ebf68acb50073ec5b4d50d6ed7 /core/java/android/webkit/PluginFullScreenHolder.java | |
| parent | 24217d8e4dad2a99d7db6f51e89945421a6e7da8 (diff) | |
| download | frameworks_base-c28ff44b1e48c7232065b0a81f64a7accb9d2ebf.zip frameworks_base-c28ff44b1e48c7232065b0a81f64a7accb9d2ebf.tar.gz frameworks_base-c28ff44b1e48c7232065b0a81f64a7accb9d2ebf.tar.bz2 | |
Allow plugin's surface to handle touch when in full-screen.
There is a matching commit in external/webkit
Change-Id: I88d8c533eb821c564c453dfd7293616669b3bf37
Diffstat (limited to 'core/java/android/webkit/PluginFullScreenHolder.java')
| -rw-r--r-- | core/java/android/webkit/PluginFullScreenHolder.java | 40 |
1 files changed, 8 insertions, 32 deletions
diff --git a/core/java/android/webkit/PluginFullScreenHolder.java b/core/java/android/webkit/PluginFullScreenHolder.java index b641803..6d9e108 100644 --- a/core/java/android/webkit/PluginFullScreenHolder.java +++ b/core/java/android/webkit/PluginFullScreenHolder.java @@ -25,8 +25,6 @@ package android.webkit; import android.app.Dialog; -import android.graphics.Rect; -import android.util.Log; import android.view.KeyEvent; import android.view.MotionEvent; import android.view.View; @@ -34,15 +32,9 @@ import android.view.ViewGroup; class PluginFullScreenHolder extends Dialog { - private static final String LOGTAG = "FullScreenHolder"; - private final WebView mWebView; private final int mNpp; private View mContentView; - private int mX; - private int mY; - private int mWidth; - private int mHeight; PluginFullScreenHolder(WebView webView, int npp) { super(webView.getContext(), android.R.style.Theme_NoTitleBar_Fullscreen); @@ -50,23 +42,15 @@ class PluginFullScreenHolder extends Dialog { mNpp = npp; } - Rect getBound() { - return new Rect(mX, mY, mWidth, mHeight); - } - - /* - * x, y, width, height are in the caller's view coordinate system. (x, y) is - * relative to the top left corner of the caller's view. - */ - void updateBound(int x, int y, int width, int height) { - mX = x; - mY = y; - mWidth = width; - mHeight = height; - } - @Override public void setContentView(View contentView) { + // 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 + contentView.setLayoutParams(new ViewGroup.LayoutParams( + ViewGroup.LayoutParams.MATCH_PARENT, + ViewGroup.LayoutParams.MATCH_PARENT)); super.setContentView(contentView); mContentView = contentView; } @@ -99,15 +83,7 @@ class PluginFullScreenHolder extends Dialog { @Override public boolean onTouchEvent(MotionEvent event) { - final float x = event.getX(); - final float y = event.getY(); - // TODO: find a way to know when the dialog size changed so that we can - // cache the ratio - final View decorView = getWindow().getDecorView(); - event.setLocation(mX + x * mWidth / decorView.getWidth(), - mY + y * mHeight / decorView.getHeight()); - mWebView.onTouchEvent(event); - // always return true as we are the handler + // always return true as we don't want the event to propagate any further return true; } |