From a113121fd3c43f1e1d23064e17c540c48fe330cc Mon Sep 17 00:00:00 2001
From: Michael Jurka <mikejurka@google.com>
Date: Tue, 9 Oct 2012 14:46:26 +0200
Subject: Stop using mcc for custom workspace cling on sw600dp devices

Bug: 7203884
---
 res/values-sw600dp/config.xml           |  3 +++
 res/values/config.xml                   |  3 +++
 res/values/strings.xml                  | 13 -------------
 src/com/android/launcher2/Launcher.java |  2 +-
 4 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/res/values-sw600dp/config.xml b/res/values-sw600dp/config.xml
index eab77f9b0..fe8827418 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 8717f6a47..2c691a4ce 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 0ea12c4ef..19d363c7d 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -261,17 +261,4 @@ s -->
     <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 6095a2fdc..700f9211e 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/src/com/android/launcher2/Launcher.java
@@ -3753,7 +3753,7 @@ public final class Launcher extends Activity
             // 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();
-- 
cgit v1.2.3