diff options
| author | Michael Jurka <mikejurka@google.com> | 2012-10-08 13:21:35 +0200 |
|---|---|---|
| committer | Michael Jurka <mikejurka@google.com> | 2012-10-08 15:53:53 +0200 |
| commit | 45355c4596f396d7e7247e91de850646356bd104 (patch) | |
| tree | f847e46f9ef60e7dda14978cbdc139c5f09726d1 /res/values/strings.xml | |
| parent | 914d55501146cf2c3abdf52c021b40fa789d211a (diff) | |
| download | android_packages_apps_Trebuchet-45355c4596f396d7e7247e91de850646356bd104.tar.gz android_packages_apps_Trebuchet-45355c4596f396d7e7247e91de850646356bd104.tar.bz2 android_packages_apps_Trebuchet-45355c4596f396d7e7247e91de850646356bd104.zip | |
Re-merge "Add support for custom manta cling"
Also, fix issue where mako was crashing because
Launcher was trying to load a custom cling for it.
It was doing this because a custom home layout was
specified by SetupWizard, but for now we only want
custom clings on large devices
Bug: 7302705
Bug: 6992663
This reverts commit 2ebcf509f038f435ca8819dc098a7cb480bed0d9.
Change-Id: I46533309d5c62edfbd3a3b178c6965ffc73b6476
Diffstat (limited to 'res/values/strings.xml')
| -rw-r--r-- | res/values/strings.xml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index 4aee339e4..0ea12c4ef 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -244,6 +244,8 @@ s --> <string name="folder_cling_create_folder">To make a new folder on your Home screen, stack one app on top of another.</string> <!-- The text on the button to dismiss a cling [CHAR_LIMIT=none] --> <string name="cling_dismiss">OK</string> + <!-- Error message on dummy custom cling layout [DO NOT TRANSLATE] --> + <string name="dummy_custom_cling_error_message">Error: custom workspace layout passed in but custom cling was not overwritten</string> <add-resource type="string" name="default_folder_name" /> <!-- Folder accessibility --> |