Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 5d7f58be: am 37bd0776: Merge "Don\'t start SearchDialog on television." into lmp-dev

Browse Source 
* commit '5d7f58be2c034823d6e5cfab847ad50b2a463dfc':
  Don't start SearchDialog on television.
This commit is contained in:
Tim Kilbourn
2014-10-09 19:17:10 +00:00
committed by Android Git Automerger
parent 8aa2e3f168 5d7f58be2c
commit bb76d5cd88
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/java/android/app/SearchManager.java
View File

@@ -23,6 +23,7 @@ import android.content.Context;
import android.content.DialogInterface; import android.content.DialogInterface;
import android.content.Intent; import android.content.Intent;
import android.content.pm.ResolveInfo; import android.content.pm.ResolveInfo;
import android.content.res.Configuration;
import android.database.Cursor; import android.database.Cursor;
import android.graphics.Rect; import android.graphics.Rect;
import android.net.Uri; import android.net.Uri;
@@ -624,9 +625,13 @@ public class SearchManager
return; 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() { private void ensureSearchDialog() {