diff options
| author | Michael Jurka <mikejurka@google.com> | 2012-10-07 17:56:13 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-10-07 17:56:14 -0700 |
| commit | 914d55501146cf2c3abdf52c021b40fa789d211a (patch) | |
| tree | fbe81fb4f8fa3b4d68d237993aa3200b7681cf0a /res | |
| parent | b7fbb8219b85c9e553a954cb07aa9f9cfa577fc3 (diff) | |
| parent | 2ebcf509f038f435ca8819dc098a7cb480bed0d9 (diff) | |
| download | android_packages_apps_Trebuchet-914d55501146cf2c3abdf52c021b40fa789d211a.tar.gz android_packages_apps_Trebuchet-914d55501146cf2c3abdf52c021b40fa789d211a.tar.bz2 android_packages_apps_Trebuchet-914d55501146cf2c3abdf52c021b40fa789d211a.zip | |
Merge "Revert "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, 0 insertions, 35 deletions
diff --git a/res/layout/custom_workspace_cling.xml b/res/layout/custom_workspace_cling.xml deleted file mode 100644 index 5bdc58719..000000000 --- a/res/layout/custom_workspace_cling.xml +++ /dev/null @@ -1,30 +0,0 @@ -<?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 628884fc3..d497c2dae 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -22,9 +22,6 @@ <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 0ea12c4ef..4aee339e4 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -244,8 +244,6 @@ 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 --> |