Merge change 3795 into donut (1f35bf18) · Commits · e / os / android_frameworks_base

core/java/android/provider/Browser.java

+25 −1

Original line number	Diff line number	Diff line
		@@ -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.
		@@ -55,6 +61,24 @@ public class Browser {
		public static final String EXTRA_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[] {