summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Jurka <mikejurka@google.com>2013-12-12 15:04:25 +0100
committerMichael Jurka <mikejurka@google.com>2013-12-13 12:50:32 +0100
commit7ad868b86e45d6f58c186d2731ab2beb84643757 (patch)
tree40e2237097855c43f7876a401f607eb363fbe69c
parent69a10949d62255f6b32dff8c3a6a91cbfcf98587 (diff)
downloadandroid_packages_apps_Trebuchet-7ad868b86e45d6f58c186d2731ab2beb84643757.zip
android_packages_apps_Trebuchet-7ad868b86e45d6f58c186d2731ab2beb84643757.tar.gz
android_packages_apps_Trebuchet-7ad868b86e45d6f58c186d2731ab2beb84643757.tar.bz2
Create separate project for Wallpaper Picker
Change-Id: Id9e855780b9fb68c63eb6e9f6c19bcbce28a6fd5
-rw-r--r--Android.mk4
-rw-r--r--AndroidManifest.xml2
-rw-r--r--WallpaperPicker/AndroidManifest.xml10
-rw-r--r--WallpaperPicker/README4
-rwxr-xr-xWallpaperPicker/res/drawable-hdpi/ic_actionbar_accept.png (renamed from wallpaper_picker_res/drawable-hdpi/ic_actionbar_accept.png)bin1335 -> 1335 bytes
-rw-r--r--WallpaperPicker/res/drawable-hdpi/ic_images.png (renamed from wallpaper_picker_res/drawable-hdpi/ic_images.png)bin1935 -> 1935 bytes
-rw-r--r--WallpaperPicker/res/drawable-hdpi/tile_picker_focused.9.png (renamed from wallpaper_picker_res/drawable-hdpi/tile_picker_focused.9.png)bin168 -> 168 bytes
-rw-r--r--WallpaperPicker/res/drawable-hdpi/tile_picker_pressed.9.png (renamed from wallpaper_picker_res/drawable-hdpi/tile_picker_pressed.9.png)bin144 -> 144 bytes
-rw-r--r--WallpaperPicker/res/drawable-hdpi/tile_picker_selected.9.png (renamed from wallpaper_picker_res/drawable-hdpi/tile_picker_selected.9.png)bin165 -> 165 bytes
-rw-r--r--WallpaperPicker/res/drawable-hdpi/tile_shadow_bottom.9.png (renamed from wallpaper_picker_res/drawable-hdpi/tile_shadow_bottom.9.png)bin159 -> 159 bytes
-rw-r--r--WallpaperPicker/res/drawable-hdpi/tile_shadow_top.9.png (renamed from wallpaper_picker_res/drawable-hdpi/tile_shadow_top.9.png)bin148 -> 148 bytes
-rwxr-xr-xWallpaperPicker/res/drawable-mdpi/ic_actionbar_accept.png (renamed from wallpaper_picker_res/drawable-mdpi/ic_actionbar_accept.png)bin1191 -> 1191 bytes
-rw-r--r--WallpaperPicker/res/drawable-mdpi/ic_images.png (renamed from wallpaper_picker_res/drawable-mdpi/ic_images.png)bin1332 -> 1332 bytes
-rw-r--r--WallpaperPicker/res/drawable-mdpi/tile_picker_focused.9.png (renamed from wallpaper_picker_res/drawable-mdpi/tile_picker_focused.9.png)bin165 -> 165 bytes
-rw-r--r--WallpaperPicker/res/drawable-mdpi/tile_picker_pressed.9.png (renamed from wallpaper_picker_res/drawable-mdpi/tile_picker_pressed.9.png)bin142 -> 142 bytes
-rw-r--r--WallpaperPicker/res/drawable-mdpi/tile_picker_selected.9.png (renamed from wallpaper_picker_res/drawable-mdpi/tile_picker_selected.9.png)bin159 -> 159 bytes
-rw-r--r--WallpaperPicker/res/drawable-mdpi/tile_shadow_bottom.9.png (renamed from wallpaper_picker_res/drawable-mdpi/tile_shadow_bottom.9.png)bin140 -> 140 bytes
-rw-r--r--WallpaperPicker/res/drawable-mdpi/tile_shadow_top.9.png (renamed from wallpaper_picker_res/drawable-mdpi/tile_shadow_top.9.png)bin138 -> 138 bytes
-rwxr-xr-xWallpaperPicker/res/drawable-xhdpi/ic_actionbar_accept.png (renamed from wallpaper_picker_res/drawable-xhdpi/ic_actionbar_accept.png)bin1599 -> 1599 bytes
-rw-r--r--WallpaperPicker/res/drawable-xhdpi/ic_images.png (renamed from wallpaper_picker_res/drawable-xhdpi/ic_images.png)bin2480 -> 2480 bytes
-rw-r--r--WallpaperPicker/res/drawable-xhdpi/tile_picker_focused.9.png (renamed from wallpaper_picker_res/drawable-xhdpi/tile_picker_focused.9.png)bin174 -> 174 bytes
-rw-r--r--WallpaperPicker/res/drawable-xhdpi/tile_picker_pressed.9.png (renamed from wallpaper_picker_res/drawable-xhdpi/tile_picker_pressed.9.png)bin147 -> 147 bytes
-rw-r--r--WallpaperPicker/res/drawable-xhdpi/tile_picker_selected.9.png (renamed from wallpaper_picker_res/drawable-xhdpi/tile_picker_selected.9.png)bin167 -> 167 bytes
-rw-r--r--WallpaperPicker/res/drawable-xhdpi/tile_shadow_bottom.9.png (renamed from wallpaper_picker_res/drawable-xhdpi/tile_shadow_bottom.9.png)bin164 -> 164 bytes
-rw-r--r--WallpaperPicker/res/drawable-xhdpi/tile_shadow_top.9.png (renamed from wallpaper_picker_res/drawable-xhdpi/tile_shadow_top.9.png)bin151 -> 151 bytes
-rw-r--r--WallpaperPicker/res/drawable-xxhdpi/ic_images.png (renamed from wallpaper_picker_res/drawable-xxhdpi/ic_images.png)bin2097 -> 2097 bytes
-rw-r--r--WallpaperPicker/res/drawable-xxhdpi/tile_picker_focused.9.png (renamed from wallpaper_picker_res/drawable-xxhdpi/tile_picker_focused.9.png)bin189 -> 189 bytes
-rw-r--r--WallpaperPicker/res/drawable-xxhdpi/tile_picker_pressed.9.png (renamed from wallpaper_picker_res/drawable-xxhdpi/tile_picker_pressed.9.png)bin154 -> 154 bytes
-rw-r--r--WallpaperPicker/res/drawable-xxhdpi/tile_picker_selected.9.png (renamed from wallpaper_picker_res/drawable-xxhdpi/tile_picker_selected.9.png)bin175 -> 175 bytes
-rw-r--r--WallpaperPicker/res/drawable-xxhdpi/tile_shadow_bottom.9.png (renamed from wallpaper_picker_res/drawable-xxhdpi/tile_shadow_bottom.9.png)bin185 -> 185 bytes
-rw-r--r--WallpaperPicker/res/drawable-xxhdpi/tile_shadow_top.9.png (renamed from wallpaper_picker_res/drawable-xxhdpi/tile_shadow_top.9.png)bin169 -> 169 bytes
-rw-r--r--WallpaperPicker/res/drawable/wallpaper_tile_fg.xml (renamed from wallpaper_picker_res/drawable/wallpaper_tile_fg.xml)0
-rw-r--r--WallpaperPicker/res/layout/actionbar_set_wallpaper.xml (renamed from wallpaper_picker_res/layout/actionbar_set_wallpaper.xml)0
-rw-r--r--WallpaperPicker/res/layout/wallpaper_cropper.xml (renamed from wallpaper_picker_res/layout/wallpaper_cropper.xml)0
-rw-r--r--WallpaperPicker/res/layout/wallpaper_picker.xml (renamed from wallpaper_picker_res/layout/wallpaper_picker.xml)0
-rw-r--r--WallpaperPicker/res/layout/wallpaper_picker_image_picker_item.xml (renamed from wallpaper_picker_res/layout/wallpaper_picker_image_picker_item.xml)0
-rw-r--r--WallpaperPicker/res/layout/wallpaper_picker_item.xml (renamed from wallpaper_picker_res/layout/wallpaper_picker_item.xml)0
-rw-r--r--WallpaperPicker/res/layout/wallpaper_picker_live_wallpaper_item.xml (renamed from wallpaper_picker_res/layout/wallpaper_picker_live_wallpaper_item.xml)0
-rw-r--r--WallpaperPicker/res/layout/wallpaper_picker_third_party_item.xml (renamed from wallpaper_picker_res/layout/wallpaper_picker_third_party_item.xml)0
-rw-r--r--WallpaperPicker/res/menu/cab_delete_wallpapers.xml (renamed from wallpaper_picker_res/menu/cab_delete_wallpapers.xml)0
-rw-r--r--WallpaperPicker/res/mipmap-hdpi/ic_launcher_wallpaper.png (renamed from wallpaper_picker_res/mipmap-hdpi/ic_launcher_wallpaper.png)bin4418 -> 4418 bytes
-rw-r--r--WallpaperPicker/res/mipmap-mdpi/ic_launcher_wallpaper.png (renamed from wallpaper_picker_res/mipmap-mdpi/ic_launcher_wallpaper.png)bin2871 -> 2871 bytes
-rw-r--r--WallpaperPicker/res/mipmap-xhdpi/ic_launcher_wallpaper.png (renamed from wallpaper_picker_res/mipmap-xhdpi/ic_launcher_wallpaper.png)bin6061 -> 6061 bytes
-rw-r--r--WallpaperPicker/res/mipmap-xxhdpi/ic_launcher_wallpaper.png (renamed from wallpaper_picker_res/mipmap-xxhdpi/ic_launcher_wallpaper.png)bin7596 -> 7596 bytes
-rw-r--r--WallpaperPicker/res/values-nodpi/wallpapers.xml (renamed from wallpaper_picker_res/values-nodpi/wallpapers.xml)0
-rw-r--r--WallpaperPicker/res/values-sw600dp/config.xml18
-rw-r--r--WallpaperPicker/res/values-sw720dp/dimens.xml (renamed from wallpaper_picker_res/values-sw720dp/dimens.xml)0
-rw-r--r--WallpaperPicker/res/values-sw720dp/styles.xml (renamed from wallpaper_picker_res/values-sw720dp/styles.xml)0
-rw-r--r--WallpaperPicker/res/values/colors.xml (renamed from wallpaper_picker_res/values/colors.xml)0
-rw-r--r--WallpaperPicker/res/values/config.xml18
-rw-r--r--WallpaperPicker/res/values/dimens.xml (renamed from wallpaper_picker_res/values/dimens.xml)0
-rw-r--r--WallpaperPicker/res/values/strings.xml (renamed from wallpaper_picker_res/values/strings.xml)0
-rw-r--r--WallpaperPicker/res/values/styles.xml (renamed from wallpaper_picker_res/values/styles.xml)0
-rw-r--r--WallpaperPicker/src/android/util/Pools.java (renamed from wallpaper_picker_src/android/util/Pools.java)0
-rw-r--r--WallpaperPicker/src/com/android/gallery3d/common/BitmapUtils.java (renamed from wallpaper_picker_src/com/android/gallery3d/common/BitmapUtils.java)0
-rw-r--r--WallpaperPicker/src/com/android/gallery3d/common/Utils.java (renamed from wallpaper_picker_src/com/android/gallery3d/common/Utils.java)0
-rw-r--r--WallpaperPicker/src/com/android/gallery3d/exif/ByteBufferInputStream.java (renamed from wallpaper_picker_src/com/android/gallery3d/exif/ByteBufferInputStream.java)0
-rw-r--r--WallpaperPicker/src/com/android/gallery3d/exif/CountedDataInputStream.java (renamed from wallpaper_picker_src/com/android/gallery3d/exif/CountedDataInputStream.java)0
-rw-r--r--WallpaperPicker/src/com/android/gallery3d/exif/ExifData.java (renamed from wallpaper_picker_src/com/android/gallery3d/exif/ExifData.java)0
-rw-r--r--WallpaperPicker/src/com/android/gallery3d/exif/ExifInterface.java (renamed from wallpaper_picker_src/com/android/gallery3d/exif/ExifInterface.java)0
-rw-r--r--WallpaperPicker/src/com/android/gallery3d/exif/ExifInvalidFormatException.java (renamed from wallpaper_picker_src/com/android/gallery3d/exif/ExifInvalidFormatException.java)0
-rw-r--r--WallpaperPicker/src/com/android/gallery3d/exif/ExifModifier.java (renamed from wallpaper_picker_src/com/android/gallery3d/exif/ExifModifier.java)0
-rw-r--r--WallpaperPicker/src/com/android/gallery3d/exif/ExifOutputStream.java (renamed from wallpaper_picker_src/com/android/gallery3d/exif/ExifOutputStream.java)0
-rw-r--r--WallpaperPicker/src/com/android/gallery3d/exif/ExifParser.java (renamed from wallpaper_picker_src/com/android/gallery3d/exif/ExifParser.java)0
-rw-r--r--WallpaperPicker/src/com/android/gallery3d/exif/ExifReader.java (renamed from wallpaper_picker_src/com/android/gallery3d/exif/ExifReader.java)0
-rw-r--r--WallpaperPicker/src/com/android/gallery3d/exif/ExifTag.java (renamed from wallpaper_picker_src/com/android/gallery3d/exif/ExifTag.java)0
-rw-r--r--WallpaperPicker/src/com/android/gallery3d/exif/IfdData.java (renamed from wallpaper_picker_src/com/android/gallery3d/exif/IfdData.java)0
-rw-r--r--WallpaperPicker/src/com/android/gallery3d/exif/IfdId.java (renamed from wallpaper_picker_src/com/android/gallery3d/exif/IfdId.java)0
-rw-r--r--WallpaperPicker/src/com/android/gallery3d/exif/JpegHeader.java (renamed from wallpaper_picker_src/com/android/gallery3d/exif/JpegHeader.java)0
-rw-r--r--WallpaperPicker/src/com/android/gallery3d/exif/OrderedDataOutputStream.java (renamed from wallpaper_picker_src/com/android/gallery3d/exif/OrderedDataOutputStream.java)0
-rw-r--r--WallpaperPicker/src/com/android/gallery3d/exif/Rational.java (renamed from wallpaper_picker_src/com/android/gallery3d/exif/Rational.java)0
-rw-r--r--WallpaperPicker/src/com/android/gallery3d/glrenderer/BasicTexture.java (renamed from wallpaper_picker_src/com/android/gallery3d/glrenderer/BasicTexture.java)0
-rw-r--r--WallpaperPicker/src/com/android/gallery3d/glrenderer/BitmapTexture.java (renamed from wallpaper_picker_src/com/android/gallery3d/glrenderer/BitmapTexture.java)0
-rw-r--r--WallpaperPicker/src/com/android/gallery3d/glrenderer/GLCanvas.java (renamed from wallpaper_picker_src/com/android/gallery3d/glrenderer/GLCanvas.java)0
-rw-r--r--WallpaperPicker/src/com/android/gallery3d/glrenderer/GLES20Canvas.java (renamed from wallpaper_picker_src/com/android/gallery3d/glrenderer/GLES20Canvas.java)0
-rw-r--r--WallpaperPicker/src/com/android/gallery3d/glrenderer/GLES20IdImpl.java (renamed from wallpaper_picker_src/com/android/gallery3d/glrenderer/GLES20IdImpl.java)0
-rw-r--r--WallpaperPicker/src/com/android/gallery3d/glrenderer/GLId.java (renamed from wallpaper_picker_src/com/android/gallery3d/glrenderer/GLId.java)0
-rw-r--r--WallpaperPicker/src/com/android/gallery3d/glrenderer/GLPaint.java (renamed from wallpaper_picker_src/com/android/gallery3d/glrenderer/GLPaint.java)0
-rw-r--r--WallpaperPicker/src/com/android/gallery3d/glrenderer/RawTexture.java (renamed from wallpaper_picker_src/com/android/gallery3d/glrenderer/RawTexture.java)0
-rw-r--r--WallpaperPicker/src/com/android/gallery3d/glrenderer/Texture.java (renamed from wallpaper_picker_src/com/android/gallery3d/glrenderer/Texture.java)0
-rw-r--r--WallpaperPicker/src/com/android/gallery3d/glrenderer/UploadedTexture.java (renamed from wallpaper_picker_src/com/android/gallery3d/glrenderer/UploadedTexture.java)0
-rw-r--r--WallpaperPicker/src/com/android/gallery3d/util/IntArray.java (renamed from wallpaper_picker_src/com/android/gallery3d/util/IntArray.java)0
-rw-r--r--WallpaperPicker/src/com/android/launcher3/CheckableFrameLayout.java (renamed from src/com/android/launcher3/CheckableFrameLayout.java)0
-rw-r--r--WallpaperPicker/src/com/android/launcher3/CropView.java (renamed from wallpaper_picker_src/com/android/launcher3/CropView.java)0
-rw-r--r--WallpaperPicker/src/com/android/launcher3/DrawableTileSource.java (renamed from wallpaper_picker_src/com/android/launcher3/DrawableTileSource.java)0
-rw-r--r--WallpaperPicker/src/com/android/launcher3/LiveWallpaperListAdapter.java (renamed from wallpaper_picker_src/com/android/launcher3/LiveWallpaperListAdapter.java)3
-rw-r--r--WallpaperPicker/src/com/android/launcher3/SavedWallpaperImages.java (renamed from wallpaper_picker_src/com/android/launcher3/SavedWallpaperImages.java)0
-rw-r--r--WallpaperPicker/src/com/android/launcher3/ThirdPartyWallpaperPickerListAdapter.java (renamed from wallpaper_picker_src/com/android/launcher3/ThirdPartyWallpaperPickerListAdapter.java)4
-rw-r--r--WallpaperPicker/src/com/android/launcher3/WallpaperCropActivity.java (renamed from wallpaper_picker_src/com/android/launcher3/WallpaperCropActivity.java)0
-rw-r--r--WallpaperPicker/src/com/android/launcher3/WallpaperPickerActivity.java (renamed from wallpaper_picker_src/com/android/launcher3/WallpaperPickerActivity.java)34
-rw-r--r--WallpaperPicker/src/com/android/launcher3/WallpaperRootView.java (renamed from wallpaper_picker_src/com/android/launcher3/WallpaperRootView.java)0
-rw-r--r--WallpaperPicker/src/com/android/photos/BitmapRegionTileSource.java (renamed from wallpaper_picker_src/com/android/photos/BitmapRegionTileSource.java)0
-rw-r--r--WallpaperPicker/src/com/android/photos/views/BlockingGLTextureView.java (renamed from wallpaper_picker_src/com/android/photos/views/BlockingGLTextureView.java)0
-rw-r--r--WallpaperPicker/src/com/android/photos/views/TiledImageRenderer.java (renamed from wallpaper_picker_src/com/android/photos/views/TiledImageRenderer.java)0
-rw-r--r--WallpaperPicker/src/com/android/photos/views/TiledImageView.java (renamed from wallpaper_picker_src/com/android/photos/views/TiledImageView.java)0
-rw-r--r--src/com/android/launcher3/Launcher.java2
-rw-r--r--src/com/android/launcher3/LauncherWallpaperPickerActivity.java30
-rw-r--r--src/com/android/launcher3/Utilities.java16
-rw-r--r--src/com/android/launcher3/Workspace.java2
-rw-r--r--update_system_wallpaper_cropper.py2
100 files changed, 122 insertions, 27 deletions
diff --git a/Android.mk b/Android.mk
index 840b161..dbce33f 100644
--- a/Android.mk
+++ b/Android.mk
@@ -26,10 +26,10 @@ 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-java-files-under, WallpaperPicker/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_RESOURCE_DIR := $(LOCAL_PATH)/WallpaperPicker/res $(LOCAL_PATH)/res
LOCAL_AAPT_FLAGS := --auto-add-overlay
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 1e418ec..4e27e6f 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -104,7 +104,7 @@
</activity>
<activity
- android:name="com.android.launcher3.WallpaperPickerActivity"
+ android:name="com.android.launcher3.LauncherWallpaperPickerActivity"
android:theme="@style/Theme.WallpaperCropper"
android:label="@string/pick_wallpaper"
android:icon="@mipmap/ic_launcher_wallpaper"
diff --git a/WallpaperPicker/AndroidManifest.xml b/WallpaperPicker/AndroidManifest.xml
new file mode 100644
index 0000000..86a94d0
--- /dev/null
+++ b/WallpaperPicker/AndroidManifest.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+ package="com.android.launcher3"
+ android:versionCode="1"
+ android:versionName="1.0"
+ >
+
+ <uses-sdk android:minSdkVersion="15" android:targetSdkVersion="19" />
+
+</manifest>
diff --git a/WallpaperPicker/README b/WallpaperPicker/README
new file mode 100644
index 0000000..d8efb07
--- /dev/null
+++ b/WallpaperPicker/README
@@ -0,0 +1,4 @@
+This project contains the wallpaper picker for Launcher3. It's in a separate
+folder to organize the code separately from the rest of the launcher, and has
+a manifest so that a separate Eclipse project can exist for the wallpaper
+picker (necessary to have the Eclipse build work) \ No newline at end of file
diff --git a/wallpaper_picker_res/drawable-hdpi/ic_actionbar_accept.png b/WallpaperPicker/res/drawable-hdpi/ic_actionbar_accept.png
index 53cf687..53cf687 100755
--- a/wallpaper_picker_res/drawable-hdpi/ic_actionbar_accept.png
+++ b/WallpaperPicker/res/drawable-hdpi/ic_actionbar_accept.png
Binary files differ
diff --git a/wallpaper_picker_res/drawable-hdpi/ic_images.png b/WallpaperPicker/res/drawable-hdpi/ic_images.png
index 0003c6c..0003c6c 100644
--- a/wallpaper_picker_res/drawable-hdpi/ic_images.png
+++ b/WallpaperPicker/res/drawable-hdpi/ic_images.png
Binary files differ
diff --git a/wallpaper_picker_res/drawable-hdpi/tile_picker_focused.9.png b/WallpaperPicker/res/drawable-hdpi/tile_picker_focused.9.png
index c72d6a2..c72d6a2 100644
--- a/wallpaper_picker_res/drawable-hdpi/tile_picker_focused.9.png
+++ b/WallpaperPicker/res/drawable-hdpi/tile_picker_focused.9.png
Binary files differ
diff --git a/wallpaper_picker_res/drawable-hdpi/tile_picker_pressed.9.png b/WallpaperPicker/res/drawable-hdpi/tile_picker_pressed.9.png
index 44c65ac..44c65ac 100644
--- a/wallpaper_picker_res/drawable-hdpi/tile_picker_pressed.9.png
+++ b/WallpaperPicker/res/drawable-hdpi/tile_picker_pressed.9.png
Binary files differ
diff --git a/wallpaper_picker_res/drawable-hdpi/tile_picker_selected.9.png b/WallpaperPicker/res/drawable-hdpi/tile_picker_selected.9.png
index 461bacb..461bacb 100644
--- a/wallpaper_picker_res/drawable-hdpi/tile_picker_selected.9.png
+++ b/WallpaperPicker/res/drawable-hdpi/tile_picker_selected.9.png
Binary files differ
diff --git a/wallpaper_picker_res/drawable-hdpi/tile_shadow_bottom.9.png b/WallpaperPicker/res/drawable-hdpi/tile_shadow_bottom.9.png
index e80558b..e80558b 100644
--- a/wallpaper_picker_res/drawable-hdpi/tile_shadow_bottom.9.png
+++ b/WallpaperPicker/res/drawable-hdpi/tile_shadow_bottom.9.png
Binary files differ
diff --git a/wallpaper_picker_res/drawable-hdpi/tile_shadow_top.9.png b/WallpaperPicker/res/drawable-hdpi/tile_shadow_top.9.png
index 7e93865..7e93865 100644
--- a/wallpaper_picker_res/drawable-hdpi/tile_shadow_top.9.png
+++ b/WallpaperPicker/res/drawable-hdpi/tile_shadow_top.9.png
Binary files differ
diff --git a/wallpaper_picker_res/drawable-mdpi/ic_actionbar_accept.png b/WallpaperPicker/res/drawable-mdpi/ic_actionbar_accept.png
index 35cda8e..35cda8e 100755
--- a/wallpaper_picker_res/drawable-mdpi/ic_actionbar_accept.png
+++ b/WallpaperPicker/res/drawable-mdpi/ic_actionbar_accept.png
Binary files differ
diff --git a/wallpaper_picker_res/drawable-mdpi/ic_images.png b/WallpaperPicker/res/drawable-mdpi/ic_images.png
index aabc123..aabc123 100644
--- a/wallpaper_picker_res/drawable-mdpi/ic_images.png
+++ b/WallpaperPicker/res/drawable-mdpi/ic_images.png
Binary files differ
diff --git a/wallpaper_picker_res/drawable-mdpi/tile_picker_focused.9.png b/WallpaperPicker/res/drawable-mdpi/tile_picker_focused.9.png
index 13b325b..13b325b 100644
--- a/wallpaper_picker_res/drawable-mdpi/tile_picker_focused.9.png
+++ b/WallpaperPicker/res/drawable-mdpi/tile_picker_focused.9.png
Binary files differ
diff --git a/wallpaper_picker_res/drawable-mdpi/tile_picker_pressed.9.png b/WallpaperPicker/res/drawable-mdpi/tile_picker_pressed.9.png
index 4e8196d..4e8196d 100644
--- a/wallpaper_picker_res/drawable-mdpi/tile_picker_pressed.9.png
+++ b/WallpaperPicker/res/drawable-mdpi/tile_picker_pressed.9.png
Binary files differ
diff --git a/wallpaper_picker_res/drawable-mdpi/tile_picker_selected.9.png b/WallpaperPicker/res/drawable-mdpi/tile_picker_selected.9.png
index eee69ec..eee69ec 100644
--- a/wallpaper_picker_res/drawable-mdpi/tile_picker_selected.9.png
+++ b/WallpaperPicker/res/drawable-mdpi/tile_picker_selected.9.png
Binary files differ
diff --git a/wallpaper_picker_res/drawable-mdpi/tile_shadow_bottom.9.png b/WallpaperPicker/res/drawable-mdpi/tile_shadow_bottom.9.png
index d95787b..d95787b 100644
--- a/wallpaper_picker_res/drawable-mdpi/tile_shadow_bottom.9.png
+++ b/WallpaperPicker/res/drawable-mdpi/tile_shadow_bottom.9.png
Binary files differ
diff --git a/wallpaper_picker_res/drawable-mdpi/tile_shadow_top.9.png b/WallpaperPicker/res/drawable-mdpi/tile_shadow_top.9.png
index 8da913c..8da913c 100644
--- a/wallpaper_picker_res/drawable-mdpi/tile_shadow_top.9.png
+++ b/WallpaperPicker/res/drawable-mdpi/tile_shadow_top.9.png
Binary files differ
diff --git a/wallpaper_picker_res/drawable-xhdpi/ic_actionbar_accept.png b/WallpaperPicker/res/drawable-xhdpi/ic_actionbar_accept.png
index b52dc37..b52dc37 100755
--- a/wallpaper_picker_res/drawable-xhdpi/ic_actionbar_accept.png
+++ b/WallpaperPicker/res/drawable-xhdpi/ic_actionbar_accept.png
Binary files differ
diff --git a/wallpaper_picker_res/drawable-xhdpi/ic_images.png b/WallpaperPicker/res/drawable-xhdpi/ic_images.png
index 3f21faf..3f21faf 100644
--- a/wallpaper_picker_res/drawable-xhdpi/ic_images.png
+++ b/WallpaperPicker/res/drawable-xhdpi/ic_images.png
Binary files differ
diff --git a/wallpaper_picker_res/drawable-xhdpi/tile_picker_focused.9.png b/WallpaperPicker/res/drawable-xhdpi/tile_picker_focused.9.png
index 279e859..279e859 100644
--- a/wallpaper_picker_res/drawable-xhdpi/tile_picker_focused.9.png
+++ b/WallpaperPicker/res/drawable-xhdpi/tile_picker_focused.9.png
Binary files differ
diff --git a/wallpaper_picker_res/drawable-xhdpi/tile_picker_pressed.9.png b/WallpaperPicker/res/drawable-xhdpi/tile_picker_pressed.9.png
index abe0e00..abe0e00 100644
--- a/wallpaper_picker_res/drawable-xhdpi/tile_picker_pressed.9.png
+++ b/WallpaperPicker/res/drawable-xhdpi/tile_picker_pressed.9.png
Binary files differ
diff --git a/wallpaper_picker_res/drawable-xhdpi/tile_picker_selected.9.png b/WallpaperPicker/res/drawable-xhdpi/tile_picker_selected.9.png
index b047591..b047591 100644
--- a/wallpaper_picker_res/drawable-xhdpi/tile_picker_selected.9.png
+++ b/WallpaperPicker/res/drawable-xhdpi/tile_picker_selected.9.png
Binary files differ
diff --git a/wallpaper_picker_res/drawable-xhdpi/tile_shadow_bottom.9.png b/WallpaperPicker/res/drawable-xhdpi/tile_shadow_bottom.9.png
index 81571f3..81571f3 100644
--- a/wallpaper_picker_res/drawable-xhdpi/tile_shadow_bottom.9.png
+++ b/WallpaperPicker/res/drawable-xhdpi/tile_shadow_bottom.9.png
Binary files differ
diff --git a/wallpaper_picker_res/drawable-xhdpi/tile_shadow_top.9.png b/WallpaperPicker/res/drawable-xhdpi/tile_shadow_top.9.png
index 8503a59..8503a59 100644
--- a/wallpaper_picker_res/drawable-xhdpi/tile_shadow_top.9.png
+++ b/WallpaperPicker/res/drawable-xhdpi/tile_shadow_top.9.png
Binary files differ
diff --git a/wallpaper_picker_res/drawable-xxhdpi/ic_images.png b/WallpaperPicker/res/drawable-xxhdpi/ic_images.png
index d00db9a..d00db9a 100644
--- a/wallpaper_picker_res/drawable-xxhdpi/ic_images.png
+++ b/WallpaperPicker/res/drawable-xxhdpi/ic_images.png
Binary files differ
diff --git a/wallpaper_picker_res/drawable-xxhdpi/tile_picker_focused.9.png b/WallpaperPicker/res/drawable-xxhdpi/tile_picker_focused.9.png
index 1004c14..1004c14 100644
--- a/wallpaper_picker_res/drawable-xxhdpi/tile_picker_focused.9.png
+++ b/WallpaperPicker/res/drawable-xxhdpi/tile_picker_focused.9.png
Binary files differ
diff --git a/wallpaper_picker_res/drawable-xxhdpi/tile_picker_pressed.9.png b/WallpaperPicker/res/drawable-xxhdpi/tile_picker_pressed.9.png
index 9658444..9658444 100644
--- a/wallpaper_picker_res/drawable-xxhdpi/tile_picker_pressed.9.png
+++ b/WallpaperPicker/res/drawable-xxhdpi/tile_picker_pressed.9.png
Binary files differ
diff --git a/wallpaper_picker_res/drawable-xxhdpi/tile_picker_selected.9.png b/WallpaperPicker/res/drawable-xxhdpi/tile_picker_selected.9.png
index a3cd303..a3cd303 100644
--- a/wallpaper_picker_res/drawable-xxhdpi/tile_picker_selected.9.png
+++ b/WallpaperPicker/res/drawable-xxhdpi/tile_picker_selected.9.png
Binary files differ
diff --git a/wallpaper_picker_res/drawable-xxhdpi/tile_shadow_bottom.9.png b/WallpaperPicker/res/drawable-xxhdpi/tile_shadow_bottom.9.png
index 55250f0..55250f0 100644
--- a/wallpaper_picker_res/drawable-xxhdpi/tile_shadow_bottom.9.png
+++ b/WallpaperPicker/res/drawable-xxhdpi/tile_shadow_bottom.9.png
Binary files differ
diff --git a/wallpaper_picker_res/drawable-xxhdpi/tile_shadow_top.9.png b/WallpaperPicker/res/drawable-xxhdpi/tile_shadow_top.9.png
index 3f22633..3f22633 100644
--- a/wallpaper_picker_res/drawable-xxhdpi/tile_shadow_top.9.png
+++ b/WallpaperPicker/res/drawable-xxhdpi/tile_shadow_top.9.png
Binary files differ
diff --git a/wallpaper_picker_res/drawable/wallpaper_tile_fg.xml b/WallpaperPicker/res/drawable/wallpaper_tile_fg.xml
index c299f32..c299f32 100644
--- a/wallpaper_picker_res/drawable/wallpaper_tile_fg.xml
+++ b/WallpaperPicker/res/drawable/wallpaper_tile_fg.xml
diff --git a/wallpaper_picker_res/layout/actionbar_set_wallpaper.xml b/WallpaperPicker/res/layout/actionbar_set_wallpaper.xml
index 1622742..1622742 100644
--- a/wallpaper_picker_res/layout/actionbar_set_wallpaper.xml
+++ b/WallpaperPicker/res/layout/actionbar_set_wallpaper.xml
diff --git a/wallpaper_picker_res/layout/wallpaper_cropper.xml b/WallpaperPicker/res/layout/wallpaper_cropper.xml
index abb8608..abb8608 100644
--- a/wallpaper_picker_res/layout/wallpaper_cropper.xml
+++ b/WallpaperPicker/res/layout/wallpaper_cropper.xml
diff --git a/wallpaper_picker_res/layout/wallpaper_picker.xml b/WallpaperPicker/res/layout/wallpaper_picker.xml
index c36493d..c36493d 100644
--- a/wallpaper_picker_res/layout/wallpaper_picker.xml
+++ b/WallpaperPicker/res/layout/wallpaper_picker.xml
diff --git a/wallpaper_picker_res/layout/wallpaper_picker_image_picker_item.xml b/WallpaperPicker/res/layout/wallpaper_picker_image_picker_item.xml
index ae3c43d..ae3c43d 100644
--- a/wallpaper_picker_res/layout/wallpaper_picker_image_picker_item.xml
+++ b/WallpaperPicker/res/layout/wallpaper_picker_image_picker_item.xml
diff --git a/wallpaper_picker_res/layout/wallpaper_picker_item.xml b/WallpaperPicker/res/layout/wallpaper_picker_item.xml
index 0ac8f97..0ac8f97 100644
--- a/wallpaper_picker_res/layout/wallpaper_picker_item.xml
+++ b/WallpaperPicker/res/layout/wallpaper_picker_item.xml
diff --git a/wallpaper_picker_res/layout/wallpaper_picker_live_wallpaper_item.xml b/WallpaperPicker/res/layout/wallpaper_picker_live_wallpaper_item.xml
index 29fdb1b..29fdb1b 100644
--- a/wallpaper_picker_res/layout/wallpaper_picker_live_wallpaper_item.xml
+++ b/WallpaperPicker/res/layout/wallpaper_picker_live_wallpaper_item.xml
diff --git a/wallpaper_picker_res/layout/wallpaper_picker_third_party_item.xml b/WallpaperPicker/res/layout/wallpaper_picker_third_party_item.xml
index 68661bc..68661bc 100644
--- a/wallpaper_picker_res/layout/wallpaper_picker_third_party_item.xml
+++ b/WallpaperPicker/res/layout/wallpaper_picker_third_party_item.xml
diff --git a/wallpaper_picker_res/menu/cab_delete_wallpapers.xml b/WallpaperPicker/res/menu/cab_delete_wallpapers.xml
index 38ac5c4..38ac5c4 100644
--- a/wallpaper_picker_res/menu/cab_delete_wallpapers.xml
+++ b/WallpaperPicker/res/menu/cab_delete_wallpapers.xml
diff --git a/wallpaper_picker_res/mipmap-hdpi/ic_launcher_wallpaper.png b/WallpaperPicker/res/mipmap-hdpi/ic_launcher_wallpaper.png
index affee85..affee85 100644
--- a/wallpaper_picker_res/mipmap-hdpi/ic_launcher_wallpaper.png
+++ b/WallpaperPicker/res/mipmap-hdpi/ic_launcher_wallpaper.png
Binary files differ
diff --git a/wallpaper_picker_res/mipmap-mdpi/ic_launcher_wallpaper.png b/WallpaperPicker/res/mipmap-mdpi/ic_launcher_wallpaper.png
index cb4443b..cb4443b 100644
--- a/wallpaper_picker_res/mipmap-mdpi/ic_launcher_wallpaper.png
+++ b/WallpaperPicker/res/mipmap-mdpi/ic_launcher_wallpaper.png
Binary files differ
diff --git a/wallpaper_picker_res/mipmap-xhdpi/ic_launcher_wallpaper.png b/WallpaperPicker/res/mipmap-xhdpi/ic_launcher_wallpaper.png
index 60f8dce..60f8dce 100644
--- a/wallpaper_picker_res/mipmap-xhdpi/ic_launcher_wallpaper.png
+++ b/WallpaperPicker/res/mipmap-xhdpi/ic_launcher_wallpaper.png
Binary files differ
diff --git a/wallpaper_picker_res/mipmap-xxhdpi/ic_launcher_wallpaper.png b/WallpaperPicker/res/mipmap-xxhdpi/ic_launcher_wallpaper.png
index 023fb58..023fb58 100644
--- a/wallpaper_picker_res/mipmap-xxhdpi/ic_launcher_wallpaper.png
+++ b/WallpaperPicker/res/mipmap-xxhdpi/ic_launcher_wallpaper.png
Binary files differ
diff --git a/wallpaper_picker_res/values-nodpi/wallpapers.xml b/WallpaperPicker/res/values-nodpi/wallpapers.xml
index 1e340e4..1e340e4 100644
--- a/wallpaper_picker_res/values-nodpi/wallpapers.xml
+++ b/WallpaperPicker/res/values-nodpi/wallpapers.xml
diff --git a/WallpaperPicker/res/values-sw600dp/config.xml b/WallpaperPicker/res/values-sw600dp/config.xml
new file mode 100644
index 0000000..62342dc
--- /dev/null
+++ b/WallpaperPicker/res/values-sw600dp/config.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2013 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<resources>
+ <bool name="allow_rotation">true</bool>
+</resources>
diff --git a/wallpaper_picker_res/values-sw720dp/dimens.xml b/WallpaperPicker/res/values-sw720dp/dimens.xml
index 9ae155b..9ae155b 100644
--- a/wallpaper_picker_res/values-sw720dp/dimens.xml
+++ b/WallpaperPicker/res/values-sw720dp/dimens.xml
diff --git a/wallpaper_picker_res/values-sw720dp/styles.xml b/WallpaperPicker/res/values-sw720dp/styles.xml
index 9107851..9107851 100644
--- a/wallpaper_picker_res/values-sw720dp/styles.xml
+++ b/WallpaperPicker/res/values-sw720dp/styles.xml
diff --git a/wallpaper_picker_res/values/colors.xml b/WallpaperPicker/res/values/colors.xml
index adae7cf..adae7cf 100644
--- a/wallpaper_picker_res/values/colors.xml
+++ b/WallpaperPicker/res/values/colors.xml
diff --git a/WallpaperPicker/res/values/config.xml b/WallpaperPicker/res/values/config.xml
new file mode 100644
index 0000000..1b24190
--- /dev/null
+++ b/WallpaperPicker/res/values/config.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2013 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<resources>
+ <bool name="allow_rotation">false</bool>
+</resources>
diff --git a/wallpaper_picker_res/values/dimens.xml b/WallpaperPicker/res/values/dimens.xml
index 0447c6d..0447c6d 100644
--- a/wallpaper_picker_res/values/dimens.xml
+++ b/WallpaperPicker/res/values/dimens.xml
diff --git a/wallpaper_picker_res/values/strings.xml b/WallpaperPicker/res/values/strings.xml
index 1ee3513..1ee3513 100644
--- a/wallpaper_picker_res/values/strings.xml
+++ b/WallpaperPicker/res/values/strings.xml
diff --git a/wallpaper_picker_res/values/styles.xml b/WallpaperPicker/res/values/styles.xml
index 0e48dda..0e48dda 100644
--- a/wallpaper_picker_res/values/styles.xml
+++ b/WallpaperPicker/res/values/styles.xml
diff --git a/wallpaper_picker_src/android/util/Pools.java b/WallpaperPicker/src/android/util/Pools.java
index 40bab1e..40bab1e 100644
--- a/wallpaper_picker_src/android/util/Pools.java
+++ b/WallpaperPicker/src/android/util/Pools.java
diff --git a/wallpaper_picker_src/com/android/gallery3d/common/BitmapUtils.java b/WallpaperPicker/src/com/android/gallery3d/common/BitmapUtils.java
index a671ed2..a671ed2 100644
--- a/wallpaper_picker_src/com/android/gallery3d/common/BitmapUtils.java
+++ b/WallpaperPicker/src/com/android/gallery3d/common/BitmapUtils.java
diff --git a/wallpaper_picker_src/com/android/gallery3d/common/Utils.java b/WallpaperPicker/src/com/android/gallery3d/common/Utils.java
index 614a081..614a081 100644
--- a/wallpaper_picker_src/com/android/gallery3d/common/Utils.java
+++ b/WallpaperPicker/src/com/android/gallery3d/common/Utils.java
diff --git a/wallpaper_picker_src/com/android/gallery3d/exif/ByteBufferInputStream.java b/WallpaperPicker/src/com/android/gallery3d/exif/ByteBufferInputStream.java
index 7fb9f22..7fb9f22 100644
--- a/wallpaper_picker_src/com/android/gallery3d/exif/ByteBufferInputStream.java
+++ b/WallpaperPicker/src/com/android/gallery3d/exif/ByteBufferInputStream.java
diff --git a/wallpaper_picker_src/com/android/gallery3d/exif/CountedDataInputStream.java b/WallpaperPicker/src/com/android/gallery3d/exif/CountedDataInputStream.java
index dfd4a1a..dfd4a1a 100644
--- a/wallpaper_picker_src/com/android/gallery3d/exif/CountedDataInputStream.java
+++ b/WallpaperPicker/src/com/android/gallery3d/exif/CountedDataInputStream.java
diff --git a/wallpaper_picker_src/com/android/gallery3d/exif/ExifData.java b/WallpaperPicker/src/com/android/gallery3d/exif/ExifData.java
index 8422382..8422382 100644
--- a/wallpaper_picker_src/com/android/gallery3d/exif/ExifData.java
+++ b/WallpaperPicker/src/com/android/gallery3d/exif/ExifData.java
diff --git a/wallpaper_picker_src/com/android/gallery3d/exif/ExifInterface.java b/WallpaperPicker/src/com/android/gallery3d/exif/ExifInterface.java
index a1cf0fc..a1cf0fc 100644
--- a/wallpaper_picker_src/com/android/gallery3d/exif/ExifInterface.java
+++ b/WallpaperPicker/src/com/android/gallery3d/exif/ExifInterface.java
diff --git a/wallpaper_picker_src/com/android/gallery3d/exif/ExifInvalidFormatException.java b/WallpaperPicker/src/com/android/gallery3d/exif/ExifInvalidFormatException.java
index bf923ec..bf923ec 100644
--- a/wallpaper_picker_src/com/android/gallery3d/exif/ExifInvalidFormatException.java
+++ b/WallpaperPicker/src/com/android/gallery3d/exif/ExifInvalidFormatException.java
diff --git a/wallpaper_picker_src/com/android/gallery3d/exif/ExifModifier.java b/WallpaperPicker/src/com/android/gallery3d/exif/ExifModifier.java
index f00362b..f00362b 100644
--- a/wallpaper_picker_src/com/android/gallery3d/exif/ExifModifier.java
+++ b/WallpaperPicker/src/com/android/gallery3d/exif/ExifModifier.java
diff --git a/wallpaper_picker_src/com/android/gallery3d/exif/ExifOutputStream.java b/WallpaperPicker/src/com/android/gallery3d/exif/ExifOutputStream.java
index 7ca05f2..7ca05f2 100644
--- a/wallpaper_picker_src/com/android/gallery3d/exif/ExifOutputStream.java
+++ b/WallpaperPicker/src/com/android/gallery3d/exif/ExifOutputStream.java
diff --git a/wallpaper_picker_src/com/android/gallery3d/exif/ExifParser.java b/WallpaperPicker/src/com/android/gallery3d/exif/ExifParser.java
index 5467d42..5467d42 100644
--- a/wallpaper_picker_src/com/android/gallery3d/exif/ExifParser.java
+++ b/WallpaperPicker/src/com/android/gallery3d/exif/ExifParser.java
diff --git a/wallpaper_picker_src/com/android/gallery3d/exif/ExifReader.java b/WallpaperPicker/src/com/android/gallery3d/exif/ExifReader.java
index 68e972f..68e972f 100644
--- a/wallpaper_picker_src/com/android/gallery3d/exif/ExifReader.java
+++ b/WallpaperPicker/src/com/android/gallery3d/exif/ExifReader.java
diff --git a/wallpaper_picker_src/com/android/gallery3d/exif/ExifTag.java b/WallpaperPicker/src/com/android/gallery3d/exif/ExifTag.java
index b8b3872..b8b3872 100644
--- a/wallpaper_picker_src/com/android/gallery3d/exif/ExifTag.java
+++ b/WallpaperPicker/src/com/android/gallery3d/exif/ExifTag.java
diff --git a/wallpaper_picker_src/com/android/gallery3d/exif/IfdData.java b/WallpaperPicker/src/com/android/gallery3d/exif/IfdData.java
index 093944a..093944a 100644
--- a/wallpaper_picker_src/com/android/gallery3d/exif/IfdData.java
+++ b/WallpaperPicker/src/com/android/gallery3d/exif/IfdData.java
diff --git a/wallpaper_picker_src/com/android/gallery3d/exif/IfdId.java b/WallpaperPicker/src/com/android/gallery3d/exif/IfdId.java
index 7842edb..7842edb 100644
--- a/wallpaper_picker_src/com/android/gallery3d/exif/IfdId.java
+++ b/WallpaperPicker/src/com/android/gallery3d/exif/IfdId.java
diff --git a/wallpaper_picker_src/com/android/gallery3d/exif/JpegHeader.java b/WallpaperPicker/src/com/android/gallery3d/exif/JpegHeader.java
index e3e787e..e3e787e 100644
--- a/wallpaper_picker_src/com/android/gallery3d/exif/JpegHeader.java
+++ b/WallpaperPicker/src/com/android/gallery3d/exif/JpegHeader.java
diff --git a/wallpaper_picker_src/com/android/gallery3d/exif/OrderedDataOutputStream.java b/WallpaperPicker/src/com/android/gallery3d/exif/OrderedDataOutputStream.java
index 428e6b9..428e6b9 100644
--- a/wallpaper_picker_src/com/android/gallery3d/exif/OrderedDataOutputStream.java
+++ b/WallpaperPicker/src/com/android/gallery3d/exif/OrderedDataOutputStream.java
diff --git a/wallpaper_picker_src/com/android/gallery3d/exif/Rational.java b/WallpaperPicker/src/com/android/gallery3d/exif/Rational.java
index 591d63f..591d63f 100644
--- a/wallpaper_picker_src/com/android/gallery3d/exif/Rational.java
+++ b/WallpaperPicker/src/com/android/gallery3d/exif/Rational.java
diff --git a/wallpaper_picker_src/com/android/gallery3d/glrenderer/BasicTexture.java b/WallpaperPicker/src/com/android/gallery3d/glrenderer/BasicTexture.java
index 2e77b90..2e77b90 100644
--- a/wallpaper_picker_src/com/android/gallery3d/glrenderer/BasicTexture.java
+++ b/WallpaperPicker/src/com/android/gallery3d/glrenderer/BasicTexture.java
diff --git a/wallpaper_picker_src/com/android/gallery3d/glrenderer/BitmapTexture.java b/WallpaperPicker/src/com/android/gallery3d/glrenderer/BitmapTexture.java
index 100b0b3..100b0b3 100644
--- a/wallpaper_picker_src/com/android/gallery3d/glrenderer/BitmapTexture.java
+++ b/WallpaperPicker/src/com/android/gallery3d/glrenderer/BitmapTexture.java
diff --git a/wallpaper_picker_src/com/android/gallery3d/glrenderer/GLCanvas.java b/WallpaperPicker/src/com/android/gallery3d/glrenderer/GLCanvas.java
index 305e905..305e905 100644
--- a/wallpaper_picker_src/com/android/gallery3d/glrenderer/GLCanvas.java
+++ b/WallpaperPicker/src/com/android/gallery3d/glrenderer/GLCanvas.java
diff --git a/wallpaper_picker_src/com/android/gallery3d/glrenderer/GLES20Canvas.java b/WallpaperPicker/src/com/android/gallery3d/glrenderer/GLES20Canvas.java
index 4ead131..4ead131 100644
--- a/wallpaper_picker_src/com/android/gallery3d/glrenderer/GLES20Canvas.java
+++ b/WallpaperPicker/src/com/android/gallery3d/glrenderer/GLES20Canvas.java
diff --git a/wallpaper_picker_src/com/android/gallery3d/glrenderer/GLES20IdImpl.java b/WallpaperPicker/src/com/android/gallery3d/glrenderer/GLES20IdImpl.java
index 6cd7149..6cd7149 100644
--- a/wallpaper_picker_src/com/android/gallery3d/glrenderer/GLES20IdImpl.java
+++ b/WallpaperPicker/src/com/android/gallery3d/glrenderer/GLES20IdImpl.java
diff --git a/wallpaper_picker_src/com/android/gallery3d/glrenderer/GLId.java b/WallpaperPicker/src/com/android/gallery3d/glrenderer/GLId.java
index 3cec558..3cec558 100644
--- a/wallpaper_picker_src/com/android/gallery3d/glrenderer/GLId.java
+++ b/WallpaperPicker/src/com/android/gallery3d/glrenderer/GLId.java
diff --git a/wallpaper_picker_src/com/android/gallery3d/glrenderer/GLPaint.java b/WallpaperPicker/src/com/android/gallery3d/glrenderer/GLPaint.java
index 16b2206..16b2206 100644
--- a/wallpaper_picker_src/com/android/gallery3d/glrenderer/GLPaint.java
+++ b/WallpaperPicker/src/com/android/gallery3d/glrenderer/GLPaint.java
diff --git a/wallpaper_picker_src/com/android/gallery3d/glrenderer/RawTexture.java b/WallpaperPicker/src/com/android/gallery3d/glrenderer/RawTexture.java
index 93f0fdf..93f0fdf 100644
--- a/wallpaper_picker_src/com/android/gallery3d/glrenderer/RawTexture.java
+++ b/WallpaperPicker/src/com/android/gallery3d/glrenderer/RawTexture.java
diff --git a/wallpaper_picker_src/com/android/gallery3d/glrenderer/Texture.java b/WallpaperPicker/src/com/android/gallery3d/glrenderer/Texture.java
index 3dcae4a..3dcae4a 100644
--- a/wallpaper_picker_src/com/android/gallery3d/glrenderer/Texture.java
+++ b/WallpaperPicker/src/com/android/gallery3d/glrenderer/Texture.java
diff --git a/wallpaper_picker_src/com/android/gallery3d/glrenderer/UploadedTexture.java b/WallpaperPicker/src/com/android/gallery3d/glrenderer/UploadedTexture.java
index f41a979..f41a979 100644
--- a/wallpaper_picker_src/com/android/gallery3d/glrenderer/UploadedTexture.java
+++ b/WallpaperPicker/src/com/android/gallery3d/glrenderer/UploadedTexture.java
diff --git a/wallpaper_picker_src/com/android/gallery3d/util/IntArray.java b/WallpaperPicker/src/com/android/gallery3d/util/IntArray.java
index 2c4dc2c..2c4dc2c 100644
--- a/wallpaper_picker_src/com/android/gallery3d/util/IntArray.java
+++ b/WallpaperPicker/src/com/android/gallery3d/util/IntArray.java
diff --git a/src/com/android/launcher3/CheckableFrameLayout.java b/WallpaperPicker/src/com/android/launcher3/CheckableFrameLayout.java
index 5b7d824..5b7d824 100644
--- a/src/com/android/launcher3/CheckableFrameLayout.java
+++ b/WallpaperPicker/src/com/android/launcher3/CheckableFrameLayout.java
diff --git a/wallpaper_picker_src/com/android/launcher3/CropView.java b/WallpaperPicker/src/com/android/launcher3/CropView.java
index 578b8ea..578b8ea 100644
--- a/wallpaper_picker_src/com/android/launcher3/CropView.java
+++ b/WallpaperPicker/src/com/android/launcher3/CropView.java
diff --git a/wallpaper_picker_src/com/android/launcher3/DrawableTileSource.java b/WallpaperPicker/src/com/android/launcher3/DrawableTileSource.java
index c1f2eff..c1f2eff 100644
--- a/wallpaper_picker_src/com/android/launcher3/DrawableTileSource.java
+++ b/WallpaperPicker/src/com/android/launcher3/DrawableTileSource.java
diff --git a/wallpaper_picker_src/com/android/launcher3/LiveWallpaperListAdapter.java b/WallpaperPicker/src/com/android/launcher3/LiveWallpaperListAdapter.java
index 152a75d..60b2537 100644
--- a/wallpaper_picker_src/com/android/launcher3/LiveWallpaperListAdapter.java
+++ b/WallpaperPicker/src/com/android/launcher3/LiveWallpaperListAdapter.java
@@ -123,8 +123,7 @@ public class LiveWallpaperListAdapter extends BaseAdapter implements ListAdapter
preview.putExtra(WallpaperManager.EXTRA_LIVE_WALLPAPER_COMPONENT,
mInfo.getComponent());
a.onLiveWallpaperPickerLaunch();
- Utilities.startActivityForResultSafely(
- a, preview, WallpaperPickerActivity.PICK_LIVE_WALLPAPER);
+ a.startActivityForResultSafely(preview, WallpaperPickerActivity.PICK_LIVE_WALLPAPER);
}
}
diff --git a/wallpaper_picker_src/com/android/launcher3/SavedWallpaperImages.java b/WallpaperPicker/src/com/android/launcher3/SavedWallpaperImages.java
index 58add70..58add70 100644
--- a/wallpaper_picker_src/com/android/launcher3/SavedWallpaperImages.java
+++ b/WallpaperPicker/src/com/android/launcher3/SavedWallpaperImages.java
diff --git a/wallpaper_picker_src/com/android/launcher3/ThirdPartyWallpaperPickerListAdapter.java b/WallpaperPicker/src/com/android/launcher3/ThirdPartyWallpaperPickerListAdapter.java
index 494694c..7a4d48c 100644
--- a/wallpaper_picker_src/com/android/launcher3/ThirdPartyWallpaperPickerListAdapter.java
+++ b/WallpaperPicker/src/com/android/launcher3/ThirdPartyWallpaperPickerListAdapter.java
@@ -56,8 +56,8 @@ public class ThirdPartyWallpaperPickerListAdapter extends BaseAdapter implements
mResolveInfo.activityInfo.packageName, mResolveInfo.activityInfo.name);
Intent launchIntent = new Intent(Intent.ACTION_SET_WALLPAPER);
launchIntent.setComponent(itemComponentName);
- Utilities.startActivityForResultSafely(
- a, launchIntent, WallpaperPickerActivity.PICK_WALLPAPER_THIRD_PARTY_ACTIVITY);
+ a.startActivityForResultSafely(
+ launchIntent, WallpaperPickerActivity.PICK_WALLPAPER_THIRD_PARTY_ACTIVITY);
}
}
diff --git a/wallpaper_picker_src/com/android/launcher3/WallpaperCropActivity.java b/WallpaperPicker/src/com/android/launcher3/WallpaperCropActivity.java
index b3ef073..b3ef073 100644
--- a/wallpaper_picker_src/com/android/launcher3/WallpaperCropActivity.java
+++ b/WallpaperPicker/src/com/android/launcher3/WallpaperCropActivity.java
diff --git a/wallpaper_picker_src/com/android/launcher3/WallpaperPickerActivity.java b/WallpaperPicker/src/com/android/launcher3/WallpaperPickerActivity.java
index 2da05c9..d3c779f 100644
--- a/wallpaper_picker_src/com/android/launcher3/WallpaperPickerActivity.java
+++ b/WallpaperPicker/src/com/android/launcher3/WallpaperPickerActivity.java
@@ -57,6 +57,7 @@ import android.view.View;
import android.view.View.OnClickListener;
import android.view.View.OnLayoutChangeListener;
import android.view.ViewGroup;
+import android.view.ViewPropertyAnimator;
import android.view.ViewTreeObserver;
import android.view.ViewTreeObserver.OnGlobalLayoutListener;
import android.view.animation.AccelerateInterpolator;
@@ -125,7 +126,7 @@ public class WallpaperPickerActivity extends WallpaperCropActivity {
public void onClick(WallpaperPickerActivity a) {
Intent intent = new Intent(Intent.ACTION_GET_CONTENT);
intent.setType("image/*");
- Utilities.startActivityForResultSafely(a, intent, IMAGE_PICK);
+ a.startActivityForResultSafely(intent, IMAGE_PICK);
}
}
@@ -278,7 +279,7 @@ public class WallpaperPickerActivity extends WallpaperCropActivity {
mCropView = (CropView) findViewById(R.id.cropView);
mWallpaperStrip = findViewById(R.id.wallpaper_strip);
mCropView.setTouchCallback(new CropView.TouchCallback() {
- LauncherViewPropertyAnimator mAnim;
+ ViewPropertyAnimator mAnim;
@Override
public void onTouchDown() {
if (mAnim != null) {
@@ -287,17 +288,14 @@ public class WallpaperPickerActivity extends WallpaperCropActivity {
if (mWallpaperStrip.getAlpha() == 1f) {
mIgnoreNextTap = true;
}
- mAnim = new LauncherViewPropertyAnimator(mWallpaperStrip);
+ mAnim = mWallpaperStrip.animate();
mAnim.alpha(0f)
- .setDuration(150)
- .addListener(new Animator.AnimatorListener() {
- public void onAnimationStart(Animator animator) { }
- public void onAnimationEnd(Animator animator) {
- mWallpaperStrip.setVisibility(View.INVISIBLE);
- }
- public void onAnimationCancel(Animator animator) { }
- public void onAnimationRepeat(Animator animator) { }
- });
+ .setDuration(150)
+ .withEndAction(new Runnable() {
+ public void run() {
+ mWallpaperStrip.setVisibility(View.INVISIBLE);
+ }
+ });
mAnim.setInterpolator(new AccelerateInterpolator(0.75f));
mAnim.start();
}
@@ -314,7 +312,7 @@ public class WallpaperPickerActivity extends WallpaperCropActivity {
mAnim.cancel();
}
mWallpaperStrip.setVisibility(View.VISIBLE);
- mAnim = new LauncherViewPropertyAnimator(mWallpaperStrip);
+ mAnim = mWallpaperStrip.animate();
mAnim.alpha(1f)
.setDuration(150)
.setInterpolator(new DecelerateInterpolator(0.75f));
@@ -576,10 +574,6 @@ public class WallpaperPickerActivity extends WallpaperCropActivity {
}
}
- public boolean enableRotation() {
- return super.enableRotation() || Launcher.sForceEnableRotation;
- }
-
protected Bitmap getThumbnailOfLastPhoto() {
Cursor cursor = MediaStore.Images.Media.query(getContentResolver(),
MediaStore.Images.Media.EXTERNAL_CONTENT_URI,
@@ -1001,4 +995,10 @@ public class WallpaperPickerActivity extends WallpaperCropActivity {
return view;
}
+
+ // In Launcher3, we override this with a method that catches exceptions
+ // from starting activities; didn't want to copy and paste code into here
+ public void startActivityForResultSafely(Intent intent, int requestCode) {
+ startActivityForResult(intent, requestCode);
+ }
}
diff --git a/wallpaper_picker_src/com/android/launcher3/WallpaperRootView.java b/WallpaperPicker/src/com/android/launcher3/WallpaperRootView.java
index ceaa043..ceaa043 100644
--- a/wallpaper_picker_src/com/android/launcher3/WallpaperRootView.java
+++ b/WallpaperPicker/src/com/android/launcher3/WallpaperRootView.java
diff --git a/wallpaper_picker_src/com/android/photos/BitmapRegionTileSource.java b/WallpaperPicker/src/com/android/photos/BitmapRegionTileSource.java
index 8511de2..8511de2 100644
--- a/wallpaper_picker_src/com/android/photos/BitmapRegionTileSource.java
+++ b/WallpaperPicker/src/com/android/photos/BitmapRegionTileSource.java
diff --git a/wallpaper_picker_src/com/android/photos/views/BlockingGLTextureView.java b/WallpaperPicker/src/com/android/photos/views/BlockingGLTextureView.java
index 8a05051..8a05051 100644
--- a/wallpaper_picker_src/com/android/photos/views/BlockingGLTextureView.java
+++ b/WallpaperPicker/src/com/android/photos/views/BlockingGLTextureView.java
diff --git a/wallpaper_picker_src/com/android/photos/views/TiledImageRenderer.java b/WallpaperPicker/src/com/android/photos/views/TiledImageRenderer.java
index c4e493b..c4e493b 100644
--- a/wallpaper_picker_src/com/android/photos/views/TiledImageRenderer.java
+++ b/WallpaperPicker/src/com/android/photos/views/TiledImageRenderer.java
diff --git a/wallpaper_picker_src/com/android/photos/views/TiledImageView.java b/WallpaperPicker/src/com/android/photos/views/TiledImageView.java
index af4199c..af4199c 100644
--- a/wallpaper_picker_src/com/android/photos/views/TiledImageView.java
+++ b/WallpaperPicker/src/com/android/photos/views/TiledImageView.java
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 9485cea..a8dd997 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -2174,7 +2174,7 @@ public class Launcher extends Activity
}
protected ComponentName getWallpaperPickerComponent() {
- return new ComponentName(getPackageName(), WallpaperPickerActivity.class.getName());
+ return new ComponentName(getPackageName(), LauncherWallpaperPickerActivity.class.getName());
}
/**
diff --git a/src/com/android/launcher3/LauncherWallpaperPickerActivity.java b/src/com/android/launcher3/LauncherWallpaperPickerActivity.java
new file mode 100644
index 0000000..10fe013
--- /dev/null
+++ b/src/com/android/launcher3/LauncherWallpaperPickerActivity.java
@@ -0,0 +1,30 @@
+/*
+ * 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.
+ */
+
+package com.android.launcher3;
+
+import android.content.Intent;
+
+public class LauncherWallpaperPickerActivity extends WallpaperPickerActivity {
+ @Override
+ public void startActivityForResultSafely(Intent intent, int requestCode) {
+ Utilities.startActivityForResultSafely(this, intent, requestCode);
+ }
+ @Override
+ public boolean enableRotation() {
+ return Utilities.isRotationEnabled(this);
+ }
+}
diff --git a/src/com/android/launcher3/Utilities.java b/src/com/android/launcher3/Utilities.java
index 9ffd044..cbc9785 100644
--- a/src/com/android/launcher3/Utilities.java
+++ b/src/com/android/launcher3/Utilities.java
@@ -65,6 +65,12 @@ public final class Utilities {
static int sColors[] = { 0xffff0000, 0xff00ff00, 0xff0000ff };
static int sColorIndex = 0;
+
+ // To turn on these properties, type
+ // adb shell setprop log.tag.PROPERTY_NAME [VERBOSE | SUPPRESS]
+ static final String FORCE_ENABLE_ROTATION_PROPERTY = "launcher_force_rotate";
+ public static boolean sForceEnableRotation = isPropertyEnabled(FORCE_ENABLE_ROTATION_PROPERTY);
+
/**
* Returns a FastBitmapDrawable with the icon, accurately sized.
*/
@@ -82,6 +88,16 @@ public final class Utilities {
icon.setBounds(0, 0, sIconTextureWidth, sIconTextureHeight);
}
+ private static boolean isPropertyEnabled(String propertyName) {
+ return Log.isLoggable(propertyName, Log.VERBOSE);
+ }
+
+ public static boolean isRotationEnabled(Context c) {
+ boolean enableRotation = sForceEnableRotation ||
+ c.getResources().getBoolean(R.bool.allow_rotation);
+ return enableRotation;
+ }
+
/**
* Returns a bitmap suitable for the all apps view. Used to convert pre-ICS
* icon bitmaps that are stored in the database (which were 74x74 pixels at hdpi size)
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index 9937fc5..e6550bc 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -1232,7 +1232,7 @@ public class Workspace extends SmoothPagedView
String spKey = WallpaperCropActivity.getSharedPreferencesKey();
SharedPreferences sp =
mLauncher.getSharedPreferences(spKey, Context.MODE_MULTI_PROCESS);
- WallpaperPickerActivity.suggestWallpaperDimension(mLauncher.getResources(),
+ LauncherWallpaperPickerActivity.suggestWallpaperDimension(mLauncher.getResources(),
sp, mLauncher.getWindowManager(), mWallpaperManager);
return null;
}
diff --git a/update_system_wallpaper_cropper.py b/update_system_wallpaper_cropper.py
index 36904f2..44cbcc9 100644
--- a/update_system_wallpaper_cropper.py
+++ b/update_system_wallpaper_cropper.py
@@ -5,7 +5,7 @@
# necessary so do this with care
import os
import sys
-src_dir = "wallpaper_picker_src/"
+src_dir = "WallpaperPicker/src/"
files = """
src/android/util/Pools.java
com/android/gallery3d/util/IntArray.java