diff options
| author | Michael Jurka <mikejurka@google.com> | 2012-10-08 13:36:41 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-10-08 13:36:41 -0700 |
| commit | 8c063cfcff569e7d68b7405c5b25caba8ce02549 (patch) | |
| tree | ce1eb6a0ff628d16623186b92e99ecc48e752a20 /res/values | |
| parent | a3148b72fea1b26741b2ad05bf5ad88118e4ee1e (diff) | |
| parent | 82c0fe723c1542023fe0e61bc628b8a729be1692 (diff) | |
| download | android_packages_apps_Trebuchet-8c063cfcff569e7d68b7405c5b25caba8ce02549.tar.gz android_packages_apps_Trebuchet-8c063cfcff569e7d68b7405c5b25caba8ce02549.tar.bz2 android_packages_apps_Trebuchet-8c063cfcff569e7d68b7405c5b25caba8ce02549.zip | |
am 82c0fe72: am 75f63ee4: am 98d7bd72: Merge "Re-merge "Add support for custom manta cling"" into jb-mr1-dev
* commit '82c0fe723c1542023fe0e61bc628b8a729be1692':
Re-merge "Add support for custom manta cling"
Diffstat (limited to 'res/values')
| -rw-r--r-- | res/values/dimens.xml | 3 | ||||
| -rw-r--r-- | res/values/strings.xml | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/res/values/dimens.xml b/res/values/dimens.xml index d497c2dae..628884fc3 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -22,6 +22,9 @@ <dimen name="cling_text_block_offset_x">0dp</dimen> <dimen name="cling_text_block_offset_y">0dp</dimen> <dimen name="reveal_radius">48dp</dimen> + <!-- entries for custom clings, will be set in overlays --> + <add-resource type="dimen" name="custom_cling_margin_top" /> + <add-resource type="dimen" name="custom_cling_margin_right" /> <!-- Workspace --> <!-- qsb_bar_height_inset represents qsb_bar_height minus the padding diff --git a/res/values/strings.xml b/res/values/strings.xml index 4aee339e4..0ea12c4ef 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -244,6 +244,8 @@ s --> <string name="folder_cling_create_folder">To make a new folder on your Home screen, stack one app on top of another.</string> <!-- The text on the button to dismiss a cling [CHAR_LIMIT=none] --> <string name="cling_dismiss">OK</string> + <!-- Error message on dummy custom cling layout [DO NOT TRANSLATE] --> + <string name="dummy_custom_cling_error_message">Error: custom workspace layout passed in but custom cling was not overwritten</string> <add-resource type="string" name="default_folder_name" /> <!-- Folder accessibility --> |