OSDN Git Service

Revert "Move wallpaper picker code to a separate directory"
authorMichael Jurka <mikejurka@google.com>
Tue, 10 Dec 2013 22:47:28 +0000 (23:47 +0100)
committerMichael Jurka <mikejurka@google.com>
Tue, 10 Dec 2013 22:47:28 +0000 (23:47 +0100)
This reverts commit 8e88cb84781907afb7cca80581fea2277264fd2c.

91 files changed:
Android.mk
CleanSpec.mk
res/drawable-hdpi/ic_actionbar_accept.png [moved from wallpaper_picker_res/drawable-hdpi/ic_actionbar_accept.png with 100% similarity]
res/drawable-hdpi/ic_images.png [moved from wallpaper_picker_res/drawable-hdpi/ic_images.png with 100% similarity]
res/drawable-hdpi/tile_picker_focused.9.png [moved from wallpaper_picker_res/drawable-hdpi/tile_picker_focused.9.png with 100% similarity]
res/drawable-hdpi/tile_picker_pressed.9.png [moved from wallpaper_picker_res/drawable-hdpi/tile_picker_pressed.9.png with 100% similarity]
res/drawable-hdpi/tile_picker_selected.9.png [moved from wallpaper_picker_res/drawable-hdpi/tile_picker_selected.9.png with 100% similarity]
res/drawable-hdpi/tile_shadow_bottom.9.png [moved from wallpaper_picker_res/drawable-hdpi/tile_shadow_bottom.9.png with 100% similarity]
res/drawable-hdpi/tile_shadow_top.9.png [moved from wallpaper_picker_res/drawable-hdpi/tile_shadow_top.9.png with 100% similarity]
res/drawable-mdpi/ic_actionbar_accept.png [moved from wallpaper_picker_res/drawable-mdpi/ic_actionbar_accept.png with 100% similarity]
res/drawable-mdpi/ic_images.png [moved from wallpaper_picker_res/drawable-mdpi/ic_images.png with 100% similarity]
res/drawable-mdpi/tile_picker_focused.9.png [moved from wallpaper_picker_res/drawable-mdpi/tile_picker_focused.9.png with 100% similarity]
res/drawable-mdpi/tile_picker_pressed.9.png [moved from wallpaper_picker_res/drawable-mdpi/tile_picker_pressed.9.png with 100% similarity]
res/drawable-mdpi/tile_picker_selected.9.png [moved from wallpaper_picker_res/drawable-mdpi/tile_picker_selected.9.png with 100% similarity]
res/drawable-mdpi/tile_shadow_bottom.9.png [moved from wallpaper_picker_res/drawable-mdpi/tile_shadow_bottom.9.png with 100% similarity]
res/drawable-mdpi/tile_shadow_top.9.png [moved from wallpaper_picker_res/drawable-mdpi/tile_shadow_top.9.png with 100% similarity]
res/drawable-xhdpi/ic_actionbar_accept.png [moved from wallpaper_picker_res/drawable-xhdpi/ic_actionbar_accept.png with 100% similarity]
res/drawable-xhdpi/ic_images.png [moved from wallpaper_picker_res/drawable-xhdpi/ic_images.png with 100% similarity]
res/drawable-xhdpi/tile_picker_focused.9.png [moved from wallpaper_picker_res/drawable-xhdpi/tile_picker_focused.9.png with 100% similarity]
res/drawable-xhdpi/tile_picker_pressed.9.png [moved from wallpaper_picker_res/drawable-xhdpi/tile_picker_pressed.9.png with 100% similarity]
res/drawable-xhdpi/tile_picker_selected.9.png [moved from wallpaper_picker_res/drawable-xhdpi/tile_picker_selected.9.png with 100% similarity]
res/drawable-xhdpi/tile_shadow_bottom.9.png [moved from wallpaper_picker_res/drawable-xhdpi/tile_shadow_bottom.9.png with 100% similarity]
res/drawable-xhdpi/tile_shadow_top.9.png [moved from wallpaper_picker_res/drawable-xhdpi/tile_shadow_top.9.png with 100% similarity]
res/drawable-xxhdpi/ic_images.png [moved from wallpaper_picker_res/drawable-xxhdpi/ic_images.png with 100% similarity]
res/drawable-xxhdpi/tile_picker_focused.9.png [moved from wallpaper_picker_res/drawable-xxhdpi/tile_picker_focused.9.png with 100% similarity]
res/drawable-xxhdpi/tile_picker_pressed.9.png [moved from wallpaper_picker_res/drawable-xxhdpi/tile_picker_pressed.9.png with 100% similarity]
res/drawable-xxhdpi/tile_picker_selected.9.png [moved from wallpaper_picker_res/drawable-xxhdpi/tile_picker_selected.9.png with 100% similarity]
res/drawable-xxhdpi/tile_shadow_bottom.9.png [moved from wallpaper_picker_res/drawable-xxhdpi/tile_shadow_bottom.9.png with 100% similarity]
res/drawable-xxhdpi/tile_shadow_top.9.png [moved from wallpaper_picker_res/drawable-xxhdpi/tile_shadow_top.9.png with 100% similarity]
res/drawable/wallpaper_tile_fg.xml [moved from wallpaper_picker_res/drawable/wallpaper_tile_fg.xml with 100% similarity]
res/layout/actionbar_set_wallpaper.xml [moved from wallpaper_picker_res/layout/actionbar_set_wallpaper.xml with 100% similarity]
res/layout/wallpaper_cropper.xml [moved from wallpaper_picker_res/layout/wallpaper_cropper.xml with 100% similarity]
res/layout/wallpaper_picker.xml [moved from wallpaper_picker_res/layout/wallpaper_picker.xml with 100% similarity]
res/layout/wallpaper_picker_image_picker_item.xml [moved from wallpaper_picker_res/layout/wallpaper_picker_image_picker_item.xml with 100% similarity]
res/layout/wallpaper_picker_item.xml [moved from wallpaper_picker_res/layout/wallpaper_picker_item.xml with 100% similarity]
res/layout/wallpaper_picker_live_wallpaper_item.xml [moved from wallpaper_picker_res/layout/wallpaper_picker_live_wallpaper_item.xml with 100% similarity]
res/layout/wallpaper_picker_third_party_item.xml [moved from wallpaper_picker_res/layout/wallpaper_picker_third_party_item.xml with 100% similarity]
res/menu/cab_delete_wallpapers.xml [moved from wallpaper_picker_res/menu/cab_delete_wallpapers.xml with 100% similarity]
res/mipmap-hdpi/ic_launcher_wallpaper.png [moved from wallpaper_picker_res/mipmap-hdpi/ic_launcher_wallpaper.png with 100% similarity]
res/mipmap-mdpi/ic_launcher_wallpaper.png [moved from wallpaper_picker_res/mipmap-mdpi/ic_launcher_wallpaper.png with 100% similarity]
res/mipmap-xhdpi/ic_launcher_wallpaper.png [moved from wallpaper_picker_res/mipmap-xhdpi/ic_launcher_wallpaper.png with 100% similarity]
res/mipmap-xxhdpi/ic_launcher_wallpaper.png [moved from wallpaper_picker_res/mipmap-xxhdpi/ic_launcher_wallpaper.png with 100% similarity]
res/values-nodpi/wallpapers.xml [moved from wallpaper_picker_res/values-nodpi/wallpapers.xml with 100% similarity]
res/values-sw720dp/dimens.xml
res/values-sw720dp/styles.xml
res/values/colors.xml
res/values/dimens.xml
res/values/strings.xml
res/values/styles.xml
src/android/util/Pools.java [moved from wallpaper_picker_src/android/util/Pools.java with 100% similarity]
src/com/android/gallery3d/common/BitmapUtils.java [moved from wallpaper_picker_src/com/android/gallery3d/common/BitmapUtils.java with 100% similarity]
src/com/android/gallery3d/common/Utils.java [moved from wallpaper_picker_src/com/android/gallery3d/common/Utils.java with 100% similarity]
src/com/android/gallery3d/exif/ByteBufferInputStream.java [moved from wallpaper_picker_src/com/android/gallery3d/exif/ByteBufferInputStream.java with 100% similarity]
src/com/android/gallery3d/exif/CountedDataInputStream.java [moved from wallpaper_picker_src/com/android/gallery3d/exif/CountedDataInputStream.java with 100% similarity]
src/com/android/gallery3d/exif/ExifData.java [moved from wallpaper_picker_src/com/android/gallery3d/exif/ExifData.java with 100% similarity]
src/com/android/gallery3d/exif/ExifInterface.java [moved from wallpaper_picker_src/com/android/gallery3d/exif/ExifInterface.java with 100% similarity]
src/com/android/gallery3d/exif/ExifInvalidFormatException.java [moved from wallpaper_picker_src/com/android/gallery3d/exif/ExifInvalidFormatException.java with 100% similarity]
src/com/android/gallery3d/exif/ExifModifier.java [moved from wallpaper_picker_src/com/android/gallery3d/exif/ExifModifier.java with 100% similarity]
src/com/android/gallery3d/exif/ExifOutputStream.java [moved from wallpaper_picker_src/com/android/gallery3d/exif/ExifOutputStream.java with 100% similarity]
src/com/android/gallery3d/exif/ExifParser.java [moved from wallpaper_picker_src/com/android/gallery3d/exif/ExifParser.java with 100% similarity]
src/com/android/gallery3d/exif/ExifReader.java [moved from wallpaper_picker_src/com/android/gallery3d/exif/ExifReader.java with 100% similarity]
src/com/android/gallery3d/exif/ExifTag.java [moved from wallpaper_picker_src/com/android/gallery3d/exif/ExifTag.java with 100% similarity]
src/com/android/gallery3d/exif/IfdData.java [moved from wallpaper_picker_src/com/android/gallery3d/exif/IfdData.java with 100% similarity]
src/com/android/gallery3d/exif/IfdId.java [moved from wallpaper_picker_src/com/android/gallery3d/exif/IfdId.java with 100% similarity]
src/com/android/gallery3d/exif/JpegHeader.java [moved from wallpaper_picker_src/com/android/gallery3d/exif/JpegHeader.java with 100% similarity]
src/com/android/gallery3d/exif/OrderedDataOutputStream.java [moved from wallpaper_picker_src/com/android/gallery3d/exif/OrderedDataOutputStream.java with 100% similarity]
src/com/android/gallery3d/exif/Rational.java [moved from wallpaper_picker_src/com/android/gallery3d/exif/Rational.java with 100% similarity]
src/com/android/gallery3d/glrenderer/BasicTexture.java [moved from wallpaper_picker_src/com/android/gallery3d/glrenderer/BasicTexture.java with 100% similarity]
src/com/android/gallery3d/glrenderer/BitmapTexture.java [moved from wallpaper_picker_src/com/android/gallery3d/glrenderer/BitmapTexture.java with 100% similarity]
src/com/android/gallery3d/glrenderer/GLCanvas.java [moved from wallpaper_picker_src/com/android/gallery3d/glrenderer/GLCanvas.java with 100% similarity]
src/com/android/gallery3d/glrenderer/GLES20Canvas.java [moved from wallpaper_picker_src/com/android/gallery3d/glrenderer/GLES20Canvas.java with 100% similarity]
src/com/android/gallery3d/glrenderer/GLES20IdImpl.java [moved from wallpaper_picker_src/com/android/gallery3d/glrenderer/GLES20IdImpl.java with 100% similarity]
src/com/android/gallery3d/glrenderer/GLId.java [moved from wallpaper_picker_src/com/android/gallery3d/glrenderer/GLId.java with 100% similarity]
src/com/android/gallery3d/glrenderer/GLPaint.java [moved from wallpaper_picker_src/com/android/gallery3d/glrenderer/GLPaint.java with 100% similarity]
src/com/android/gallery3d/glrenderer/RawTexture.java [moved from wallpaper_picker_src/com/android/gallery3d/glrenderer/RawTexture.java with 100% similarity]
src/com/android/gallery3d/glrenderer/Texture.java [moved from wallpaper_picker_src/com/android/gallery3d/glrenderer/Texture.java with 100% similarity]
src/com/android/gallery3d/glrenderer/UploadedTexture.java [moved from wallpaper_picker_src/com/android/gallery3d/glrenderer/UploadedTexture.java with 100% similarity]
src/com/android/gallery3d/util/IntArray.java [moved from wallpaper_picker_src/com/android/gallery3d/util/IntArray.java with 100% similarity]
src/com/android/launcher3/CropView.java [moved from wallpaper_picker_src/com/android/launcher3/CropView.java with 100% similarity]
src/com/android/launcher3/WallpaperCropActivity.java [moved from wallpaper_picker_src/com/android/launcher3/WallpaperCropActivity.java with 100% similarity]
src/com/android/launcher3/WallpaperPickerActivity.java [moved from wallpaper_picker_src/com/android/launcher3/WallpaperPickerActivity.java with 100% similarity]
src/com/android/photos/BitmapRegionTileSource.java [moved from wallpaper_picker_src/com/android/photos/BitmapRegionTileSource.java with 100% similarity]
src/com/android/photos/views/BlockingGLTextureView.java [moved from wallpaper_picker_src/com/android/photos/views/BlockingGLTextureView.java with 100% similarity]
src/com/android/photos/views/TiledImageRenderer.java [moved from wallpaper_picker_src/com/android/photos/views/TiledImageRenderer.java with 100% similarity]
src/com/android/photos/views/TiledImageView.java [moved from wallpaper_picker_src/com/android/photos/views/TiledImageView.java with 100% similarity]
wallpaper_picker_res/values-sw720dp/dimens.xml [deleted file]
wallpaper_picker_res/values-sw720dp/styles.xml [deleted file]
wallpaper_picker_res/values/colors.xml [deleted file]
wallpaper_picker_res/values/dimens.xml [deleted file]
wallpaper_picker_res/values/strings.xml [deleted file]
wallpaper_picker_res/values/styles.xml [deleted file]

index 6059a3f..3bd20a7 100644 (file)
@@ -26,12 +26,8 @@ LOCAL_MODULE_TAGS := optional
 LOCAL_STATIC_JAVA_LIBRARIES := android-support-v13
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src) \
-    $(call all-java-files-under, wallpaper_picker_src) \
     $(call all-renderscript-files-under, src) \
     $(call all-proto-files-under, protos)
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/wallpaper_picker_res $(LOCAL_PATH)/res
-
-LOCAL_AAPT_FLAGS := --auto-add-overlay
 
 LOCAL_PROTOC_OPTIMIZE_TYPE := nano
 LOCAL_PROTOC_FLAGS := --proto_path=$(LOCAL_PATH)/protos/
index b2c5266..c132395 100644 (file)
@@ -50,8 +50,6 @@ $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/Launcher2_interm
 $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/Launcher2_intermediates)
 $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/Launcher2_intermediates)
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/Launcher2.apk)
-$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/Launcher2_intermediates)
-$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/Launcher2.apk)
 
 # ************************************************
 # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
index 9ae155b..01227e1 100644 (file)
     <dimen name="toolbar_button_vertical_padding">8dip</dimen>
     <dimen name="toolbar_button_horizontal_padding">8dip</dimen>
 
+    <!-- dimensions for the wallpaper picker wallpaper thumbnail width -->
+    <dimen name="wallpaper_chooser_grid_width">196dp</dimen>
+    <dimen name="wallpaper_chooser_grid_height">140dp</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>
index e1f9ab4..9738a12 100644 (file)
     </style>
 
 <!-- Workspace -->
+    <style name="Theme" parent="android:Theme.Holo.Wallpaper.NoTitleBar">
+        <item name="android:windowActionModeOverlay">true</item>
+        <item name="android:windowTranslucentStatus">true</item>
+        <item name="android:windowTranslucentNavigation">true</item>
+    </style>
+
     <style name="TabIndicator.AppsCustomize">
         <item name="android:paddingStart">32dp</item>
         <item name="android:paddingEnd">32dp</item>
index ffee05f..c073903 100644 (file)
@@ -32,6 +32,7 @@
     <color name="workspace_icon_text_color">#FFF</color>
 
     <color name="apps_customize_icon_text_color">#FFF</color>
+    <color name="wallpaper_picker_translucent_gray">#66000000</color>
     <color name="folder_items_text_color">#FF333333</color>
     <color name="folder_items_glow_color">#FFCCCCCC</color>
     <color name="outline_color">#FFFFFFFF</color>
index 28b6a5b..c86fe31 100644 (file)
     <dimen name="dynamic_grid_overview_max_icon_zone_height">120dp</dimen>
     <dimen name="dynamic_grid_overview_bar_max_width">280dp</dimen>
 
+<!-- Wallpaper picker -->
+    <dimen name="wallpaperThumbnailWidth">106.5dp</dimen>
+    <dimen name="wallpaperThumbnailHeight">94.5dp</dimen>
+    <dimen name="wallpaperItemIconSize">32dp</dimen>
+
 <!-- Cling -->
     <dimen name="clingPunchThroughGraphicCenterRadius">94dp</dimen>
     <dimen name="folderClingMarginTop">20dp</dimen>
index 361be7b..30f4d8f 100644 (file)
     <string name="uid_name">Android Core Apps</string>
     <!-- Default folder name -->
     <string name="folder_name"></string>
+    <!-- Button label on Wallpaper picker screen; user selects this button to set a specific wallpaper -->
+    <string name="wallpaper_instructions">Set wallpaper</string>
+    <!-- Error message when an image is selected as a wallpaper,
+         but the wallpaper picker cannot load it -->
+    <string name="image_load_fail">Coudn\'t load image</string>
+    <!-- Error message when an image is selected as a wallpaper,
+         but the wallpaper cropper cannot load it. The user will
+         usually see this when using another app and trying to set
+         an image as the wallpaper -->
+    <string name="wallpaper_load_fail">Couldn\'t load image as wallpaper</string>
+    <!-- Shown when wallpapers are selected in Wallpaper picker -->
+    <!-- String indicating how many media item(s) is(are) selected
+            eg. 1 selected [CHAR LIMIT=30] -->
+    <plurals name="number_of_items_selected">
+        <item quantity="zero">%1$d selected</item>
+        <item quantity="one">%1$d selected</item>
+        <item quantity="other">%1$d selected</item>
+    </plurals>
+    <!-- Accessibility string used as a label for a particular wallpaper in the Wallpaper Picker list.
+         e.g. "Wallpaper 3 of 10" -->
+    <string name="wallpaper_accessibility_name">Wallpaper %1$d of %2$d</string>
+    <!-- Accessibility string used to announce that a wallpaper has been selected. -->
+    <string name="announce_selection">Selected <xliff:g id="label" example="Wallpaper 3 of 10">%1$s</xliff:g></string>
+
+    <!-- Label on button to delete wallpaper(s) -->
+    <string name="wallpaper_delete">Delete</string>
+    <!-- Label on button in Wallpaper Picker to pick an image -->
+    <string name="pick_image">Pick image</string>
+    <!-- Option in "Select wallpaper from" dialog box -->
+    <string name="pick_wallpaper">Wallpapers</string>
+    <!-- Title of activity for cropping wallpapers -->
+    <string name="crop_wallpaper">Crop wallpaper</string>
     <!-- Displayed when user selects a shortcut for an app that was uninstalled [CHAR_LIMIT=none]-->
     <string name="activity_not_found">App isn\'t installed.</string>
     <!--  Labels for the tabs in the customize drawer -->
index 4aad5eb..8226915 100644 (file)
 -->
 
 <resources>
+    <style name="Theme.WallpaperCropper" parent="@android:style/Theme.Holo">
+        <item name="android:actionBarStyle">@style/WallpaperCropperActionBar</item>
+        <item name="android:windowFullscreen">true</item>
+        <item name="android:windowActionBarOverlay">true</item>
+        <item name="android:windowTranslucentNavigation">true</item>
+    </style>
+
+    <style name="WallpaperCropperActionBar" parent="android:style/Widget.Holo.ActionBar">
+        <item name="android:displayOptions">showCustom</item>
+        <item name="android:background">#88000000</item>
+    </style>
+
+    <style name="Theme" parent="@android:style/Theme.Holo.Wallpaper.NoTitleBar">
+        <item name="android:windowTranslucentStatus">true</item>
+        <item name="android:windowTranslucentNavigation">true</item>
+    </style>
+
     <style name="ClingButton">
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">wrap_content</item>
diff --git a/wallpaper_picker_res/values-sw720dp/dimens.xml b/wallpaper_picker_res/values-sw720dp/dimens.xml
deleted file mode 100644 (file)
index 9ae155b..0000000
+++ /dev/null
@@ -1,28 +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>
-    <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>
-    <dimen name="dragViewOffsetY">0dp</dimen>
-</resources>
diff --git a/wallpaper_picker_res/values-sw720dp/styles.xml b/wallpaper_picker_res/values-sw720dp/styles.xml
deleted file mode 100644 (file)
index 9107851..0000000
+++ /dev/null
@@ -1,26 +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>
-    <style name="Theme" parent="android:Theme.Holo.Wallpaper.NoTitleBar">
-        <item name="android:windowActionModeOverlay">true</item>
-        <item name="android:windowTranslucentStatus">true</item>
-        <item name="android:windowTranslucentNavigation">true</item>
-    </style>
-</resources>
diff --git a/wallpaper_picker_res/values/colors.xml b/wallpaper_picker_res/values/colors.xml
deleted file mode 100644 (file)
index adae7cf..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/* //device/apps/common/assets/res/any/colors.xml
-**
-** Copyright 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>
-    <color name="wallpaper_picker_translucent_gray">#66000000</color>
-</resources>
diff --git a/wallpaper_picker_res/values/dimens.xml b/wallpaper_picker_res/values/dimens.xml
deleted file mode 100644 (file)
index 0447c6d..0000000
+++ /dev/null
@@ -1,22 +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>
-<!-- Wallpaper picker -->
-    <dimen name="wallpaperThumbnailWidth">106.5dp</dimen>
-    <dimen name="wallpaperThumbnailHeight">94.5dp</dimen>
-    <dimen name="wallpaperItemIconSize">32dp</dimen>
-</resources>
diff --git a/wallpaper_picker_res/values/strings.xml b/wallpaper_picker_res/values/strings.xml
deleted file mode 100644 (file)
index 1ee3513..0000000
+++ /dev/null
@@ -1,53 +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 xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- Button label on Wallpaper picker screen; user selects this button to set a specific wallpaper -->
-    <string name="wallpaper_instructions">Set wallpaper</string>
-    <!-- Error message when an image is selected as a wallpaper,
-         but the wallpaper picker cannot load it -->
-    <string name="image_load_fail">Coudn\'t load image</string>
-    <!-- Error message when an image is selected as a wallpaper,
-         but the wallpaper cropper cannot load it. The user will
-         usually see this when using another app and trying to set
-         an image as the wallpaper -->
-    <string name="wallpaper_load_fail">Couldn\'t load image as wallpaper</string>
-    <!-- Shown when wallpapers are selected in Wallpaper picker -->
-    <!-- String indicating how many media item(s) is(are) selected
-            eg. 1 selected [CHAR LIMIT=30] -->
-    <plurals name="number_of_items_selected">
-        <item quantity="zero">%1$d selected</item>
-        <item quantity="one">%1$d selected</item>
-        <item quantity="other">%1$d selected</item>
-    </plurals>
-    <!-- Accessibility string used as a label for a particular wallpaper in the Wallpaper Picker list.
-         e.g. "Wallpaper 3 of 10" -->
-    <string name="wallpaper_accessibility_name">Wallpaper %1$d of %2$d</string>
-    <!-- Accessibility string used to announce that a wallpaper has been selected. -->
-    <string name="announce_selection">Selected <xliff:g id="label" example="Wallpaper 3 of 10">%1$s</xliff:g></string>
-
-    <!-- Label on button to delete wallpaper(s) -->
-    <string name="wallpaper_delete">Delete</string>
-    <!-- Label on button in Wallpaper Picker to pick an image -->
-    <string name="pick_image">Pick image</string>
-    <!-- Option in "Select wallpaper from" dialog box -->
-    <string name="pick_wallpaper">Wallpapers</string>
-    <!-- Title of activity for cropping wallpapers -->
-    <string name="crop_wallpaper">Crop wallpaper</string>
-</resources>
diff --git a/wallpaper_picker_res/values/styles.xml b/wallpaper_picker_res/values/styles.xml
deleted file mode 100644 (file)
index 0e48dda..0000000
+++ /dev/null
@@ -1,37 +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>
-    <style name="Theme.WallpaperCropper" parent="@android:style/Theme.Holo">
-        <item name="android:actionBarStyle">@style/WallpaperCropperActionBar</item>
-        <item name="android:windowFullscreen">true</item>
-        <item name="android:windowActionBarOverlay">true</item>
-        <item name="android:windowTranslucentNavigation">true</item>
-    </style>
-
-    <style name="WallpaperCropperActionBar" parent="android:style/Widget.Holo.ActionBar">
-        <item name="android:displayOptions">showCustom</item>
-        <item name="android:background">#88000000</item>
-    </style>
-
-    <style name="Theme" parent="@android:style/Theme.Holo.Wallpaper.NoTitleBar">
-        <item name="android:windowTranslucentStatus">true</item>
-        <item name="android:windowTranslucentNavigation">true</item>
-    </style>
-</resources>