summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorAdam Cohen <adamcohen@google.com>2012-08-24 14:19:17 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-08-24 14:19:17 -0700
commitae5d1c39dd25ad659eeae96ab860f46c6e02ce25 (patch)
tree65a080e803f57a0b1cdef60fdd6e870234afaff1 /res
parentedcf9b7cdcc7d663e239a24d6057c39fa5b0c119 (diff)
parent23282720dd7972dfc528c9d55aac069acca91082 (diff)
downloadandroid_packages_apps_Trebuchet-ae5d1c39dd25ad659eeae96ab860f46c6e02ce25.tar.gz
android_packages_apps_Trebuchet-ae5d1c39dd25ad659eeae96ab860f46c6e02ce25.tar.bz2
android_packages_apps_Trebuchet-ae5d1c39dd25ad659eeae96ab860f46c6e02ce25.zip
am 23282720: am 1dc3b9ab: Merge "Adding the ability to scale the hotseat or items in the hotseat" into jb-mr1-dev
* commit '23282720dd7972dfc528c9d55aac069acca91082': Adding the ability to scale the hotseat or items in the hotseat
Diffstat (limited to 'res')
-rw-r--r--res/values-sw600dp/config.xml4
-rw-r--r--res/values/config.xml2
2 files changed, 6 insertions, 0 deletions
diff --git a/res/values-sw600dp/config.xml b/res/values-sw600dp/config.xml
index 2a8e5dfcc..bbb22c51a 100644
--- a/res/values-sw600dp/config.xml
+++ b/res/values-sw600dp/config.xml
@@ -18,4 +18,8 @@
<!-- Camera distance for the overscroll effect. We use a higher value here because the
workspace screens run nearly flush to the edge of the screen-->
<integer name="config_cameraDistance">14000</integer>
+
+<!-- Hotseat -->
+ <!-- must be between 0 and 100 -->
+ <integer name="hotseat_item_scale_percentage">90</integer>
</resources>
diff --git a/res/values/config.xml b/res/values/config.xml
index 381ef1b25..8717f6a47 100644
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -82,4 +82,6 @@
<bool name="hotseat_transpose_layout_with_orientation">true</bool>
<integer name="hotseat_cell_count">5</integer>
<integer name="hotseat_all_apps_index">2</integer>
+ <!-- must be between 0 and 100 -->
+ <integer name="hotseat_item_scale_percentage">100</integer>
</resources>