commit 79a640ec354e61363e0c347793f70b3a285a0240
author Sunny Goyal <sunnygoyal@google.com> Wed Aug 12 15:28:33 2015 -0700
committer Sunny Goyal <sunnygoyal@google.com> Wed Aug 12 15:28:33 2015 -0700
tree 1393809ae6b92287b03b35251f5ff8d677920027
parent a1ee659e748b02ed74d8cafd3796a5c8ce5f1c44

Ensure that crop view is loaded before applying a wallpaper

Bug: 22293299
Change-Id: I64d5268cc263bbb6595a0b28bdd5ec73d540da41

WallpaperPicker/src/com/android/launcher3/WallpaperPickerActivity.java

diff --git a/WallpaperPicker/src/com/android/launcher3/WallpaperPickerActivity.java b/WallpaperPicker/src/com/android/launcher3/WallpaperPickerActivity.java
index 069638f..75d8745 100644
--- a/WallpaperPicker/src/com/android/launcher3/WallpaperPickerActivity.java
+++ b/WallpaperPicker/src/com/android/launcher3/WallpaperPickerActivity.java
@@ -550,7 +550,8 @@
                 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();