summaryrefslogtreecommitdiffstats
path: root/res/values
diff options
context:
space:
mode:
authorWinson Chung <winsonc@google.com>2011-07-13 17:25:49 -0700
committerWinson Chung <winsonc@google.com>2011-07-20 14:12:20 -0700
commit3d503fbd9468fb2b9fa645f4f7b91e11229edbfa (patch)
tree38d8bb61f62a47a731b97520a274e07cefbec20c /res/values
parentec8a2eee50290e7d9c95936041b937b6e94bb152 (diff)
downloadandroid_packages_apps_Trebuchet-3d503fbd9468fb2b9fa645f4f7b91e11229edbfa.tar.gz
android_packages_apps_Trebuchet-3d503fbd9468fb2b9fa645f4f7b91e11229edbfa.tar.bz2
android_packages_apps_Trebuchet-3d503fbd9468fb2b9fa645f4f7b91e11229edbfa.zip
Initial changes to add configurable hotseat.
Change-Id: I4c2ed4a1c122c057662fabc70bfef7c5c088460b
Diffstat (limited to 'res/values')
-rw-r--r--res/values/attrs.xml10
-rw-r--r--res/values/dimens.xml6
-rw-r--r--res/values/strings.xml2
3 files changed, 15 insertions, 3 deletions
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 55518dfae..e093e36f8 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -38,6 +38,15 @@
<attr name="cellCountY" format="integer" />
</declare-styleable>
+ <!-- Hotseat specific attributes. These attributes are used to customize
+ the hotseat in XML files. -->
+ <declare-styleable name="Hotseat">
+ <!-- The number of horizontal cells in the CellLayout -->
+ <attr name="cellCountX" />
+ <!-- The number of vertical cells in the CellLayout -->
+ <attr name="cellCountY" />
+ </declare-styleable>
+
<!-- CellLayout specific attributes. These attributes are used to customize
a CellLayout view in XML files. -->
<declare-styleable name="CellLayout">
@@ -125,6 +134,7 @@
<declare-styleable name="Favorite">
<attr name="className" format="string" />
<attr name="packageName" format="string" />
+ <attr name="container" format="string" />
<attr name="screen" format="string" />
<attr name="x" format="string" />
<attr name="y" format="string" />
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 083a88741..bcef13daa 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -16,7 +16,7 @@
<resources>
<!-- Workspace -->
- <dimen name="qsb_bar_height">56dp</dimen>
+ <dimen name="qsb_bar_height">48dp</dimen>
<dimen name="workspace_cell_width">80dp</dimen>
<dimen name="workspace_cell_height">80dp</dimen>
<dimen name="workspace_width_gap">-1dp</dimen>
@@ -42,14 +42,14 @@
<dimen name="title_texture_width">120px</dimen>
<!-- height of the bottom row of controls -->
- <dimen name="button_bar_height">56dip</dimen>
+ <dimen name="button_bar_height">80dip</dimen>
<!-- Drag padding to add to the drop targets -->
<dimen name="drop_target_drag_padding">20dp</dimen>
<!-- so we have access to this dimension in landscape mode even though
button_bar_height changes -->
- <dimen name="button_bar_height_portrait">56dip</dimen>
+ <dimen name="button_bar_height_portrait">80dip</dimen>
<!-- extra horizontal spacing between mini screen thumbnails ie. in all
apps and in customization mode -->
diff --git a/res/values/strings.xml b/res/values/strings.xml
index dcbc6d926..cae613ca0 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -120,6 +120,8 @@
<string name="add_photo_frame">Picture frame</string>
<!-- Error message when user has filled a home screen, possibly not used -->
<string name="out_of_space">No more room on this Home screen.</string>
+ <!-- Error message when user tries to drop an invalid item on the hotseat -->
+ <string name="invalid_hotseat_item">This widget is too large for the hotseat.</string>
<!-- Message displayed when a shortcut is created by an external application -->
<string name="shortcut_installed">Shortcut \"<xliff:g id="name" example="Browser">%s</xliff:g>\" created.</string>
<!-- Message displayed when a shortcut is uninstalled by an external application -->