diff options
author | Derek Sollenberger <djsollen@google.com> | 2011-01-27 15:26:53 -0800 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-01-27 15:26:53 -0800 |
commit | 8f9fb94741b5032c8774f87130133ef14d9af4e2 (patch) | |
tree | de21adcb743d6cc859aabdd2c4262ccd30e01298 /core/java/android/webkit/WebView.java | |
parent | 64a2c359aeda59e4bc43d48f31ade919e918ea26 (diff) | |
parent | f3196cd70a45d14929d3b8d72cec3bdaf96cc744 (diff) | |
download | frameworks_base-8f9fb94741b5032c8774f87130133ef14d9af4e2.zip frameworks_base-8f9fb94741b5032c8774f87130133ef14d9af4e2.tar.gz frameworks_base-8f9fb94741b5032c8774f87130133ef14d9af4e2.tar.bz2 |
Merge "Add Plugin API for controling the device power states" into honeycomb
Diffstat (limited to 'core/java/android/webkit/WebView.java')
-rw-r--r-- | core/java/android/webkit/WebView.java | 8 |
1 files changed, 7 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; |