diff options
| author | Winson Chung <winsonc@google.com> | 2012-04-24 15:36:56 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-04-24 15:36:56 -0700 |
| commit | 0eb341ab22d45346ab7748bb05fab69fffeb0bd8 (patch) | |
| tree | f1dd12e0607bb99c5c0097c426944619fe8f1b4e | |
| parent | 1c18112a69e3a2cc8eff6600c6c2216600624847 (diff) | |
| parent | 169c3d75e438999f0b1e70a6015843a4c4422dec (diff) | |
| download | android_packages_apps_Trebuchet-0eb341ab22d45346ab7748bb05fab69fffeb0bd8.tar.gz android_packages_apps_Trebuchet-0eb341ab22d45346ab7748bb05fab69fffeb0bd8.tar.bz2 android_packages_apps_Trebuchet-0eb341ab22d45346ab7748bb05fab69fffeb0bd8.zip | |
Merge "Fixing strings to distinguish between being out of space for a single screen and being completely out of space. (Bug 6381160)"
| -rw-r--r-- | res/values/strings.xml | 6 | ||||
| -rw-r--r-- | src/com/android/launcher2/InstallShortcutReceiver.java | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index f707c8cbb..7e9d12cd6 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 19b1c69d2..82fb3d154 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), |