Merge "Ensure that crop view is loaded before applying a wallpaper" into ub-launcher3-burnaby

2015-08-12 23:58:05 +00:00
parent 56c3248341 79a640ec35
commit f29471c751
1 changed files with 2 additions and 1 deletions
@@ -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();