Merge "Explicitly do not support SEARCH_SERVICE on UI_MODE_TYPE_WATCH" (4e056c8b) · Commits · e / os / android_frameworks_base

core/java/android/app/Activity.java

+11 −5

Original line number	Diff line number	Diff line
		@@ -4161,9 +4161,10 @@ public class Activity extends ContextThemeWrapper
		* <p>You can override this function to force global search, e.g. in response to a dedicated
		* search key, or to block search entirely (by simply returning false).
		*
		* <p>Note: when running in a {@link Configuration#UI_MODE_TYPE_TELEVISION}, the default
		* implementation changes to simply return false and you must supply your own custom
		* implementation if you want to support search.</p>
		* <p>Note: when running in a {@link Configuration#UI_MODE_TYPE_TELEVISION} or
		* {@link Configuration#UI_MODE_TYPE_WATCH}, the default implementation changes to simply
		* return false and you must supply your own custom implementation if you want to support
		* search.
		*
		* @param searchEvent The {@link SearchEvent} that signaled this search.
		* @return Returns {@code true} if search launched, and {@code false} if the activity does
		@@ -4183,8 +4184,10 @@ public class Activity extends ContextThemeWrapper
		* @see #onSearchRequested(SearchEvent)
		*/
		public boolean onSearchRequested() {
		if ((getResources().getConfiguration().uiMode&Configuration.UI_MODE_TYPE_MASK)
		!= Configuration.UI_MODE_TYPE_TELEVISION) {
		final int uiMode = getResources().getConfiguration().uiMode
		& Configuration.UI_MODE_TYPE_MASK;
		if (uiMode != Configuration.UI_MODE_TYPE_TELEVISION
		&& uiMode != Configuration.UI_MODE_TYPE_WATCH) {
		startSearch(null, false, null, false);
		return true;
		} else {
		@@ -4213,6 +4216,9 @@ public class Activity extends ContextThemeWrapper
		* is to inject specific data such as context data, it is preferred to <i>override</i>
		* onSearchRequested(), so that any callers to it will benefit from the override.
		*
		* <p>Note: when running in a {@link Configuration#UI_MODE_TYPE_WATCH}, use of this API is
		* not supported.
		*
		* @param initialQuery Any non-null non-empty string will be inserted as
		* pre-entered text in the search query box.
		* @param selectInitialQuery If true, the initial query will be preselected, which means that

core/java/android/app/SearchManager.java

+3 −0

Original line number	Diff line number	Diff line
		@@ -48,6 +48,9 @@ import java.util.List;
		* and the {@link android.content.Intent#ACTION_SEARCH ACTION_SEARCH}
		* {@link android.content.Intent Intent}.
		*
		* <p>
		* {@link Configuration#UI_MODE_TYPE_WATCH} does not support this system service.
		*
		* <div class="special reference">
		* <h3>Developer Guides</h3>
		* <p>For more information about using the search dialog and adding search

core/java/android/content/Context.java

+5 −1

Original line number	Diff line number	Diff line
		@@ -3370,7 +3370,11 @@ public abstract class Context {
		* Use with {@link #getSystemService(String)} to retrieve a {@link
		* android.app.SearchManager} for handling searches.
		*
		* @see #getSystemService(String)
		* <p>
		* {@link Configuration#UI_MODE_TYPE_WATCH} does not support
		* {@link android.app.SearchManager}.
		*
		* @see #getSystemService
		* @see android.app.SearchManager
		*/
		public static final String SEARCH_SERVICE = "search";

core/java/com/android/internal/policy/PhoneWindow.java

+4 −0

Original line number	Diff line number	Diff line
		@@ -2040,6 +2040,10 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback {
		if (getKeyguardManager().inKeyguardRestrictedInputMode()) {
		break;
		}
		if ((getContext().getResources().getConfiguration().uiMode
		& Configuration.UI_MODE_TYPE_MASK) == Configuration.UI_MODE_TYPE_WATCH) {
		break;
		}
		if (event.isTracking() && !event.isCanceled()) {
		launchDefaultSearch(event);
		}