diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-06-10 16:24:01 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-06-10 16:24:01 -0700 |
| commit | 1f35bf18ade606810843c8ec10445fc884d686cb (patch) | |
| tree | ea05c5ef3ef10c5f769ce1df824d396ebaa97b04 /core/java | |
| parent | e5fb328825995aa33b5b7ecf8b5bee2b17f81715 (diff) | |
| parent | 8eb241b877d78cb665e99c6412876ebb1e5c0939 (diff) | |
| download | frameworks_base-1f35bf18ade606810843c8ec10445fc884d686cb.zip frameworks_base-1f35bf18ade606810843c8ec10445fc884d686cb.tar.gz frameworks_base-1f35bf18ade606810843c8ec10445fc884d686cb.tar.bz2 | |
Merge change 3795 into donut
* changes:
URI/extra data for inline scheme.
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/provider/Browser.java | 26 |
1 files changed, 25 insertions, 1 deletions
diff --git a/core/java/android/provider/Browser.java b/core/java/android/provider/Browser.java index c597b3c..0bab2a7 100644 --- a/core/java/android/provider/Browser.java +++ b/core/java/android/provider/Browser.java @@ -34,6 +34,12 @@ public class Browser { Uri.parse("content://browser/bookmarks"); /** + * The inline scheme to show embedded content in a browser. + * @hide + */ + public static final Uri INLINE_URI = Uri.parse("inline:"); + + /** * The name of extra data when starting Browser with ACTION_VIEW or * ACTION_SEARCH intent. * <p> @@ -53,8 +59,26 @@ public class Browser { * identifier. */ public static final String EXTRA_APPLICATION_ID = - "com.android.browser.application_id"; + "com.android.browser.application_id"; + + /** + * The content to be rendered when url's scheme is inline. + * @hide + */ + public static final String EXTRA_INLINE_CONTENT ="com.android.browser.inline.content"; + /** + * The encoding of the inlined content for inline scheme. + * @hide + */ + public static final String EXTRA_INLINE_ENCODING ="com.android.browser.inline.encoding"; + + /** + * The url used when the inline content is falied to render. + * @hide + */ + public static final String EXTRA_INLINE_FAILURL ="com.android.browser.inline.failurl"; + /* if you change column order you must also change indices below */ public static final String[] HISTORY_PROJECTION = new String[] { |