diff options
| author | Michael Jurka <mikejurka@google.com> | 2012-10-08 13:29:24 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-10-08 13:29:25 -0700 |
| commit | 98d7bd72df9833b0149dd4772cce710fa4b7476d (patch) | |
| tree | 954855c4be35ffeb2a737ca3acc67248fef6a243 /res/values | |
| parent | 6c5679e5ddbac06d555f1242a2cf082deb71de21 (diff) | |
| parent | 45355c4596f396d7e7247e91de850646356bd104 (diff) | |
| download | android_packages_apps_Trebuchet-98d7bd72df9833b0149dd4772cce710fa4b7476d.tar.gz android_packages_apps_Trebuchet-98d7bd72df9833b0149dd4772cce710fa4b7476d.tar.bz2 android_packages_apps_Trebuchet-98d7bd72df9833b0149dd4772cce710fa4b7476d.zip | |
Merge "Re-merge "Add support for custom manta cling"" into jb-mr1-dev
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 --> |