diff options
| author | Derek Sollenberger <djsollen@google.com> | 2011-01-27 15:28:52 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-01-27 15:28:52 -0800 |
| commit | f454cee04456acf74871b02033e6972f71919e55 (patch) | |
| tree | 226e9537fcfcedf6862444ae5b3ba24ff042813e /core/java/android | |
| parent | b408c3e984dbc3af43befc6fd16ff74dd24457a9 (diff) | |
| parent | 8f9fb94741b5032c8774f87130133ef14d9af4e2 (diff) | |
| download | frameworks_base-f454cee04456acf74871b02033e6972f71919e55.zip frameworks_base-f454cee04456acf74871b02033e6972f71919e55.tar.gz frameworks_base-f454cee04456acf74871b02033e6972f71919e55.tar.bz2 | |
am 8f9fb947: Merge "Add Plugin API for controling the device power states" into honeycomb
* commit '8f9fb94741b5032c8774f87130133ef14d9af4e2':
Add Plugin API for controling the device power states
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/webkit/WebView.java | 8 | ||||
| -rw-r--r-- | core/java/android/webkit/WebViewCore.java | 9 |
2 files changed, 16 insertions, 1 deletions
diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java index 2a2b3af..6363299 100644 --- a/core/java/android/webkit/WebView.java +++ b/core/java/android/webkit/WebView.java @@ -673,6 +673,7 @@ public class WebView extends AbsoluteLayout static final int AUTOFILL_COMPLETE = 134; static final int SELECT_AT = 135; + static final int SCREEN_ON = 136; private static final int FIRST_PACKAGE_MSG_ID = SCROLL_TO_MSG_ID; private static final int LAST_PACKAGE_MSG_ID = SET_TOUCH_HIGHLIGHT_RECTS; @@ -726,7 +727,8 @@ public class WebView extends AbsoluteLayout "SAVE_WEBARCHIVE_FINISHED", // = 132; "SET_AUTOFILLABLE", // = 133; "AUTOFILL_COMPLETE", // = 134; - "SELECT_AT" // = 135; + "SELECT_AT", // = 135; + "SCREEN_ON" // = 136; }; // If the site doesn't use the viewport meta tag to specify the viewport, @@ -7454,6 +7456,10 @@ public class WebView extends AbsoluteLayout doMotionUp(msg.arg1, msg.arg2); break; + case SCREEN_ON: + setKeepScreenOn(msg.arg1 == 1); + break; + case SHOW_FULLSCREEN: { View view = (View) msg.obj; int npp = msg.arg1; diff --git a/core/java/android/webkit/WebViewCore.java b/core/java/android/webkit/WebViewCore.java index 27bf51c..3bde000 100644 --- a/core/java/android/webkit/WebViewCore.java +++ b/core/java/android/webkit/WebViewCore.java @@ -2549,6 +2549,15 @@ final class WebViewCore { } // called by JNI + private void keepScreenOn(boolean screenOn) { + if (mWebView != null) { + Message message = mWebView.mPrivateHandler.obtainMessage(WebView.SCREEN_ON); + message.arg1 = screenOn ? 1 : 0; + message.sendToTarget(); + } + } + + // called by JNI private Class<?> getPluginClass(String libName, String clsName) { if (mWebView == null) { |