diff options
author | Michael Jurka <mikejurka@google.com> | 2012-10-07 11:54:24 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2012-10-07 11:54:24 -0700 |
commit | 8c033a14694290063bfe433c32b83fd6c7a07a85 (patch) | |
tree | a854994926012c76d7c9d01a969de0084f7053d2 /res | |
parent | 16332c296fb1ce11f1e98aacde62e345a8d967cb (diff) | |
parent | 6a34c9cd590b67626b504c7893f5667fac893b27 (diff) | |
download | android_packages_apps_Trebuchet-8c033a14694290063bfe433c32b83fd6c7a07a85.tar.gz android_packages_apps_Trebuchet-8c033a14694290063bfe433c32b83fd6c7a07a85.tar.bz2 android_packages_apps_Trebuchet-8c033a14694290063bfe433c32b83fd6c7a07a85.zip |
am 6a34c9cd: am 68255cba: Add support for custom manta cling
* commit '6a34c9cd590b67626b504c7893f5667fac893b27':
Add support for custom manta cling
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 --> |