Merge "Fixing strings to distinguish between being out of space for a single screen and being completely out of space. (Bug 6381160)"
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 @@
<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 @@
// 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),