diff options
| author | Adam Cohen <adamcohen@google.com> | 2014-02-21 22:42:40 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-02-21 22:42:40 +0000 |
| commit | c757e6c8841e099c54a36c586ad2b7f56bc53cc2 (patch) | |
| tree | 6c21f0f74d2137ce2d259b87cfd17eadadd3b959 /res | |
| parent | a6c57fc5b492a32d19a216738ae12b9946b17035 (diff) | |
| parent | 1c471f4c3bd2336baabc147f9d22fffc9a880135 (diff) | |
| download | android_packages_apps_Trebuchet-c757e6c8841e099c54a36c586ad2b7f56bc53cc2.tar.gz android_packages_apps_Trebuchet-c757e6c8841e099c54a36c586ad2b7f56bc53cc2.tar.bz2 android_packages_apps_Trebuchet-c757e6c8841e099c54a36c586ad2b7f56bc53cc2.zip | |
am 1c471f4c: am 71e03b99: Fix issue where clings didn\'t appear after set up wizard (issue 13077829)
* commit '1c471f4c3bd2336baabc147f9d22fffc9a880135':
Fix issue where clings didn't appear after set up wizard (issue 13077829)
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout/custom_workspace_cling.xml | 32 | ||||
| -rw-r--r-- | res/values/strings.xml | 12 |
2 files changed, 0 insertions, 44 deletions
diff --git a/res/layout/custom_workspace_cling.xml b/res/layout/custom_workspace_cling.xml deleted file mode 100644 index 3744f2e4b..000000000 --- a/res/layout/custom_workspace_cling.xml +++ /dev/null @@ -1,32 +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.launcher3.Cling - xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:launcher="http://schemas.android.com/apk/res-auto/com.android.launcher3" - android:layout_width="match_parent" - android:layout_height="match_parent" - 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="start" - android:layout_gravity="bottom|start" - /> -</com.android.launcher3.Cling> diff --git a/res/values/strings.xml b/res/values/strings.xml index 2c6306a56..9cb6c293b 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -252,18 +252,6 @@ s --> <!-- Folder name format --> <string name="folder_name_format">Folder: <xliff:g id="name" example="Games">%1$s</xliff:g></string> - <!-- Strings used in device overlays --> - - <!-- Clings --> - <!-- Dummy string [CHAR_LIMIT=40] --> - <string name="custom_workspace_cling_title_1"></string> - <!-- Dummy string [CHAR_LIMIT=60] --> - <string name="custom_workspace_cling_description_1"></string> - <!-- Dummy string [CHAR_LIMIT=40] --> - <string name="custom_workspace_cling_title_2"></string> - <!-- Dummy string [CHAR_LIMIT=60] --> - <string name="custom_workspace_cling_description_2"></string> - <!-- Debug-only activity name. [DO NOT TRANSLATE] --> <string name="debug_memory_activity">* HPROF</string> |