summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWinson Chung <winsonc@google.com>2010-10-06 17:09:10 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-10-06 17:09:10 -0700
commit7ed39f3362e4701101967339b1be41b365712d1c (patch)
tree5f8950a0a7386b42f72a8cd07c9ac347c10847a3
parentb2f988d15cd68e08af86c12cd1f0141b1e02b817 (diff)
parent6a5f4d8526944ad4189072543ec4cc3f6d638b6f (diff)
downloadpackages_apps_trebuchet-7ed39f3362e4701101967339b1be41b365712d1c.zip
packages_apps_trebuchet-7ed39f3362e4701101967339b1be41b365712d1c.tar.gz
packages_apps_trebuchet-7ed39f3362e4701101967339b1be41b365712d1c.tar.bz2
am 6a5f4d85: Merge "Adding more specific title for pick-application dialog." into gingerbread
Merge commit '6a5f4d8526944ad4189072543ec4cc3f6d638b6f' * commit '6a5f4d8526944ad4189072543ec4cc3f6d638b6f': Adding more specific title for pick-application dialog.
-rw-r--r--res/values/strings.xml2
-rw-r--r--src/com/android/launcher2/Launcher.java1
2 files changed, 3 insertions, 0 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 59fdfd3..bcb7e9a 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -115,6 +115,8 @@
<!-- Title of dialog when user is selecting shortcut to add to homescreen -->
<string name="title_select_shortcut">Select shortcut</string>
+ <!-- Title of dialog when user is selecting an application to add to homescreen -->
+ <string name="title_select_application">Select application</string>
<!-- Title of dialog when user is selecting live folder to add to homescreen -->
<string name="title_select_live_folder">Select folder</string>
diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index bdaa43d..c065170 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/src/com/android/launcher2/Launcher.java
@@ -1484,6 +1484,7 @@ public final class Launcher extends Activity
Intent pickIntent = new Intent(Intent.ACTION_PICK_ACTIVITY);
pickIntent.putExtra(Intent.EXTRA_INTENT, mainIntent);
+ pickIntent.putExtra(Intent.EXTRA_TITLE, getText(R.string.title_select_application));
startActivityForResultSafely(pickIntent, REQUEST_PICK_APPLICATION);
} else {
startActivityForResultSafely(intent, REQUEST_CREATE_SHORTCUT);