Merge "New flag to open intent in a new tab." (91ebba38) · Commits · e / os / android_frameworks_base

api/current.xml

+22 −0

Original line number	Diff line number	Diff line
		@@ -35340,6 +35340,17 @@
		visibility="public"
		>
		</field>
		<field name="EXTRA_NEW_SEARCH"
		type="java.lang.String"
		transient="false"
		volatile="false"
		value=""new_search""
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="EXTRA_SELECT_QUERY"
		type="java.lang.String"
		transient="false"
		@@ -156122,6 +156133,17 @@
		visibility="public"
		>
		</field>
		<field name="EXTRA_CREATE_NEW_TAB"
		type="java.lang.String"
		transient="false"
		volatile="false"
		value=""create_new_tab""
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="EXTRA_HEADERS"
		type="java.lang.String"
		transient="false"

+6 −0

Original line number	Diff line number	Diff line
		@@ -137,6 +137,12 @@ public class SearchManager
		*/
		public final static String EXTRA_SELECT_QUERY = "select_query";

		/**
		* Boolean extra data key for {@link Intent#ACTION_WEB_SEARCH} intents. If {@code true},
		* this search should open a new browser window, rather than using an existing one.
		*/
		public final static String EXTRA_NEW_SEARCH = "new_search";

		/**
		* Boolean extra data key for a suggestion provider to return in {@link Cursor#getExtras} to
		* indicate that the search is not complete yet. This can be used by the search UI

+7 −2

Original line number	Diff line number	Diff line
		@@ -139,8 +139,6 @@ public class Browser {
		public static final int SEARCHES_PROJECTION_SEARCH_INDEX = 1;
		public static final int SEARCHES_PROJECTION_DATE_INDEX = 2;

		private static final String SEARCHES_WHERE_CLAUSE = "search = ?";

		/* Set a cap on the count of history items in the history/bookmark
		table, to prevent db and layout operations from dragging to a
		crawl. Revisit this cap when/if db/layout performance
		@@ -166,6 +164,13 @@ public class Browser {
		c.startActivity(i);
		}

		/**
		* Passed along with an Intent to a browser, specifying that a new tab
		* be created. Overrides EXTRA_APPLICATION_ID; if both are set, a new tab
		* will be used, rather than using the same one.
		*/
		public static final String EXTRA_CREATE_NEW_TAB = "create_new_tab";

		/**
		* Stores a Bitmap extra in an {@link Intent} representing the screenshot of
		* a page to share. When receiving an {@link Intent#ACTION_SEND} from the

+1 −0

Original line number	Diff line number	Diff line
		@@ -83,6 +83,7 @@ class SelectActionModeCallback implements ActionMode.Callback {
		case com.android.internal.R.id.websearch:
		mode.finish();
		Intent i = new Intent(Intent.ACTION_WEB_SEARCH);
		i.putExtra(SearchManager.EXTRA_NEW_SEARCH, true);
		i.putExtra(SearchManager.QUERY, mWebView.getSelection());
		mWebView.getContext().startActivity(i);
		break;