diff options
| author | Cameron Neale <cdneale@google.com> | 2014-10-31 13:18:38 -0700 |
|---|---|---|
| committer | Cameron Neale <cdneale@google.com> | 2014-10-31 14:06:07 -0700 |
| commit | 2775cb34b390ad52d0920bb533232571568c3f71 (patch) | |
| tree | 4e01bc805cafb3008c6fd32dc2febfc509e1a77c /res/values/strings.xml | |
| parent | 955f14c45191fc5a44997e84a2ba8d9ee7f925c5 (diff) | |
| download | android_packages_apps_Trebuchet-2775cb34b390ad52d0920bb533232571568c3f71.tar.gz android_packages_apps_Trebuchet-2775cb34b390ad52d0920bb533232571568c3f71.tar.bz2 android_packages_apps_Trebuchet-2775cb34b390ad52d0920bb533232571568c3f71.zip | |
Changes made to accomodate GSA in Google3 w/ Robolectric
dragViewOffset removed from WallpaperPicker as it was causing
a duplicate resource conflict with launcher3 and was not used
within the WallpaperPicker project.
Empty <application> tag added to WallpaperPicker manifest as required by
Robolectric
Removed <add-resource> tag from L3 manifest, unrecognized by Robolectric
Change-Id: I3744fc50731f82c3e6fdc01d9819e9a0302dc503
Diffstat (limited to 'res/values/strings.xml')
| -rw-r--r-- | res/values/strings.xml | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index b3abe8fac..c5f17ac63 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -258,7 +258,6 @@ s --> <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 --> <!-- The format string for when a folder is opened, speaks the dimensions --> |