diff options
| author | Sunny Goyal <sunnygoyal@google.com> | 2015-08-12 23:58:05 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-08-12 23:58:05 +0000 |
| commit | f29471c751b173b91989709b9ce9ca811bf20244 (patch) | |
| tree | dc2b8fddf7984349853af715601d16abb2fd4e8c | |
| parent | 56c3248341685027ad2578e60e10b879b4397272 (diff) | |
| parent | 79a640ec354e61363e0c347793f70b3a285a0240 (diff) | |
| download | android_packages_apps_Trebuchet-f29471c751b173b91989709b9ce9ca811bf20244.tar.gz android_packages_apps_Trebuchet-f29471c751b173b91989709b9ce9ca811bf20244.tar.bz2 android_packages_apps_Trebuchet-f29471c751b173b91989709b9ce9ca811bf20244.zip | |
Merge "Ensure that crop view is loaded before applying a wallpaper" into ub-launcher3-burnaby
| -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(); |