diff options
| author | Sunny Goyal <sunnygoyal@google.com> | 2014-07-24 14:08:45 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-07-23 18:44:51 +0000 |
| commit | 0c625eeec21b0c21a9a4fb47692d86afae9889dd (patch) | |
| tree | dcdaa2827a2b9e3362b2c26770e2bae9cc70cc5e /WallpaperPicker/src/com/android/launcher3/WallpaperCropActivity.java | |
| parent | a043fa89211541c71b5bef052ebc49f722d338b9 (diff) | |
| parent | cdc4dbd878a1f45d21c2881127cd5194e4e48ced (diff) | |
| download | android_packages_apps_Trebuchet-0c625eeec21b0c21a9a4fb47692d86afae9889dd.tar.gz android_packages_apps_Trebuchet-0c625eeec21b0c21a9a4fb47692d86afae9889dd.tar.bz2 android_packages_apps_Trebuchet-0c625eeec21b0c21a9a4fb47692d86afae9889dd.zip | |
Merge "Adding options in the partner apk to disable the default wallpaper and provide a folder containing additional wallpapers" into ub-now-master
Diffstat (limited to 'WallpaperPicker/src/com/android/launcher3/WallpaperCropActivity.java')
| -rw-r--r-- | WallpaperPicker/src/com/android/launcher3/WallpaperCropActivity.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/WallpaperPicker/src/com/android/launcher3/WallpaperCropActivity.java b/WallpaperPicker/src/com/android/launcher3/WallpaperCropActivity.java index 8652d85bc..d5c7cd93d 100644 --- a/WallpaperPicker/src/com/android/launcher3/WallpaperCropActivity.java +++ b/WallpaperPicker/src/com/android/launcher3/WallpaperCropActivity.java @@ -308,10 +308,10 @@ public class WallpaperCropActivity extends Activity { return 0; } - protected void setWallpaper(String filePath, final boolean finishActivityWhenDone) { - int rotation = getRotationFromExif(filePath); + protected void setWallpaper(Uri uri, final boolean finishActivityWhenDone) { + int rotation = getRotationFromExif(this, uri); BitmapCropTask cropTask = new BitmapCropTask( - this, filePath, null, rotation, 0, 0, true, false, null); + this, uri, null, rotation, 0, 0, true, false, null); final Point bounds = cropTask.getImageBounds(); Runnable onEndCrop = new Runnable() { public void run() { |