diff --git a/Android.mk b/Android.mk index 3bd20a7cd1..6059a3f982 100644 --- a/Android.mk +++ b/Android.mk @@ -26,8 +26,12 @@ 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 c1323951be..b2c5266fa2 100644 --- a/CleanSpec.mk +++ b/CleanSpec.mk @@ -50,6 +50,8 @@ $(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/res/values-sw720dp/dimens.xml b/res/values-sw720dp/dimens.xml index 01227e1470..9ae155b3cc 100644 --- a/res/values-sw720dp/dimens.xml +++ b/res/values-sw720dp/dimens.xml @@ -21,10 +21,6 @@ 8dip 8dip - - 196dp - 140dp - 0dp diff --git a/res/values-sw720dp/styles.xml b/res/values-sw720dp/styles.xml index 9738a124b7..e1f9ab45af 100644 --- a/res/values-sw720dp/styles.xml +++ b/res/values-sw720dp/styles.xml @@ -51,12 +51,6 @@ - - - - - - - + diff --git a/wallpaper_picker_res/values/colors.xml b/wallpaper_picker_res/values/colors.xml new file mode 100644 index 0000000000..adae7cff6f --- /dev/null +++ b/wallpaper_picker_res/values/colors.xml @@ -0,0 +1,22 @@ + + + + #66000000 + diff --git a/wallpaper_picker_res/values/dimens.xml b/wallpaper_picker_res/values/dimens.xml new file mode 100644 index 0000000000..0447c6d1f7 --- /dev/null +++ b/wallpaper_picker_res/values/dimens.xml @@ -0,0 +1,22 @@ + + + + + + 106.5dp + 94.5dp + 32dp + diff --git a/wallpaper_picker_res/values/strings.xml b/wallpaper_picker_res/values/strings.xml new file mode 100644 index 0000000000..1ee3513f90 --- /dev/null +++ b/wallpaper_picker_res/values/strings.xml @@ -0,0 +1,53 @@ + + + + + + Set wallpaper + + Coudn\'t load image + + Couldn\'t load image as wallpaper + + + + %1$d selected + %1$d selected + %1$d selected + + + Wallpaper %1$d of %2$d + + Selected %1$s + + + Delete + + Pick image + + Wallpapers + + Crop wallpaper + diff --git a/wallpaper_picker_res/values/styles.xml b/wallpaper_picker_res/values/styles.xml new file mode 100644 index 0000000000..0e48ddac43 --- /dev/null +++ b/wallpaper_picker_res/values/styles.xml @@ -0,0 +1,37 @@ + + + + + + + + + + diff --git a/src/android/util/Pools.java b/wallpaper_picker_src/android/util/Pools.java similarity index 100% rename from src/android/util/Pools.java rename to wallpaper_picker_src/android/util/Pools.java diff --git a/src/com/android/gallery3d/common/BitmapUtils.java b/wallpaper_picker_src/com/android/gallery3d/common/BitmapUtils.java similarity index 100% rename from src/com/android/gallery3d/common/BitmapUtils.java rename to wallpaper_picker_src/com/android/gallery3d/common/BitmapUtils.java diff --git a/src/com/android/gallery3d/common/Utils.java b/wallpaper_picker_src/com/android/gallery3d/common/Utils.java similarity index 100% rename from src/com/android/gallery3d/common/Utils.java rename to wallpaper_picker_src/com/android/gallery3d/common/Utils.java diff --git a/src/com/android/gallery3d/exif/ByteBufferInputStream.java b/wallpaper_picker_src/com/android/gallery3d/exif/ByteBufferInputStream.java similarity index 100% rename from src/com/android/gallery3d/exif/ByteBufferInputStream.java rename to wallpaper_picker_src/com/android/gallery3d/exif/ByteBufferInputStream.java diff --git a/src/com/android/gallery3d/exif/CountedDataInputStream.java b/wallpaper_picker_src/com/android/gallery3d/exif/CountedDataInputStream.java similarity index 100% rename from src/com/android/gallery3d/exif/CountedDataInputStream.java rename to wallpaper_picker_src/com/android/gallery3d/exif/CountedDataInputStream.java diff --git a/src/com/android/gallery3d/exif/ExifData.java b/wallpaper_picker_src/com/android/gallery3d/exif/ExifData.java similarity index 100% rename from src/com/android/gallery3d/exif/ExifData.java rename to wallpaper_picker_src/com/android/gallery3d/exif/ExifData.java diff --git a/src/com/android/gallery3d/exif/ExifInterface.java b/wallpaper_picker_src/com/android/gallery3d/exif/ExifInterface.java similarity index 100% rename from src/com/android/gallery3d/exif/ExifInterface.java rename to wallpaper_picker_src/com/android/gallery3d/exif/ExifInterface.java diff --git a/src/com/android/gallery3d/exif/ExifInvalidFormatException.java b/wallpaper_picker_src/com/android/gallery3d/exif/ExifInvalidFormatException.java similarity index 100% rename from src/com/android/gallery3d/exif/ExifInvalidFormatException.java rename to wallpaper_picker_src/com/android/gallery3d/exif/ExifInvalidFormatException.java diff --git a/src/com/android/gallery3d/exif/ExifModifier.java b/wallpaper_picker_src/com/android/gallery3d/exif/ExifModifier.java similarity index 100% rename from src/com/android/gallery3d/exif/ExifModifier.java rename to wallpaper_picker_src/com/android/gallery3d/exif/ExifModifier.java diff --git a/src/com/android/gallery3d/exif/ExifOutputStream.java b/wallpaper_picker_src/com/android/gallery3d/exif/ExifOutputStream.java similarity index 100% rename from src/com/android/gallery3d/exif/ExifOutputStream.java rename to wallpaper_picker_src/com/android/gallery3d/exif/ExifOutputStream.java diff --git a/src/com/android/gallery3d/exif/ExifParser.java b/wallpaper_picker_src/com/android/gallery3d/exif/ExifParser.java similarity index 100% rename from src/com/android/gallery3d/exif/ExifParser.java rename to wallpaper_picker_src/com/android/gallery3d/exif/ExifParser.java diff --git a/src/com/android/gallery3d/exif/ExifReader.java b/wallpaper_picker_src/com/android/gallery3d/exif/ExifReader.java similarity index 100% rename from src/com/android/gallery3d/exif/ExifReader.java rename to wallpaper_picker_src/com/android/gallery3d/exif/ExifReader.java diff --git a/src/com/android/gallery3d/exif/ExifTag.java b/wallpaper_picker_src/com/android/gallery3d/exif/ExifTag.java similarity index 100% rename from src/com/android/gallery3d/exif/ExifTag.java rename to wallpaper_picker_src/com/android/gallery3d/exif/ExifTag.java diff --git a/src/com/android/gallery3d/exif/IfdData.java b/wallpaper_picker_src/com/android/gallery3d/exif/IfdData.java similarity index 100% rename from src/com/android/gallery3d/exif/IfdData.java rename to wallpaper_picker_src/com/android/gallery3d/exif/IfdData.java diff --git a/src/com/android/gallery3d/exif/IfdId.java b/wallpaper_picker_src/com/android/gallery3d/exif/IfdId.java similarity index 100% rename from src/com/android/gallery3d/exif/IfdId.java rename to wallpaper_picker_src/com/android/gallery3d/exif/IfdId.java diff --git a/src/com/android/gallery3d/exif/JpegHeader.java b/wallpaper_picker_src/com/android/gallery3d/exif/JpegHeader.java similarity index 100% rename from src/com/android/gallery3d/exif/JpegHeader.java rename to wallpaper_picker_src/com/android/gallery3d/exif/JpegHeader.java diff --git a/src/com/android/gallery3d/exif/OrderedDataOutputStream.java b/wallpaper_picker_src/com/android/gallery3d/exif/OrderedDataOutputStream.java similarity index 100% rename from src/com/android/gallery3d/exif/OrderedDataOutputStream.java rename to wallpaper_picker_src/com/android/gallery3d/exif/OrderedDataOutputStream.java diff --git a/src/com/android/gallery3d/exif/Rational.java b/wallpaper_picker_src/com/android/gallery3d/exif/Rational.java similarity index 100% rename from src/com/android/gallery3d/exif/Rational.java rename to wallpaper_picker_src/com/android/gallery3d/exif/Rational.java diff --git a/src/com/android/gallery3d/glrenderer/BasicTexture.java b/wallpaper_picker_src/com/android/gallery3d/glrenderer/BasicTexture.java similarity index 100% rename from src/com/android/gallery3d/glrenderer/BasicTexture.java rename to wallpaper_picker_src/com/android/gallery3d/glrenderer/BasicTexture.java diff --git a/src/com/android/gallery3d/glrenderer/BitmapTexture.java b/wallpaper_picker_src/com/android/gallery3d/glrenderer/BitmapTexture.java similarity index 100% rename from src/com/android/gallery3d/glrenderer/BitmapTexture.java rename to wallpaper_picker_src/com/android/gallery3d/glrenderer/BitmapTexture.java diff --git a/src/com/android/gallery3d/glrenderer/GLCanvas.java b/wallpaper_picker_src/com/android/gallery3d/glrenderer/GLCanvas.java similarity index 100% rename from src/com/android/gallery3d/glrenderer/GLCanvas.java rename to wallpaper_picker_src/com/android/gallery3d/glrenderer/GLCanvas.java diff --git a/src/com/android/gallery3d/glrenderer/GLES20Canvas.java b/wallpaper_picker_src/com/android/gallery3d/glrenderer/GLES20Canvas.java similarity index 100% rename from src/com/android/gallery3d/glrenderer/GLES20Canvas.java rename to wallpaper_picker_src/com/android/gallery3d/glrenderer/GLES20Canvas.java diff --git a/src/com/android/gallery3d/glrenderer/GLES20IdImpl.java b/wallpaper_picker_src/com/android/gallery3d/glrenderer/GLES20IdImpl.java similarity index 100% rename from src/com/android/gallery3d/glrenderer/GLES20IdImpl.java rename to wallpaper_picker_src/com/android/gallery3d/glrenderer/GLES20IdImpl.java diff --git a/src/com/android/gallery3d/glrenderer/GLId.java b/wallpaper_picker_src/com/android/gallery3d/glrenderer/GLId.java similarity index 100% rename from src/com/android/gallery3d/glrenderer/GLId.java rename to wallpaper_picker_src/com/android/gallery3d/glrenderer/GLId.java diff --git a/src/com/android/gallery3d/glrenderer/GLPaint.java b/wallpaper_picker_src/com/android/gallery3d/glrenderer/GLPaint.java similarity index 100% rename from src/com/android/gallery3d/glrenderer/GLPaint.java rename to wallpaper_picker_src/com/android/gallery3d/glrenderer/GLPaint.java diff --git a/src/com/android/gallery3d/glrenderer/RawTexture.java b/wallpaper_picker_src/com/android/gallery3d/glrenderer/RawTexture.java similarity index 100% rename from src/com/android/gallery3d/glrenderer/RawTexture.java rename to wallpaper_picker_src/com/android/gallery3d/glrenderer/RawTexture.java diff --git a/src/com/android/gallery3d/glrenderer/Texture.java b/wallpaper_picker_src/com/android/gallery3d/glrenderer/Texture.java similarity index 100% rename from src/com/android/gallery3d/glrenderer/Texture.java rename to wallpaper_picker_src/com/android/gallery3d/glrenderer/Texture.java diff --git a/src/com/android/gallery3d/glrenderer/UploadedTexture.java b/wallpaper_picker_src/com/android/gallery3d/glrenderer/UploadedTexture.java similarity index 100% rename from src/com/android/gallery3d/glrenderer/UploadedTexture.java rename to wallpaper_picker_src/com/android/gallery3d/glrenderer/UploadedTexture.java diff --git a/src/com/android/gallery3d/util/IntArray.java b/wallpaper_picker_src/com/android/gallery3d/util/IntArray.java similarity index 100% rename from src/com/android/gallery3d/util/IntArray.java rename to wallpaper_picker_src/com/android/gallery3d/util/IntArray.java diff --git a/src/com/android/launcher3/CropView.java b/wallpaper_picker_src/com/android/launcher3/CropView.java similarity index 100% rename from src/com/android/launcher3/CropView.java rename to wallpaper_picker_src/com/android/launcher3/CropView.java diff --git a/src/com/android/launcher3/WallpaperCropActivity.java b/wallpaper_picker_src/com/android/launcher3/WallpaperCropActivity.java similarity index 100% rename from src/com/android/launcher3/WallpaperCropActivity.java rename to wallpaper_picker_src/com/android/launcher3/WallpaperCropActivity.java diff --git a/src/com/android/launcher3/WallpaperPickerActivity.java b/wallpaper_picker_src/com/android/launcher3/WallpaperPickerActivity.java similarity index 100% rename from src/com/android/launcher3/WallpaperPickerActivity.java rename to wallpaper_picker_src/com/android/launcher3/WallpaperPickerActivity.java diff --git a/src/com/android/photos/BitmapRegionTileSource.java b/wallpaper_picker_src/com/android/photos/BitmapRegionTileSource.java similarity index 100% rename from src/com/android/photos/BitmapRegionTileSource.java rename to wallpaper_picker_src/com/android/photos/BitmapRegionTileSource.java diff --git a/src/com/android/photos/views/BlockingGLTextureView.java b/wallpaper_picker_src/com/android/photos/views/BlockingGLTextureView.java similarity index 100% rename from src/com/android/photos/views/BlockingGLTextureView.java rename to wallpaper_picker_src/com/android/photos/views/BlockingGLTextureView.java diff --git a/src/com/android/photos/views/TiledImageRenderer.java b/wallpaper_picker_src/com/android/photos/views/TiledImageRenderer.java similarity index 100% rename from src/com/android/photos/views/TiledImageRenderer.java rename to wallpaper_picker_src/com/android/photos/views/TiledImageRenderer.java diff --git a/src/com/android/photos/views/TiledImageView.java b/wallpaper_picker_src/com/android/photos/views/TiledImageView.java similarity index 100% rename from src/com/android/photos/views/TiledImageView.java rename to wallpaper_picker_src/com/android/photos/views/TiledImageView.java