diff options
| -rw-r--r-- | api/current.xml | 22 | ||||
| -rw-r--r-- | core/java/android/app/SearchManager.java | 6 | ||||
| -rw-r--r-- | core/java/android/provider/Browser.java | 9 | ||||
| -rw-r--r-- | core/java/android/webkit/SelectActionModeCallback.java | 1 |
4 files changed, 36 insertions, 2 deletions
diff --git a/api/current.xml b/api/current.xml index c4fc0e470c56..a36f0665498b 100644 --- a/api/current.xml +++ b/api/current.xml @@ -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" diff --git a/core/java/android/app/SearchManager.java b/core/java/android/app/SearchManager.java index 671501255e28..aab087fcf54f 100644 --- a/core/java/android/app/SearchManager.java +++ b/core/java/android/app/SearchManager.java @@ -138,6 +138,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 * to indicate that a search is in progress. The suggestion provider can return partial results diff --git a/core/java/android/provider/Browser.java b/core/java/android/provider/Browser.java index 3bfd005d2058..57ee440755cd 100644 --- a/core/java/android/provider/Browser.java +++ b/core/java/android/provider/Browser.java @@ -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 @@ -167,6 +165,13 @@ public class Browser { } /** + * 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 * Browser, use this to access the screenshot. diff --git a/core/java/android/webkit/SelectActionModeCallback.java b/core/java/android/webkit/SelectActionModeCallback.java index ea09fc0c0ed0..104deb1c82f0 100644 --- a/core/java/android/webkit/SelectActionModeCallback.java +++ b/core/java/android/webkit/SelectActionModeCallback.java @@ -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; |