diff options
| author | Tim Kilbourn <tkilbourn@google.com> | 2014-10-08 17:01:42 -0700 |
|---|---|---|
| committer | Tim Kilbourn <tkilbourn@google.com> | 2014-10-08 17:01:42 -0700 |
| commit | 99e9095430b84e49bda50c831e320dada8bca109 (patch) | |
| tree | 9b9e8b7effa6a47901b8db76fc5c19ab1f93f730 /core/java/android/app/SearchManager.java | |
| parent | 8f25f390e515be9783e8cce913f8de051e097419 (diff) | |
| download | frameworks_base-99e9095430b84e49bda50c831e320dada8bca109.zip frameworks_base-99e9095430b84e49bda50c831e320dada8bca109.tar.gz frameworks_base-99e9095430b84e49bda50c831e320dada8bca109.tar.bz2 | |
Don't start SearchDialog on television.
Bug: 17654744
Change-Id: Ie76405d648b7ac34a70465e275315f9cf277a3fe
Diffstat (limited to 'core/java/android/app/SearchManager.java')
| -rw-r--r-- | core/java/android/app/SearchManager.java | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/core/java/android/app/SearchManager.java b/core/java/android/app/SearchManager.java index 261b15d..4c253f3 100644 --- a/core/java/android/app/SearchManager.java +++ b/core/java/android/app/SearchManager.java @@ -23,6 +23,7 @@ import android.content.Context; import android.content.DialogInterface; import android.content.Intent; import android.content.pm.ResolveInfo; +import android.content.res.Configuration; import android.database.Cursor; import android.graphics.Rect; import android.net.Uri; @@ -624,9 +625,13 @@ public class SearchManager return; } - ensureSearchDialog(); + UiModeManager uiModeManager = new UiModeManager(); + // Don't show search dialog on televisions. + if (uiModeManager.getCurrentModeType() != Configuration.UI_MODE_TYPE_TELEVISION) { + ensureSearchDialog(); - mSearchDialog.show(initialQuery, selectInitialQuery, launchActivity, appSearchData); + mSearchDialog.show(initialQuery, selectInitialQuery, launchActivity, appSearchData); + } } private void ensureSearchDialog() { |