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

Merge change Idc1396c8 into eclair

Browse Source 
* changes:
  Only use FLAG_ACTIVITY_CLEAR_TOP on the search intent when from global search.
This commit is contained in:
Android (Google) Code Review
2009-11-06 16:56:51 -05:00
parent 8d51f7101d dc1396c881
commit 2b3970a295
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/java/android/app/SearchDialog.java
View File

@@ -1646,8 +1646,11 @@ public class SearchDialog extends Dialog implements OnItemClickListener, OnItemS
Intent intent = new Intent(action); Intent intent = new Intent(action);
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
// We need CLEAR_TOP to avoid reusing an old task that has other activities // We need CLEAR_TOP to avoid reusing an old task that has other activities
// on top of the one we want. // on top of the one we want. We don't want to do this in in-app search though,
intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP); // as it can be destructive to the activity stack.
if (mGlobalSearchMode) {
intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
}
if (data != null) { if (data != null) {
intent.setData(data); intent.setData(data);
} }