summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorAdam Cohen <adamcohen@google.com>2011-11-16 12:04:53 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-11-16 12:04:53 -0800
commit587ae34aabc03e607c2ec2b37b8709bdf9cc33f0 (patch)
treee551952aab3cac4ac6157af79e41a2797a5a57c6 /res
parentb655d545b7a3f33ac84381c77c649ec9b6197ab4 (diff)
parent78dc83e875fdf541881cfb867ec38bee21d546e9 (diff)
downloadandroid_packages_apps_Trebuchet-587ae34aabc03e607c2ec2b37b8709bdf9cc33f0.tar.gz
android_packages_apps_Trebuchet-587ae34aabc03e607c2ec2b37b8709bdf9cc33f0.tar.bz2
android_packages_apps_Trebuchet-587ae34aabc03e607c2ec2b37b8709bdf9cc33f0.zip
Merge "Modifying portals in landscape on the phone UI" into ics-mr1
Diffstat (limited to 'res')
-rw-r--r--res/values-land/config.xml5
-rw-r--r--res/values-sw600dp/config.xml5
-rw-r--r--res/values/config.xml6
3 files changed, 16 insertions, 0 deletions
diff --git a/res/values-land/config.xml b/res/values-land/config.xml
index 121bb0c14..fc20456c3 100644
--- a/res/values-land/config.xml
+++ b/res/values-land/config.xml
@@ -20,4 +20,9 @@
<bool name="config_useDropTargetDownTransition">false</bool>
<!-- Whether or not to fade the side pages -->
<bool name="config_workspaceFadeAdjacentScreens">false</bool>
+
+ <!-- Folder max bounds and max number of items.
+ Note: folder_max_count_x * folder_max_count_y >= folder_max_num_items. -->
+ <integer name="folder_max_count_x">6</integer>
+ <integer name="folder_max_count_y">3</integer>
</resources>
diff --git a/res/values-sw600dp/config.xml b/res/values-sw600dp/config.xml
index 2a81e12a1..7a0789839 100644
--- a/res/values-sw600dp/config.xml
+++ b/res/values-sw600dp/config.xml
@@ -19,4 +19,9 @@
<!-- When shrinking the workspace, this is the percentage of its original size. -->
<integer name="config_workspaceShrinkPercent">17</integer>
+ <!-- Folder max bounds and max number of items. Note: folder_max_count_x * folder_max_count_y
+ >= folder_max_num_items. When these are set to -1, they are automatically determined. -->
+ <integer name="folder_max_count_x">-1</integer>
+ <integer name="folder_max_count_y">-1</integer>
+ <integer name="folder_max_num_items">-1</integer>
</resources>
diff --git a/res/values/config.xml b/res/values/config.xml
index b8040e68f..7ab98707c 100644
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -84,4 +84,10 @@
<!-- When shrinking the workspace, this is the percentage of its original size. -->
<integer name="config_workspaceShrinkPercent">17</integer>
+
+ <!-- Folder max bounds and max number of items. Note: folder_max_count_x * folder_max_count_y
+ >= folder_max_num_items. When these are set to -1, they are automatically determined. -->
+ <integer name="folder_max_count_x">4</integer>
+ <integer name="folder_max_count_y">4</integer>
+ <integer name="folder_max_num_items">16</integer>
</resources>