diff options
author | Cameron Neale <cdneale@google.com> | 2014-10-21 20:29:52 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-10-21 20:29:53 +0000 |
commit | d5866c4e9af7c1af88a5bd18f27f6b00908f7533 (patch) | |
tree | f5e158599a6d3e2dc1b7f52d2d597a0255b615c0 | |
parent | c02ccbc8c5efb8502c6168e1b6f635d882bfcc51 (diff) | |
parent | 9a8573250bbe0df0af0d275cb188bf9db7942e6f (diff) | |
download | android_packages_apps_Trebuchet-d5866c4e9af7c1af88a5bd18f27f6b00908f7533.tar.gz android_packages_apps_Trebuchet-d5866c4e9af7c1af88a5bd18f27f6b00908f7533.tar.bz2 android_packages_apps_Trebuchet-d5866c4e9af7c1af88a5bd18f27f6b00908f7533.zip |
Merge "Removing duplicated and/or unused resources from WallpaperPicker that conflict with Launcher 3 resources. The resource duplicated between the two is now only held within Launcher3. These changes are necessary in order for GSA to build in Google3." into ub-now-master
-rw-r--r-- | WallpaperPicker/res/values-sw600dp/config.xml | 18 | ||||
-rw-r--r-- | WallpaperPicker/res/values-sw720dp/dimens.xml | 5 | ||||
-rw-r--r-- | WallpaperPicker/res/values/config.xml | 1 |
3 files changed, 0 insertions, 24 deletions
diff --git a/WallpaperPicker/res/values-sw600dp/config.xml b/WallpaperPicker/res/values-sw600dp/config.xml deleted file mode 100644 index 62342dcc2..000000000 --- a/WallpaperPicker/res/values-sw600dp/config.xml +++ /dev/null @@ -1,18 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2013 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> - <bool name="allow_rotation">true</bool> -</resources> diff --git a/WallpaperPicker/res/values-sw720dp/dimens.xml b/WallpaperPicker/res/values-sw720dp/dimens.xml index 9ae155b3c..27c4fd054 100644 --- a/WallpaperPicker/res/values-sw720dp/dimens.xml +++ b/WallpaperPicker/res/values-sw720dp/dimens.xml @@ -15,12 +15,7 @@ --> <resources> - <dimen name="app_icon_size">72dp</dimen> - <!-- QSB --> - <dimen name="toolbar_button_vertical_padding">8dip</dimen> - <dimen name="toolbar_button_horizontal_padding">8dip</dimen> - <!-- 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> diff --git a/WallpaperPicker/res/values/config.xml b/WallpaperPicker/res/values/config.xml index 71580b5b0..2f5174ce6 100644 --- a/WallpaperPicker/res/values/config.xml +++ b/WallpaperPicker/res/values/config.xml @@ -14,7 +14,6 @@ limitations under the License. --> <resources> - <bool name="allow_rotation">false</bool> <!-- Specifies whether to expand the cropped area on both sides (rather than just to one side) --> <bool name="center_crop">false</bool> |