diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2015-08-12 15:28:33 -0700 |
---|---|---|
committer | Sunny Goyal <sunnygoyal@google.com> | 2015-08-12 15:28:33 -0700 |
commit | 79a640ec354e61363e0c347793f70b3a285a0240 (patch) | |
tree | 1393809ae6b92287b03b35251f5ff8d677920027 /WallpaperPicker/src/com/android/launcher3 | |
parent | a1ee659e748b02ed74d8cafd3796a5c8ce5f1c44 (diff) | |
download | android_packages_apps_Trebuchet-79a640ec354e61363e0c347793f70b3a285a0240.tar.gz android_packages_apps_Trebuchet-79a640ec354e61363e0c347793f70b3a285a0240.tar.bz2 android_packages_apps_Trebuchet-79a640ec354e61363e0c347793f70b3a285a0240.zip |
Ensure that crop view is loaded before applying a wallpaper
Bug: 22293299
Change-Id: I64d5268cc263bbb6595a0b28bdd5ec73d540da41
Diffstat (limited to 'WallpaperPicker/src/com/android/launcher3')
-rw-r--r-- | WallpaperPicker/src/com/android/launcher3/WallpaperPickerActivity.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/WallpaperPicker/src/com/android/launcher3/WallpaperPickerActivity.java b/WallpaperPicker/src/com/android/launcher3/WallpaperPickerActivity.java index 069638f8c..75d874552 100644 --- a/WallpaperPicker/src/com/android/launcher3/WallpaperPickerActivity.java +++ b/WallpaperPicker/src/com/android/launcher3/WallpaperPickerActivity.java @@ -550,7 +550,8 @@ public class WallpaperPickerActivity extends WallpaperCropActivity { new View.OnClickListener() { @Override public void onClick(View v) { - if (mSelectedTile != null) { + // Ensure that a tile is slelected and loaded. + if (mSelectedTile != null && mCropView.getTileSource() != null) { // Prevent user from selecting any new tile. mWallpaperStrip.setVisibility(View.GONE); actionBar.hide(); |