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
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 4aee339..0ea12c4 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -244,6 +244,8 @@
<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 -->