diff options
| author | Cameron Neale <cdneale@google.com> | 2014-10-31 13:18:38 -0700 |
|---|---|---|
| committer | Cameron Neale <cdneale@google.com> | 2014-10-31 14:06:07 -0700 |
| commit | 2775cb34b390ad52d0920bb533232571568c3f71 (patch) | |
| tree | 4e01bc805cafb3008c6fd32dc2febfc509e1a77c | |
| parent | 955f14c45191fc5a44997e84a2ba8d9ee7f925c5 (diff) | |
| download | android_packages_apps_Trebuchet-2775cb34b390ad52d0920bb533232571568c3f71.tar.gz android_packages_apps_Trebuchet-2775cb34b390ad52d0920bb533232571568c3f71.tar.bz2 android_packages_apps_Trebuchet-2775cb34b390ad52d0920bb533232571568c3f71.zip | |
Changes made to accomodate GSA in Google3 w/ Robolectric
dragViewOffset removed from WallpaperPicker as it was causing
a duplicate resource conflict with launcher3 and was not used
within the WallpaperPicker project.
Empty <application> tag added to WallpaperPicker manifest as required by
Robolectric
Removed <add-resource> tag from L3 manifest, unrecognized by Robolectric
Change-Id: I3744fc50731f82c3e6fdc01d9819e9a0302dc503
| -rw-r--r-- | WallpaperPicker/AndroidManifest.xml | 4 | ||||
| -rw-r--r-- | WallpaperPicker/res/values-sw720dp/dimens.xml | 23 | ||||
| -rw-r--r-- | res/values/strings.xml | 1 |
3 files changed, 2 insertions, 26 deletions
diff --git a/WallpaperPicker/AndroidManifest.xml b/WallpaperPicker/AndroidManifest.xml index 86a94d078..5b6a0077d 100644 --- a/WallpaperPicker/AndroidManifest.xml +++ b/WallpaperPicker/AndroidManifest.xml @@ -4,7 +4,7 @@ android:versionCode="1" android:versionName="1.0" > - + <uses-sdk android:minSdkVersion="15" android:targetSdkVersion="19" /> - + <application/> </manifest> diff --git a/WallpaperPicker/res/values-sw720dp/dimens.xml b/WallpaperPicker/res/values-sw720dp/dimens.xml deleted file mode 100644 index 27c4fd054..000000000 --- a/WallpaperPicker/res/values-sw720dp/dimens.xml +++ /dev/null @@ -1,23 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2011 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. ---> - -<resources> -<!-- QSB --> - <!-- When dragging items on the workspace, the number of dps by which the position of - the drag view should be offset from the position of the original view. --> - <dimen name="dragViewOffsetX">0dp</dimen> - <dimen name="dragViewOffsetY">0dp</dimen> -</resources> diff --git a/res/values/strings.xml b/res/values/strings.xml index b3abe8fac..c5f17ac63 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -258,7 +258,6 @@ s --> <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 --> <!-- The format string for when a folder is opened, speaks the dimensions --> |