Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge change 3795 into donut

Browse Source 
* changes:
  URI/extra data for inline scheme.
This commit is contained in:
Android (Google) Code Review
2009-06-10 16:24:01 -07:00
parent e5fb328825 8eb241b877
commit 1f35bf18ad
1 changed files with 25 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
core/java/android/provider/Browser.java
View File

@@ -33,6 +33,12 @@ public class Browser {
public static final Uri BOOKMARKS_URI =
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.
@@ -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[] {