summaryrefslogtreecommitdiffstats
path: root/core/java/com
diff options
context:
space:
mode:
authorChristopher Tate <ctate@google.com>2013-09-30 17:50:32 -0700
committerChristopher Tate <ctate@google.com>2013-10-01 13:32:13 -0700
commitb72b363c972ffa70205afdaeb36073ed09d57f76 (patch)
tree398780157283af2590456df57e4d56db3c4e2436 /core/java/com
parent95b1bbfe6c8fe5072d80e027d4b25319ed6f0411 (diff)
downloadframeworks_base-b72b363c972ffa70205afdaeb36073ed09d57f76.zip
frameworks_base-b72b363c972ffa70205afdaeb36073ed09d57f76.tar.gz
frameworks_base-b72b363c972ffa70205afdaeb36073ed09d57f76.tar.bz2
Specialized prompting when 'home' has become ambiguous
Bug 9958444 Change-Id: I050ae425e570cfc8ffd473587fb2a6127c36eeec
Diffstat (limited to 'core/java/com')
-rw-r--r--core/java/com/android/internal/app/ResolverActivity.java16
1 files changed, 14 insertions, 2 deletions
diff --git a/core/java/com/android/internal/app/ResolverActivity.java b/core/java/com/android/internal/app/ResolverActivity.java
index 05fd613..cd853b6 100644
--- a/core/java/com/android/internal/app/ResolverActivity.java
+++ b/core/java/com/android/internal/app/ResolverActivity.java
@@ -100,8 +100,20 @@ public class ResolverActivity extends AlertActivity implements AdapterView.OnIte
@Override
protected void onCreate(Bundle savedInstanceState) {
- onCreate(savedInstanceState, makeMyIntent(),
- getResources().getText(com.android.internal.R.string.whichApplication),
+ // Use a specialized prompt when we're handling the 'Home' app startActivity()
+ final int titleResource;
+ final Intent intent = makeMyIntent();
+ final Set<String> categories = intent.getCategories();
+ if (Intent.ACTION_MAIN.equals(intent.getAction())
+ && categories != null
+ && categories.size() == 1
+ && categories.contains(Intent.CATEGORY_HOME)) {
+ titleResource = com.android.internal.R.string.whichHomeApplication;
+ } else {
+ titleResource = com.android.internal.R.string.whichApplication;
+ }
+
+ onCreate(savedInstanceState, intent, getResources().getText(titleResource),
null, null, true);
}