diff options
-rw-r--r-- | Android.mk | 4 | ||||
-rw-r--r-- | CleanSpec.mk | 2 | ||||
-rwxr-xr-x | res/drawable-hdpi/ic_actionbar_accept.png (renamed from wallpaper_picker_res/drawable-hdpi/ic_actionbar_accept.png) | bin | 1335 -> 1335 bytes | |||
-rw-r--r-- | res/drawable-hdpi/ic_images.png (renamed from wallpaper_picker_res/drawable-hdpi/ic_images.png) | bin | 1935 -> 1935 bytes | |||
-rw-r--r-- | res/drawable-hdpi/tile_picker_focused.9.png (renamed from wallpaper_picker_res/drawable-hdpi/tile_picker_focused.9.png) | bin | 168 -> 168 bytes | |||
-rw-r--r-- | res/drawable-hdpi/tile_picker_pressed.9.png (renamed from wallpaper_picker_res/drawable-hdpi/tile_picker_pressed.9.png) | bin | 144 -> 144 bytes | |||
-rw-r--r-- | res/drawable-hdpi/tile_picker_selected.9.png (renamed from wallpaper_picker_res/drawable-hdpi/tile_picker_selected.9.png) | bin | 165 -> 165 bytes | |||
-rw-r--r-- | res/drawable-hdpi/tile_shadow_bottom.9.png (renamed from wallpaper_picker_res/drawable-hdpi/tile_shadow_bottom.9.png) | bin | 159 -> 159 bytes | |||
-rw-r--r-- | res/drawable-hdpi/tile_shadow_top.9.png (renamed from wallpaper_picker_res/drawable-hdpi/tile_shadow_top.9.png) | bin | 148 -> 148 bytes | |||
-rwxr-xr-x | res/drawable-mdpi/ic_actionbar_accept.png (renamed from wallpaper_picker_res/drawable-mdpi/ic_actionbar_accept.png) | bin | 1191 -> 1191 bytes | |||
-rw-r--r-- | res/drawable-mdpi/ic_images.png (renamed from wallpaper_picker_res/drawable-mdpi/ic_images.png) | bin | 1332 -> 1332 bytes | |||
-rw-r--r-- | res/drawable-mdpi/tile_picker_focused.9.png (renamed from wallpaper_picker_res/drawable-mdpi/tile_picker_focused.9.png) | bin | 165 -> 165 bytes | |||
-rw-r--r-- | res/drawable-mdpi/tile_picker_pressed.9.png (renamed from wallpaper_picker_res/drawable-mdpi/tile_picker_pressed.9.png) | bin | 142 -> 142 bytes | |||
-rw-r--r-- | res/drawable-mdpi/tile_picker_selected.9.png (renamed from wallpaper_picker_res/drawable-mdpi/tile_picker_selected.9.png) | bin | 159 -> 159 bytes | |||
-rw-r--r-- | res/drawable-mdpi/tile_shadow_bottom.9.png (renamed from wallpaper_picker_res/drawable-mdpi/tile_shadow_bottom.9.png) | bin | 140 -> 140 bytes | |||
-rw-r--r-- | res/drawable-mdpi/tile_shadow_top.9.png (renamed from wallpaper_picker_res/drawable-mdpi/tile_shadow_top.9.png) | bin | 138 -> 138 bytes | |||
-rwxr-xr-x | res/drawable-xhdpi/ic_actionbar_accept.png (renamed from wallpaper_picker_res/drawable-xhdpi/ic_actionbar_accept.png) | bin | 1599 -> 1599 bytes | |||
-rw-r--r-- | res/drawable-xhdpi/ic_images.png (renamed from wallpaper_picker_res/drawable-xhdpi/ic_images.png) | bin | 2480 -> 2480 bytes | |||
-rw-r--r-- | res/drawable-xhdpi/tile_picker_focused.9.png (renamed from wallpaper_picker_res/drawable-xhdpi/tile_picker_focused.9.png) | bin | 174 -> 174 bytes | |||
-rw-r--r-- | res/drawable-xhdpi/tile_picker_pressed.9.png (renamed from wallpaper_picker_res/drawable-xhdpi/tile_picker_pressed.9.png) | bin | 147 -> 147 bytes | |||
-rw-r--r-- | res/drawable-xhdpi/tile_picker_selected.9.png (renamed from wallpaper_picker_res/drawable-xhdpi/tile_picker_selected.9.png) | bin | 167 -> 167 bytes | |||
-rw-r--r-- | res/drawable-xhdpi/tile_shadow_bottom.9.png (renamed from wallpaper_picker_res/drawable-xhdpi/tile_shadow_bottom.9.png) | bin | 164 -> 164 bytes | |||
-rw-r--r-- | res/drawable-xhdpi/tile_shadow_top.9.png (renamed from wallpaper_picker_res/drawable-xhdpi/tile_shadow_top.9.png) | bin | 151 -> 151 bytes | |||
-rw-r--r-- | res/drawable-xxhdpi/ic_images.png (renamed from wallpaper_picker_res/drawable-xxhdpi/ic_images.png) | bin | 2097 -> 2097 bytes | |||
-rw-r--r-- | res/drawable-xxhdpi/tile_picker_focused.9.png (renamed from wallpaper_picker_res/drawable-xxhdpi/tile_picker_focused.9.png) | bin | 189 -> 189 bytes | |||
-rw-r--r-- | res/drawable-xxhdpi/tile_picker_pressed.9.png (renamed from wallpaper_picker_res/drawable-xxhdpi/tile_picker_pressed.9.png) | bin | 154 -> 154 bytes | |||
-rw-r--r-- | res/drawable-xxhdpi/tile_picker_selected.9.png (renamed from wallpaper_picker_res/drawable-xxhdpi/tile_picker_selected.9.png) | bin | 175 -> 175 bytes | |||
-rw-r--r-- | res/drawable-xxhdpi/tile_shadow_bottom.9.png (renamed from wallpaper_picker_res/drawable-xxhdpi/tile_shadow_bottom.9.png) | bin | 185 -> 185 bytes | |||
-rw-r--r-- | res/drawable-xxhdpi/tile_shadow_top.9.png (renamed from wallpaper_picker_res/drawable-xxhdpi/tile_shadow_top.9.png) | bin | 169 -> 169 bytes | |||
-rw-r--r-- | res/drawable/wallpaper_tile_fg.xml (renamed from wallpaper_picker_res/drawable/wallpaper_tile_fg.xml) | 0 | ||||
-rw-r--r-- | res/layout/actionbar_set_wallpaper.xml (renamed from wallpaper_picker_res/layout/actionbar_set_wallpaper.xml) | 0 | ||||
-rw-r--r-- | res/layout/wallpaper_cropper.xml (renamed from wallpaper_picker_res/layout/wallpaper_cropper.xml) | 0 | ||||
-rw-r--r-- | res/layout/wallpaper_picker.xml (renamed from wallpaper_picker_res/layout/wallpaper_picker.xml) | 0 | ||||
-rw-r--r-- | res/layout/wallpaper_picker_image_picker_item.xml (renamed from wallpaper_picker_res/layout/wallpaper_picker_image_picker_item.xml) | 0 | ||||
-rw-r--r-- | res/layout/wallpaper_picker_item.xml (renamed from wallpaper_picker_res/layout/wallpaper_picker_item.xml) | 0 | ||||
-rw-r--r-- | res/layout/wallpaper_picker_live_wallpaper_item.xml (renamed from wallpaper_picker_res/layout/wallpaper_picker_live_wallpaper_item.xml) | 0 | ||||
-rw-r--r-- | res/layout/wallpaper_picker_third_party_item.xml (renamed from wallpaper_picker_res/layout/wallpaper_picker_third_party_item.xml) | 0 | ||||
-rw-r--r-- | res/menu/cab_delete_wallpapers.xml (renamed from wallpaper_picker_res/menu/cab_delete_wallpapers.xml) | 0 | ||||
-rw-r--r-- | res/mipmap-hdpi/ic_launcher_wallpaper.png (renamed from wallpaper_picker_res/mipmap-hdpi/ic_launcher_wallpaper.png) | bin | 4418 -> 4418 bytes | |||
-rw-r--r-- | res/mipmap-mdpi/ic_launcher_wallpaper.png (renamed from wallpaper_picker_res/mipmap-mdpi/ic_launcher_wallpaper.png) | bin | 2871 -> 2871 bytes | |||
-rw-r--r-- | res/mipmap-xhdpi/ic_launcher_wallpaper.png (renamed from wallpaper_picker_res/mipmap-xhdpi/ic_launcher_wallpaper.png) | bin | 6061 -> 6061 bytes | |||
-rw-r--r-- | res/mipmap-xxhdpi/ic_launcher_wallpaper.png (renamed from wallpaper_picker_res/mipmap-xxhdpi/ic_launcher_wallpaper.png) | bin | 7596 -> 7596 bytes | |||
-rw-r--r-- | res/values-nodpi/wallpapers.xml (renamed from wallpaper_picker_res/values-nodpi/wallpapers.xml) | 0 | ||||
-rw-r--r-- | res/values-sw720dp/dimens.xml | 4 | ||||
-rw-r--r-- | res/values-sw720dp/styles.xml | 6 | ||||
-rw-r--r-- | res/values/colors.xml | 1 | ||||
-rw-r--r-- | res/values/dimens.xml | 5 | ||||
-rw-r--r-- | res/values/strings.xml | 32 | ||||
-rw-r--r-- | res/values/styles.xml | 17 | ||||
-rw-r--r-- | src/android/util/Pools.java (renamed from wallpaper_picker_src/android/util/Pools.java) | 0 | ||||
-rw-r--r-- | src/com/android/gallery3d/common/BitmapUtils.java (renamed from wallpaper_picker_src/com/android/gallery3d/common/BitmapUtils.java) | 0 | ||||
-rw-r--r-- | src/com/android/gallery3d/common/Utils.java (renamed from wallpaper_picker_src/com/android/gallery3d/common/Utils.java) | 0 | ||||
-rw-r--r-- | src/com/android/gallery3d/exif/ByteBufferInputStream.java (renamed from wallpaper_picker_src/com/android/gallery3d/exif/ByteBufferInputStream.java) | 0 | ||||
-rw-r--r-- | src/com/android/gallery3d/exif/CountedDataInputStream.java (renamed from wallpaper_picker_src/com/android/gallery3d/exif/CountedDataInputStream.java) | 0 | ||||
-rw-r--r-- | src/com/android/gallery3d/exif/ExifData.java (renamed from wallpaper_picker_src/com/android/gallery3d/exif/ExifData.java) | 0 | ||||
-rw-r--r-- | src/com/android/gallery3d/exif/ExifInterface.java (renamed from wallpaper_picker_src/com/android/gallery3d/exif/ExifInterface.java) | 0 | ||||
-rw-r--r-- | src/com/android/gallery3d/exif/ExifInvalidFormatException.java (renamed from wallpaper_picker_src/com/android/gallery3d/exif/ExifInvalidFormatException.java) | 0 | ||||
-rw-r--r-- | src/com/android/gallery3d/exif/ExifModifier.java (renamed from wallpaper_picker_src/com/android/gallery3d/exif/ExifModifier.java) | 0 | ||||
-rw-r--r-- | src/com/android/gallery3d/exif/ExifOutputStream.java (renamed from wallpaper_picker_src/com/android/gallery3d/exif/ExifOutputStream.java) | 0 | ||||
-rw-r--r-- | src/com/android/gallery3d/exif/ExifParser.java (renamed from wallpaper_picker_src/com/android/gallery3d/exif/ExifParser.java) | 0 | ||||
-rw-r--r-- | src/com/android/gallery3d/exif/ExifReader.java (renamed from wallpaper_picker_src/com/android/gallery3d/exif/ExifReader.java) | 0 | ||||
-rw-r--r-- | src/com/android/gallery3d/exif/ExifTag.java (renamed from wallpaper_picker_src/com/android/gallery3d/exif/ExifTag.java) | 0 | ||||
-rw-r--r-- | src/com/android/gallery3d/exif/IfdData.java (renamed from wallpaper_picker_src/com/android/gallery3d/exif/IfdData.java) | 0 | ||||
-rw-r--r-- | src/com/android/gallery3d/exif/IfdId.java (renamed from wallpaper_picker_src/com/android/gallery3d/exif/IfdId.java) | 0 | ||||
-rw-r--r-- | src/com/android/gallery3d/exif/JpegHeader.java (renamed from wallpaper_picker_src/com/android/gallery3d/exif/JpegHeader.java) | 0 | ||||
-rw-r--r-- | src/com/android/gallery3d/exif/OrderedDataOutputStream.java (renamed from wallpaper_picker_src/com/android/gallery3d/exif/OrderedDataOutputStream.java) | 0 | ||||
-rw-r--r-- | src/com/android/gallery3d/exif/Rational.java (renamed from wallpaper_picker_src/com/android/gallery3d/exif/Rational.java) | 0 | ||||
-rw-r--r-- | src/com/android/gallery3d/glrenderer/BasicTexture.java (renamed from wallpaper_picker_src/com/android/gallery3d/glrenderer/BasicTexture.java) | 0 | ||||
-rw-r--r-- | src/com/android/gallery3d/glrenderer/BitmapTexture.java (renamed from wallpaper_picker_src/com/android/gallery3d/glrenderer/BitmapTexture.java) | 0 | ||||
-rw-r--r-- | src/com/android/gallery3d/glrenderer/GLCanvas.java (renamed from wallpaper_picker_src/com/android/gallery3d/glrenderer/GLCanvas.java) | 0 | ||||
-rw-r--r-- | src/com/android/gallery3d/glrenderer/GLES20Canvas.java (renamed from wallpaper_picker_src/com/android/gallery3d/glrenderer/GLES20Canvas.java) | 0 | ||||
-rw-r--r-- | src/com/android/gallery3d/glrenderer/GLES20IdImpl.java (renamed from wallpaper_picker_src/com/android/gallery3d/glrenderer/GLES20IdImpl.java) | 0 | ||||
-rw-r--r-- | src/com/android/gallery3d/glrenderer/GLId.java (renamed from wallpaper_picker_src/com/android/gallery3d/glrenderer/GLId.java) | 0 | ||||
-rw-r--r-- | src/com/android/gallery3d/glrenderer/GLPaint.java (renamed from wallpaper_picker_src/com/android/gallery3d/glrenderer/GLPaint.java) | 0 | ||||
-rw-r--r-- | src/com/android/gallery3d/glrenderer/RawTexture.java (renamed from wallpaper_picker_src/com/android/gallery3d/glrenderer/RawTexture.java) | 0 | ||||
-rw-r--r-- | src/com/android/gallery3d/glrenderer/Texture.java (renamed from wallpaper_picker_src/com/android/gallery3d/glrenderer/Texture.java) | 0 | ||||
-rw-r--r-- | src/com/android/gallery3d/glrenderer/UploadedTexture.java (renamed from wallpaper_picker_src/com/android/gallery3d/glrenderer/UploadedTexture.java) | 0 | ||||
-rw-r--r-- | src/com/android/gallery3d/util/IntArray.java (renamed from wallpaper_picker_src/com/android/gallery3d/util/IntArray.java) | 0 | ||||
-rw-r--r-- | src/com/android/launcher3/CropView.java (renamed from wallpaper_picker_src/com/android/launcher3/CropView.java) | 0 | ||||
-rw-r--r-- | src/com/android/launcher3/WallpaperCropActivity.java (renamed from wallpaper_picker_src/com/android/launcher3/WallpaperCropActivity.java) | 0 | ||||
-rw-r--r-- | src/com/android/launcher3/WallpaperPickerActivity.java (renamed from wallpaper_picker_src/com/android/launcher3/WallpaperPickerActivity.java) | 0 | ||||
-rw-r--r-- | src/com/android/photos/BitmapRegionTileSource.java (renamed from wallpaper_picker_src/com/android/photos/BitmapRegionTileSource.java) | 0 | ||||
-rw-r--r-- | src/com/android/photos/views/BlockingGLTextureView.java (renamed from wallpaper_picker_src/com/android/photos/views/BlockingGLTextureView.java) | 0 | ||||
-rw-r--r-- | src/com/android/photos/views/TiledImageRenderer.java (renamed from wallpaper_picker_src/com/android/photos/views/TiledImageRenderer.java) | 0 | ||||
-rw-r--r-- | src/com/android/photos/views/TiledImageView.java (renamed from wallpaper_picker_src/com/android/photos/views/TiledImageView.java) | 0 | ||||
-rw-r--r-- | wallpaper_picker_res/values-sw720dp/dimens.xml | 28 | ||||
-rw-r--r-- | wallpaper_picker_res/values-sw720dp/styles.xml | 26 | ||||
-rw-r--r-- | wallpaper_picker_res/values/colors.xml | 22 | ||||
-rw-r--r-- | wallpaper_picker_res/values/dimens.xml | 22 | ||||
-rw-r--r-- | wallpaper_picker_res/values/strings.xml | 53 | ||||
-rw-r--r-- | wallpaper_picker_res/values/styles.xml | 37 |
91 files changed, 65 insertions, 194 deletions
diff --git a/Android.mk b/Android.mk index 6059a3f98..3bd20a7cd 100644 --- a/Android.mk +++ b/Android.mk @@ -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/ diff --git a/CleanSpec.mk b/CleanSpec.mk index b2c5266fa..c1323951b 100644 --- a/CleanSpec.mk +++ b/CleanSpec.mk @@ -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 diff --git a/wallpaper_picker_res/drawable-hdpi/ic_actionbar_accept.png b/res/drawable-hdpi/ic_actionbar_accept.png Binary files differindex 53cf6877e..53cf6877e 100755 --- a/wallpaper_picker_res/drawable-hdpi/ic_actionbar_accept.png +++ b/res/drawable-hdpi/ic_actionbar_accept.png diff --git a/wallpaper_picker_res/drawable-hdpi/ic_images.png b/res/drawable-hdpi/ic_images.png Binary files differindex 0003c6c65..0003c6c65 100644 --- a/wallpaper_picker_res/drawable-hdpi/ic_images.png +++ b/res/drawable-hdpi/ic_images.png diff --git a/wallpaper_picker_res/drawable-hdpi/tile_picker_focused.9.png b/res/drawable-hdpi/tile_picker_focused.9.png Binary files differindex c72d6a2c6..c72d6a2c6 100644 --- a/wallpaper_picker_res/drawable-hdpi/tile_picker_focused.9.png +++ b/res/drawable-hdpi/tile_picker_focused.9.png diff --git a/wallpaper_picker_res/drawable-hdpi/tile_picker_pressed.9.png b/res/drawable-hdpi/tile_picker_pressed.9.png Binary files differindex 44c65ac3c..44c65ac3c 100644 --- a/wallpaper_picker_res/drawable-hdpi/tile_picker_pressed.9.png +++ b/res/drawable-hdpi/tile_picker_pressed.9.png diff --git a/wallpaper_picker_res/drawable-hdpi/tile_picker_selected.9.png b/res/drawable-hdpi/tile_picker_selected.9.png Binary files differindex 461bacbcb..461bacbcb 100644 --- a/wallpaper_picker_res/drawable-hdpi/tile_picker_selected.9.png +++ b/res/drawable-hdpi/tile_picker_selected.9.png diff --git a/wallpaper_picker_res/drawable-hdpi/tile_shadow_bottom.9.png b/res/drawable-hdpi/tile_shadow_bottom.9.png Binary files differindex e80558bad..e80558bad 100644 --- a/wallpaper_picker_res/drawable-hdpi/tile_shadow_bottom.9.png +++ b/res/drawable-hdpi/tile_shadow_bottom.9.png diff --git a/wallpaper_picker_res/drawable-hdpi/tile_shadow_top.9.png b/res/drawable-hdpi/tile_shadow_top.9.png Binary files differindex 7e93865e7..7e93865e7 100644 --- a/wallpaper_picker_res/drawable-hdpi/tile_shadow_top.9.png +++ b/res/drawable-hdpi/tile_shadow_top.9.png diff --git a/wallpaper_picker_res/drawable-mdpi/ic_actionbar_accept.png b/res/drawable-mdpi/ic_actionbar_accept.png Binary files differindex 35cda8e11..35cda8e11 100755 --- a/wallpaper_picker_res/drawable-mdpi/ic_actionbar_accept.png +++ b/res/drawable-mdpi/ic_actionbar_accept.png diff --git a/wallpaper_picker_res/drawable-mdpi/ic_images.png b/res/drawable-mdpi/ic_images.png Binary files differindex aabc1237a..aabc1237a 100644 --- a/wallpaper_picker_res/drawable-mdpi/ic_images.png +++ b/res/drawable-mdpi/ic_images.png diff --git a/wallpaper_picker_res/drawable-mdpi/tile_picker_focused.9.png b/res/drawable-mdpi/tile_picker_focused.9.png Binary files differindex 13b325b87..13b325b87 100644 --- a/wallpaper_picker_res/drawable-mdpi/tile_picker_focused.9.png +++ b/res/drawable-mdpi/tile_picker_focused.9.png diff --git a/wallpaper_picker_res/drawable-mdpi/tile_picker_pressed.9.png b/res/drawable-mdpi/tile_picker_pressed.9.png Binary files differindex 4e8196d36..4e8196d36 100644 --- a/wallpaper_picker_res/drawable-mdpi/tile_picker_pressed.9.png +++ b/res/drawable-mdpi/tile_picker_pressed.9.png diff --git a/wallpaper_picker_res/drawable-mdpi/tile_picker_selected.9.png b/res/drawable-mdpi/tile_picker_selected.9.png Binary files differindex eee69ec6d..eee69ec6d 100644 --- a/wallpaper_picker_res/drawable-mdpi/tile_picker_selected.9.png +++ b/res/drawable-mdpi/tile_picker_selected.9.png diff --git a/wallpaper_picker_res/drawable-mdpi/tile_shadow_bottom.9.png b/res/drawable-mdpi/tile_shadow_bottom.9.png Binary files differindex d95787bac..d95787bac 100644 --- a/wallpaper_picker_res/drawable-mdpi/tile_shadow_bottom.9.png +++ b/res/drawable-mdpi/tile_shadow_bottom.9.png diff --git a/wallpaper_picker_res/drawable-mdpi/tile_shadow_top.9.png b/res/drawable-mdpi/tile_shadow_top.9.png Binary files differindex 8da913cc4..8da913cc4 100644 --- a/wallpaper_picker_res/drawable-mdpi/tile_shadow_top.9.png +++ b/res/drawable-mdpi/tile_shadow_top.9.png diff --git a/wallpaper_picker_res/drawable-xhdpi/ic_actionbar_accept.png b/res/drawable-xhdpi/ic_actionbar_accept.png Binary files differindex b52dc3701..b52dc3701 100755 --- a/wallpaper_picker_res/drawable-xhdpi/ic_actionbar_accept.png +++ b/res/drawable-xhdpi/ic_actionbar_accept.png diff --git a/wallpaper_picker_res/drawable-xhdpi/ic_images.png b/res/drawable-xhdpi/ic_images.png Binary files differindex 3f21faf8f..3f21faf8f 100644 --- a/wallpaper_picker_res/drawable-xhdpi/ic_images.png +++ b/res/drawable-xhdpi/ic_images.png diff --git a/wallpaper_picker_res/drawable-xhdpi/tile_picker_focused.9.png b/res/drawable-xhdpi/tile_picker_focused.9.png Binary files differindex 279e85963..279e85963 100644 --- a/wallpaper_picker_res/drawable-xhdpi/tile_picker_focused.9.png +++ b/res/drawable-xhdpi/tile_picker_focused.9.png diff --git a/wallpaper_picker_res/drawable-xhdpi/tile_picker_pressed.9.png b/res/drawable-xhdpi/tile_picker_pressed.9.png Binary files differindex abe0e0080..abe0e0080 100644 --- a/wallpaper_picker_res/drawable-xhdpi/tile_picker_pressed.9.png +++ b/res/drawable-xhdpi/tile_picker_pressed.9.png diff --git a/wallpaper_picker_res/drawable-xhdpi/tile_picker_selected.9.png b/res/drawable-xhdpi/tile_picker_selected.9.png Binary files differindex b047591ac..b047591ac 100644 --- a/wallpaper_picker_res/drawable-xhdpi/tile_picker_selected.9.png +++ b/res/drawable-xhdpi/tile_picker_selected.9.png diff --git a/wallpaper_picker_res/drawable-xhdpi/tile_shadow_bottom.9.png b/res/drawable-xhdpi/tile_shadow_bottom.9.png Binary files differindex 81571f3b7..81571f3b7 100644 --- a/wallpaper_picker_res/drawable-xhdpi/tile_shadow_bottom.9.png +++ b/res/drawable-xhdpi/tile_shadow_bottom.9.png diff --git a/wallpaper_picker_res/drawable-xhdpi/tile_shadow_top.9.png b/res/drawable-xhdpi/tile_shadow_top.9.png Binary files differindex 8503a59fe..8503a59fe 100644 --- a/wallpaper_picker_res/drawable-xhdpi/tile_shadow_top.9.png +++ b/res/drawable-xhdpi/tile_shadow_top.9.png diff --git a/wallpaper_picker_res/drawable-xxhdpi/ic_images.png b/res/drawable-xxhdpi/ic_images.png Binary files differindex d00db9a00..d00db9a00 100644 --- a/wallpaper_picker_res/drawable-xxhdpi/ic_images.png +++ b/res/drawable-xxhdpi/ic_images.png diff --git a/wallpaper_picker_res/drawable-xxhdpi/tile_picker_focused.9.png b/res/drawable-xxhdpi/tile_picker_focused.9.png Binary files differindex 1004c14b8..1004c14b8 100644 --- a/wallpaper_picker_res/drawable-xxhdpi/tile_picker_focused.9.png +++ b/res/drawable-xxhdpi/tile_picker_focused.9.png diff --git a/wallpaper_picker_res/drawable-xxhdpi/tile_picker_pressed.9.png b/res/drawable-xxhdpi/tile_picker_pressed.9.png Binary files differindex 9658444a1..9658444a1 100644 --- a/wallpaper_picker_res/drawable-xxhdpi/tile_picker_pressed.9.png +++ b/res/drawable-xxhdpi/tile_picker_pressed.9.png diff --git a/wallpaper_picker_res/drawable-xxhdpi/tile_picker_selected.9.png b/res/drawable-xxhdpi/tile_picker_selected.9.png Binary files differindex a3cd30369..a3cd30369 100644 --- a/wallpaper_picker_res/drawable-xxhdpi/tile_picker_selected.9.png +++ b/res/drawable-xxhdpi/tile_picker_selected.9.png diff --git a/wallpaper_picker_res/drawable-xxhdpi/tile_shadow_bottom.9.png b/res/drawable-xxhdpi/tile_shadow_bottom.9.png Binary files differindex 55250f041..55250f041 100644 --- a/wallpaper_picker_res/drawable-xxhdpi/tile_shadow_bottom.9.png +++ b/res/drawable-xxhdpi/tile_shadow_bottom.9.png diff --git a/wallpaper_picker_res/drawable-xxhdpi/tile_shadow_top.9.png b/res/drawable-xxhdpi/tile_shadow_top.9.png Binary files differindex 3f2263364..3f2263364 100644 --- a/wallpaper_picker_res/drawable-xxhdpi/tile_shadow_top.9.png +++ b/res/drawable-xxhdpi/tile_shadow_top.9.png diff --git a/wallpaper_picker_res/drawable/wallpaper_tile_fg.xml b/res/drawable/wallpaper_tile_fg.xml index c299f32c6..c299f32c6 100644 --- a/wallpaper_picker_res/drawable/wallpaper_tile_fg.xml +++ b/res/drawable/wallpaper_tile_fg.xml diff --git a/wallpaper_picker_res/layout/actionbar_set_wallpaper.xml b/res/layout/actionbar_set_wallpaper.xml index 1622742a5..1622742a5 100644 --- a/wallpaper_picker_res/layout/actionbar_set_wallpaper.xml +++ b/res/layout/actionbar_set_wallpaper.xml diff --git a/wallpaper_picker_res/layout/wallpaper_cropper.xml b/res/layout/wallpaper_cropper.xml index abb860898..abb860898 100644 --- a/wallpaper_picker_res/layout/wallpaper_cropper.xml +++ b/res/layout/wallpaper_cropper.xml diff --git a/wallpaper_picker_res/layout/wallpaper_picker.xml b/res/layout/wallpaper_picker.xml index c36493d2f..c36493d2f 100644 --- a/wallpaper_picker_res/layout/wallpaper_picker.xml +++ b/res/layout/wallpaper_picker.xml diff --git a/wallpaper_picker_res/layout/wallpaper_picker_image_picker_item.xml b/res/layout/wallpaper_picker_image_picker_item.xml index ae3c43d8e..ae3c43d8e 100644 --- a/wallpaper_picker_res/layout/wallpaper_picker_image_picker_item.xml +++ b/res/layout/wallpaper_picker_image_picker_item.xml diff --git a/wallpaper_picker_res/layout/wallpaper_picker_item.xml b/res/layout/wallpaper_picker_item.xml index 0ac8f97fb..0ac8f97fb 100644 --- a/wallpaper_picker_res/layout/wallpaper_picker_item.xml +++ b/res/layout/wallpaper_picker_item.xml diff --git a/wallpaper_picker_res/layout/wallpaper_picker_live_wallpaper_item.xml b/res/layout/wallpaper_picker_live_wallpaper_item.xml index 29fdb1b82..29fdb1b82 100644 --- a/wallpaper_picker_res/layout/wallpaper_picker_live_wallpaper_item.xml +++ b/res/layout/wallpaper_picker_live_wallpaper_item.xml diff --git a/wallpaper_picker_res/layout/wallpaper_picker_third_party_item.xml b/res/layout/wallpaper_picker_third_party_item.xml index 68661bc00..68661bc00 100644 --- a/wallpaper_picker_res/layout/wallpaper_picker_third_party_item.xml +++ b/res/layout/wallpaper_picker_third_party_item.xml diff --git a/wallpaper_picker_res/menu/cab_delete_wallpapers.xml b/res/menu/cab_delete_wallpapers.xml index 38ac5c4d6..38ac5c4d6 100644 --- a/wallpaper_picker_res/menu/cab_delete_wallpapers.xml +++ b/res/menu/cab_delete_wallpapers.xml diff --git a/wallpaper_picker_res/mipmap-hdpi/ic_launcher_wallpaper.png b/res/mipmap-hdpi/ic_launcher_wallpaper.png Binary files differindex affee851d..affee851d 100644 --- a/wallpaper_picker_res/mipmap-hdpi/ic_launcher_wallpaper.png +++ b/res/mipmap-hdpi/ic_launcher_wallpaper.png diff --git a/wallpaper_picker_res/mipmap-mdpi/ic_launcher_wallpaper.png b/res/mipmap-mdpi/ic_launcher_wallpaper.png Binary files differindex cb4443bdb..cb4443bdb 100644 --- a/wallpaper_picker_res/mipmap-mdpi/ic_launcher_wallpaper.png +++ b/res/mipmap-mdpi/ic_launcher_wallpaper.png diff --git a/wallpaper_picker_res/mipmap-xhdpi/ic_launcher_wallpaper.png b/res/mipmap-xhdpi/ic_launcher_wallpaper.png Binary files differindex 60f8dceec..60f8dceec 100644 --- a/wallpaper_picker_res/mipmap-xhdpi/ic_launcher_wallpaper.png +++ b/res/mipmap-xhdpi/ic_launcher_wallpaper.png diff --git a/wallpaper_picker_res/mipmap-xxhdpi/ic_launcher_wallpaper.png b/res/mipmap-xxhdpi/ic_launcher_wallpaper.png Binary files differindex 023fb5886..023fb5886 100644 --- a/wallpaper_picker_res/mipmap-xxhdpi/ic_launcher_wallpaper.png +++ b/res/mipmap-xxhdpi/ic_launcher_wallpaper.png diff --git a/wallpaper_picker_res/values-nodpi/wallpapers.xml b/res/values-nodpi/wallpapers.xml index 1e340e4b2..1e340e4b2 100644 --- a/wallpaper_picker_res/values-nodpi/wallpapers.xml +++ b/res/values-nodpi/wallpapers.xml diff --git a/res/values-sw720dp/dimens.xml b/res/values-sw720dp/dimens.xml index 9ae155b3c..01227e147 100644 --- a/res/values-sw720dp/dimens.xml +++ b/res/values-sw720dp/dimens.xml @@ -21,6 +21,10 @@ <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> diff --git a/res/values-sw720dp/styles.xml b/res/values-sw720dp/styles.xml index e1f9ab45a..9738a124b 100644 --- a/res/values-sw720dp/styles.xml +++ b/res/values-sw720dp/styles.xml @@ -51,6 +51,12 @@ </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> diff --git a/res/values/colors.xml b/res/values/colors.xml index ffee05f18..c07390380 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -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> diff --git a/res/values/dimens.xml b/res/values/dimens.xml index 28b6a5bcc..c86fe314d 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -27,6 +27,11 @@ <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> diff --git a/res/values/strings.xml b/res/values/strings.xml index 361be7b3c..30f4d8fd3 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -28,6 +28,38 @@ <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 --> diff --git a/res/values/styles.xml b/res/values/styles.xml index 4aad5ebfa..8226915dd 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -18,6 +18,23 @@ --> <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_src/android/util/Pools.java b/src/android/util/Pools.java index 40bab1eae..40bab1eae 100644 --- a/wallpaper_picker_src/android/util/Pools.java +++ b/src/android/util/Pools.java diff --git a/wallpaper_picker_src/com/android/gallery3d/common/BitmapUtils.java b/src/com/android/gallery3d/common/BitmapUtils.java index a671ed2b9..a671ed2b9 100644 --- a/wallpaper_picker_src/com/android/gallery3d/common/BitmapUtils.java +++ b/src/com/android/gallery3d/common/BitmapUtils.java diff --git a/wallpaper_picker_src/com/android/gallery3d/common/Utils.java b/src/com/android/gallery3d/common/Utils.java index 614a081c8..614a081c8 100644 --- a/wallpaper_picker_src/com/android/gallery3d/common/Utils.java +++ b/src/com/android/gallery3d/common/Utils.java diff --git a/wallpaper_picker_src/com/android/gallery3d/exif/ByteBufferInputStream.java b/src/com/android/gallery3d/exif/ByteBufferInputStream.java index 7fb9f22cc..7fb9f22cc 100644 --- a/wallpaper_picker_src/com/android/gallery3d/exif/ByteBufferInputStream.java +++ b/src/com/android/gallery3d/exif/ByteBufferInputStream.java diff --git a/wallpaper_picker_src/com/android/gallery3d/exif/CountedDataInputStream.java b/src/com/android/gallery3d/exif/CountedDataInputStream.java index dfd4a1a10..dfd4a1a10 100644 --- a/wallpaper_picker_src/com/android/gallery3d/exif/CountedDataInputStream.java +++ b/src/com/android/gallery3d/exif/CountedDataInputStream.java diff --git a/wallpaper_picker_src/com/android/gallery3d/exif/ExifData.java b/src/com/android/gallery3d/exif/ExifData.java index 8422382bb..8422382bb 100644 --- a/wallpaper_picker_src/com/android/gallery3d/exif/ExifData.java +++ b/src/com/android/gallery3d/exif/ExifData.java diff --git a/wallpaper_picker_src/com/android/gallery3d/exif/ExifInterface.java b/src/com/android/gallery3d/exif/ExifInterface.java index a1cf0fc85..a1cf0fc85 100644 --- a/wallpaper_picker_src/com/android/gallery3d/exif/ExifInterface.java +++ b/src/com/android/gallery3d/exif/ExifInterface.java diff --git a/wallpaper_picker_src/com/android/gallery3d/exif/ExifInvalidFormatException.java b/src/com/android/gallery3d/exif/ExifInvalidFormatException.java index bf923ec26..bf923ec26 100644 --- a/wallpaper_picker_src/com/android/gallery3d/exif/ExifInvalidFormatException.java +++ b/src/com/android/gallery3d/exif/ExifInvalidFormatException.java diff --git a/wallpaper_picker_src/com/android/gallery3d/exif/ExifModifier.java b/src/com/android/gallery3d/exif/ExifModifier.java index f00362b6b..f00362b6b 100644 --- a/wallpaper_picker_src/com/android/gallery3d/exif/ExifModifier.java +++ b/src/com/android/gallery3d/exif/ExifModifier.java diff --git a/wallpaper_picker_src/com/android/gallery3d/exif/ExifOutputStream.java b/src/com/android/gallery3d/exif/ExifOutputStream.java index 7ca05f2e0..7ca05f2e0 100644 --- a/wallpaper_picker_src/com/android/gallery3d/exif/ExifOutputStream.java +++ b/src/com/android/gallery3d/exif/ExifOutputStream.java diff --git a/wallpaper_picker_src/com/android/gallery3d/exif/ExifParser.java b/src/com/android/gallery3d/exif/ExifParser.java index 5467d423d..5467d423d 100644 --- a/wallpaper_picker_src/com/android/gallery3d/exif/ExifParser.java +++ b/src/com/android/gallery3d/exif/ExifParser.java diff --git a/wallpaper_picker_src/com/android/gallery3d/exif/ExifReader.java b/src/com/android/gallery3d/exif/ExifReader.java index 68e972fb7..68e972fb7 100644 --- a/wallpaper_picker_src/com/android/gallery3d/exif/ExifReader.java +++ b/src/com/android/gallery3d/exif/ExifReader.java diff --git a/wallpaper_picker_src/com/android/gallery3d/exif/ExifTag.java b/src/com/android/gallery3d/exif/ExifTag.java index b8b387201..b8b387201 100644 --- a/wallpaper_picker_src/com/android/gallery3d/exif/ExifTag.java +++ b/src/com/android/gallery3d/exif/ExifTag.java diff --git a/wallpaper_picker_src/com/android/gallery3d/exif/IfdData.java b/src/com/android/gallery3d/exif/IfdData.java index 093944aec..093944aec 100644 --- a/wallpaper_picker_src/com/android/gallery3d/exif/IfdData.java +++ b/src/com/android/gallery3d/exif/IfdData.java diff --git a/wallpaper_picker_src/com/android/gallery3d/exif/IfdId.java b/src/com/android/gallery3d/exif/IfdId.java index 7842edbd4..7842edbd4 100644 --- a/wallpaper_picker_src/com/android/gallery3d/exif/IfdId.java +++ b/src/com/android/gallery3d/exif/IfdId.java diff --git a/wallpaper_picker_src/com/android/gallery3d/exif/JpegHeader.java b/src/com/android/gallery3d/exif/JpegHeader.java index e3e787eff..e3e787eff 100644 --- a/wallpaper_picker_src/com/android/gallery3d/exif/JpegHeader.java +++ b/src/com/android/gallery3d/exif/JpegHeader.java diff --git a/wallpaper_picker_src/com/android/gallery3d/exif/OrderedDataOutputStream.java b/src/com/android/gallery3d/exif/OrderedDataOutputStream.java index 428e6b9fc..428e6b9fc 100644 --- a/wallpaper_picker_src/com/android/gallery3d/exif/OrderedDataOutputStream.java +++ b/src/com/android/gallery3d/exif/OrderedDataOutputStream.java diff --git a/wallpaper_picker_src/com/android/gallery3d/exif/Rational.java b/src/com/android/gallery3d/exif/Rational.java index 591d63faf..591d63faf 100644 --- a/wallpaper_picker_src/com/android/gallery3d/exif/Rational.java +++ b/src/com/android/gallery3d/exif/Rational.java diff --git a/wallpaper_picker_src/com/android/gallery3d/glrenderer/BasicTexture.java b/src/com/android/gallery3d/glrenderer/BasicTexture.java index 2e77b903f..2e77b903f 100644 --- a/wallpaper_picker_src/com/android/gallery3d/glrenderer/BasicTexture.java +++ b/src/com/android/gallery3d/glrenderer/BasicTexture.java diff --git a/wallpaper_picker_src/com/android/gallery3d/glrenderer/BitmapTexture.java b/src/com/android/gallery3d/glrenderer/BitmapTexture.java index 100b0b3b9..100b0b3b9 100644 --- a/wallpaper_picker_src/com/android/gallery3d/glrenderer/BitmapTexture.java +++ b/src/com/android/gallery3d/glrenderer/BitmapTexture.java diff --git a/wallpaper_picker_src/com/android/gallery3d/glrenderer/GLCanvas.java b/src/com/android/gallery3d/glrenderer/GLCanvas.java index 305e90521..305e90521 100644 --- a/wallpaper_picker_src/com/android/gallery3d/glrenderer/GLCanvas.java +++ b/src/com/android/gallery3d/glrenderer/GLCanvas.java diff --git a/wallpaper_picker_src/com/android/gallery3d/glrenderer/GLES20Canvas.java b/src/com/android/gallery3d/glrenderer/GLES20Canvas.java index 4ead1315e..4ead1315e 100644 --- a/wallpaper_picker_src/com/android/gallery3d/glrenderer/GLES20Canvas.java +++ b/src/com/android/gallery3d/glrenderer/GLES20Canvas.java diff --git a/wallpaper_picker_src/com/android/gallery3d/glrenderer/GLES20IdImpl.java b/src/com/android/gallery3d/glrenderer/GLES20IdImpl.java index 6cd7149cb..6cd7149cb 100644 --- a/wallpaper_picker_src/com/android/gallery3d/glrenderer/GLES20IdImpl.java +++ b/src/com/android/gallery3d/glrenderer/GLES20IdImpl.java diff --git a/wallpaper_picker_src/com/android/gallery3d/glrenderer/GLId.java b/src/com/android/gallery3d/glrenderer/GLId.java index 3cec558f6..3cec558f6 100644 --- a/wallpaper_picker_src/com/android/gallery3d/glrenderer/GLId.java +++ b/src/com/android/gallery3d/glrenderer/GLId.java diff --git a/wallpaper_picker_src/com/android/gallery3d/glrenderer/GLPaint.java b/src/com/android/gallery3d/glrenderer/GLPaint.java index 16b220690..16b220690 100644 --- a/wallpaper_picker_src/com/android/gallery3d/glrenderer/GLPaint.java +++ b/src/com/android/gallery3d/glrenderer/GLPaint.java diff --git a/wallpaper_picker_src/com/android/gallery3d/glrenderer/RawTexture.java b/src/com/android/gallery3d/glrenderer/RawTexture.java index 93f0fdff9..93f0fdff9 100644 --- a/wallpaper_picker_src/com/android/gallery3d/glrenderer/RawTexture.java +++ b/src/com/android/gallery3d/glrenderer/RawTexture.java diff --git a/wallpaper_picker_src/com/android/gallery3d/glrenderer/Texture.java b/src/com/android/gallery3d/glrenderer/Texture.java index 3dcae4aec..3dcae4aec 100644 --- a/wallpaper_picker_src/com/android/gallery3d/glrenderer/Texture.java +++ b/src/com/android/gallery3d/glrenderer/Texture.java diff --git a/wallpaper_picker_src/com/android/gallery3d/glrenderer/UploadedTexture.java b/src/com/android/gallery3d/glrenderer/UploadedTexture.java index f41a979b7..f41a979b7 100644 --- a/wallpaper_picker_src/com/android/gallery3d/glrenderer/UploadedTexture.java +++ b/src/com/android/gallery3d/glrenderer/UploadedTexture.java diff --git a/wallpaper_picker_src/com/android/gallery3d/util/IntArray.java b/src/com/android/gallery3d/util/IntArray.java index 2c4dc2c83..2c4dc2c83 100644 --- a/wallpaper_picker_src/com/android/gallery3d/util/IntArray.java +++ b/src/com/android/gallery3d/util/IntArray.java diff --git a/wallpaper_picker_src/com/android/launcher3/CropView.java b/src/com/android/launcher3/CropView.java index 578b8eafd..578b8eafd 100644 --- a/wallpaper_picker_src/com/android/launcher3/CropView.java +++ b/src/com/android/launcher3/CropView.java diff --git a/wallpaper_picker_src/com/android/launcher3/WallpaperCropActivity.java b/src/com/android/launcher3/WallpaperCropActivity.java index b3ef07309..b3ef07309 100644 --- a/wallpaper_picker_src/com/android/launcher3/WallpaperCropActivity.java +++ b/src/com/android/launcher3/WallpaperCropActivity.java diff --git a/wallpaper_picker_src/com/android/launcher3/WallpaperPickerActivity.java b/src/com/android/launcher3/WallpaperPickerActivity.java index 2da05c92b..2da05c92b 100644 --- a/wallpaper_picker_src/com/android/launcher3/WallpaperPickerActivity.java +++ b/src/com/android/launcher3/WallpaperPickerActivity.java diff --git a/wallpaper_picker_src/com/android/photos/BitmapRegionTileSource.java b/src/com/android/photos/BitmapRegionTileSource.java index 8511de2da..8511de2da 100644 --- a/wallpaper_picker_src/com/android/photos/BitmapRegionTileSource.java +++ b/src/com/android/photos/BitmapRegionTileSource.java diff --git a/wallpaper_picker_src/com/android/photos/views/BlockingGLTextureView.java b/src/com/android/photos/views/BlockingGLTextureView.java index 8a0505185..8a0505185 100644 --- a/wallpaper_picker_src/com/android/photos/views/BlockingGLTextureView.java +++ b/src/com/android/photos/views/BlockingGLTextureView.java diff --git a/wallpaper_picker_src/com/android/photos/views/TiledImageRenderer.java b/src/com/android/photos/views/TiledImageRenderer.java index c4e493b34..c4e493b34 100644 --- a/wallpaper_picker_src/com/android/photos/views/TiledImageRenderer.java +++ b/src/com/android/photos/views/TiledImageRenderer.java diff --git a/wallpaper_picker_src/com/android/photos/views/TiledImageView.java b/src/com/android/photos/views/TiledImageView.java index af4199c91..af4199c91 100644 --- a/wallpaper_picker_src/com/android/photos/views/TiledImageView.java +++ b/src/com/android/photos/views/TiledImageView.java diff --git a/wallpaper_picker_res/values-sw720dp/dimens.xml b/wallpaper_picker_res/values-sw720dp/dimens.xml deleted file mode 100644 index 9ae155b3c..000000000 --- a/wallpaper_picker_res/values-sw720dp/dimens.xml +++ /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 index 91078517d..000000000 --- a/wallpaper_picker_res/values-sw720dp/styles.xml +++ /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 index adae7cff6..000000000 --- a/wallpaper_picker_res/values/colors.xml +++ /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 index 0447c6d1f..000000000 --- a/wallpaper_picker_res/values/dimens.xml +++ /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 index 1ee3513f9..000000000 --- a/wallpaper_picker_res/values/strings.xml +++ /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 index 0e48ddac4..000000000 --- a/wallpaper_picker_res/values/styles.xml +++ /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> |