Stop using mcc for custom workspace cling on sw600dp devices
Bug: 7203884
diff --git a/res/values-sw600dp/config.xml b/res/values-sw600dp/config.xml
index eab77f9..fe88274 100644
--- a/res/values-sw600dp/config.xml
+++ b/res/values-sw600dp/config.xml
@@ -5,6 +5,9 @@
<integer name="hotseat_all_apps_index">3</integer>
<bool name="allow_rotation">true</bool>
+ <!-- Whether or not to use custom clings if a custom workspace layout is passed in -->
+ <bool name="config_useCustomClings">true</bool>
+
<!-- DragController -->
<integer name="config_flingToDeleteMinVelocity">-1000</integer>
diff --git a/res/values/config.xml b/res/values/config.xml
index 8717f6a..2c691a4 100644
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -78,6 +78,9 @@
<integer name="cell_count_x">4</integer>
<integer name="cell_count_y">4</integer>
+ <!-- Whether or not to use custom clings if a custom workspace layout is passed in -->
+ <bool name="config_useCustomClings">false</bool>
+
<!-- Hotseat -->
<bool name="hotseat_transpose_layout_with_orientation">true</bool>
<integer name="hotseat_cell_count">5</integer>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 0ea12c4..19d363c 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -261,17 +261,4 @@
<string name="folder_renamed">Folder renamed to <xliff:g id="name" example="Games">%1$s</xliff:g></string>
<!-- Folder name format -->
<string name="folder_name_format">Folder: <xliff:g id="name" example="Games">%1$s</xliff:g></string>
-
- <!-- Strings used in device overlays -->
-
- <!-- Clings -->
- <!-- Dummy string [CHAR_LIMIT=40] -->
- <string name="custom_workspace_cling_title_1"></string>
- <!-- Dummy string [CHAR_LIMIT=60] -->
- <string name="custom_workspace_cling_description_1"></string>
- <!-- Dummy string [CHAR_LIMIT=40] -->
- <string name="custom_workspace_cling_title_2"></string>
- <!-- Dummy string [CHAR_LIMIT=60] -->
- <string name="custom_workspace_cling_description_2"></string>
-
</resources>
diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index 6095a2f..700f921 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/src/com/android/launcher2/Launcher.java
@@ -3753,7 +3753,7 @@
// with a custom workspace cling (usually specified in an overlay)
// For now, only do this on tablets
if (mSharedPrefs.getInt(LauncherProvider.DEFAULT_WORKSPACE_RESOURCE_ID, 0) != 0 &&
- LauncherApplication.isScreenLarge()) {
+ getResources().getBoolean(R.bool.config_useCustomClings)) {
// Use a custom cling
View cling = findViewById(R.id.workspace_cling);
ViewGroup clingParent = (ViewGroup) cling.getParent();