summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorMichael Jurka <mikejurka@google.com>2012-10-09 14:46:26 +0200
committerMichael Jurka <mikejurka@google.com>2012-10-09 14:46:26 +0200
commita113121fd3c43f1e1d23064e17c540c48fe330cc (patch)
tree0cf8ab227bb7224b7a3705a3ccf451c35c5fcfbf /res
parent98d7bd72df9833b0149dd4772cce710fa4b7476d (diff)
downloadandroid_packages_apps_Trebuchet-a113121fd3c43f1e1d23064e17c540c48fe330cc.tar.gz
android_packages_apps_Trebuchet-a113121fd3c43f1e1d23064e17c540c48fe330cc.tar.bz2
android_packages_apps_Trebuchet-a113121fd3c43f1e1d23064e17c540c48fe330cc.zip
Stop using mcc for custom workspace cling on sw600dp devices
Bug: 7203884
Diffstat (limited to 'res')
-rw-r--r--res/values-sw600dp/config.xml3
-rw-r--r--res/values/config.xml3
-rw-r--r--res/values/strings.xml13
3 files changed, 6 insertions, 13 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>