diff options
| author | Andy Huang <ath@google.com> | 2012-06-07 13:58:15 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-06-07 13:58:15 -0700 |
| commit | 1096e93d354c358b86b24d918c9a25bbf0be4425 (patch) | |
| tree | b560fd2db2a5b676891716f6b0273e3ba23194ef | |
| parent | 5bed4107d2452c7a5cbc8dbf8b737e66c06094ef (diff) | |
| parent | f615f710bb1a1c6fdccb538c1add4db5925d7799 (diff) | |
| download | android_packages_apps_Trebuchet-1096e93d354c358b86b24d918c9a25bbf0be4425.tar.gz android_packages_apps_Trebuchet-1096e93d354c358b86b24d918c9a25bbf0be4425.tar.bz2 android_packages_apps_Trebuchet-1096e93d354c358b86b24d918c9a25bbf0be4425.zip | |
am f615f710: allow voice search in recent apps
* commit 'f615f710bb1a1c6fdccb538c1add4db5925d7799':
allow voice search in recent apps
| -rw-r--r-- | src/com/android/launcher2/Launcher.java | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java index 659077f71..e156c9895 100644 --- a/src/com/android/launcher2/Launcher.java +++ b/src/com/android/launcher2/Launcher.java @@ -1880,8 +1880,7 @@ public final class Launcher extends Activity (SearchManager) getSystemService(Context.SEARCH_SERVICE); ComponentName activityName = searchManager.getGlobalSearchActivity(); Intent intent = new Intent(RecognizerIntent.ACTION_WEB_SEARCH); - intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK - | Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS); + intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); if (activityName != null) { intent.setPackage(activityName.getPackageName()); } @@ -1889,8 +1888,7 @@ public final class Launcher extends Activity overridePendingTransition(R.anim.fade_in_fast, R.anim.fade_out_fast); } catch (ActivityNotFoundException e) { Intent intent = new Intent(RecognizerIntent.ACTION_WEB_SEARCH); - intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK - | Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS); + intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); startActivitySafely(null, intent, "onClickVoiceButton"); } } |