summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWinson Chung <winsonc@google.com>2012-04-24 14:43:54 -0700
committerWinson Chung <winsonc@google.com>2012-04-24 14:44:25 -0700
commit169c3d75e438999f0b1e70a6015843a4c4422dec (patch)
treec237b9fd49cbdbe08bcc6ebe39c93f3eb13cc9cf
parentc3a804042844dc4733b4bd4b6ac03bf4b2b015b7 (diff)
downloadpackages_apps_trebuchet-169c3d75e438999f0b1e70a6015843a4c4422dec.zip
packages_apps_trebuchet-169c3d75e438999f0b1e70a6015843a4c4422dec.tar.gz
packages_apps_trebuchet-169c3d75e438999f0b1e70a6015843a4c4422dec.tar.bz2
Fixing strings to distinguish between being out of space for a single screen and being completely out of space. (Bug 6381160)
Change-Id: I3ee3ab2151154ab39f158fbb4776ad7b04d0baab
-rw-r--r--res/values/strings.xml6
-rw-r--r--src/com/android/launcher2/InstallShortcutReceiver.java2
2 files changed, 5 insertions, 3 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml
index f707c8c..7e9d12c 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -81,8 +81,10 @@ s -->
<string name="group_widgets">Widgets</string>
<!-- Options in "Add to Home" dialog box; Title of the group containing the list of apps that can set the wallpaper-->
<string name="group_wallpapers">Wallpapers</string>
- <!-- Error message when user has filled a home screen, possibly not used -->
- <string name="out_of_space">No more room on your Home screens.</string>
+ <!-- Error message when user has filled all their home screens -->
+ <string name="completely_out_of_space">No more room on your Home screens.</string>
+ <!-- Error message when user has filled a home screen -->
+ <string name="out_of_space">No more room on this Home screen.</string>
<!-- Error message when user has filled the hotseat -->
<string name="hotseat_out_of_space">No more room on the hotseat.</string>
<!-- Error message when user tries to drop an invalid item on the hotseat -->
diff --git a/src/com/android/launcher2/InstallShortcutReceiver.java b/src/com/android/launcher2/InstallShortcutReceiver.java
index 19b1c69..82fb3d1 100644
--- a/src/com/android/launcher2/InstallShortcutReceiver.java
+++ b/src/com/android/launcher2/InstallShortcutReceiver.java
@@ -97,7 +97,7 @@ public class InstallShortcutReceiver extends BroadcastReceiver {
// will provide feedback otherwise
if (!found) {
if (result[0] == INSTALL_SHORTCUT_NO_SPACE) {
- Toast.makeText(context, context.getString(R.string.out_of_space),
+ Toast.makeText(context, context.getString(R.string.completely_out_of_space),
Toast.LENGTH_SHORT).show();
} else if (result[0] == INSTALL_SHORTCUT_IS_DUPLICATE) {
Toast.makeText(context, context.getString(R.string.shortcut_duplicate, name),