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 | |
| 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')
| -rw-r--r-- | res/layout/custom_workspace_cling.xml | 30 | ||||
| -rw-r--r-- | res/values/dimens.xml | 3 | ||||
| -rw-r--r-- | res/values/strings.xml | 2 |
3 files changed, 35 insertions, 0 deletions
diff --git a/res/layout/custom_workspace_cling.xml b/res/layout/custom_workspace_cling.xml new file mode 100644 index 000000000..5bdc58719 --- /dev/null +++ b/res/layout/custom_workspace_cling.xml @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2012 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<!-- dummy layout, to be replaced in overlays --> +<com.android.launcher2.Cling + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher" + launcher:drawIdentifier="workspace_custom"> + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textSize="20dp" + android:textColor="@android:color/holo_blue_light" + android:text="@string/dummy_custom_cling_error_message" + android:gravity="left" + android:layout_gravity="bottom|left" + /> +</com.android.launcher2.Cling> 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 --> |