diff options
| author | Sunny Goyal <sunnygoyal@google.com> | 2015-08-13 00:02:35 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-13 00:02:35 +0000 |
| commit | f2c45762f2ac88a322f91d6a9dc36ef6a81b18d8 (patch) | |
| tree | 44e6359415a9020869cae5466ae5938cb115ff9b | |
| parent | b021337ee4dd5d330971205d5161c85b6ae00d84 (diff) | |
| parent | f29471c751b173b91989709b9ce9ca811bf20244 (diff) | |
| download | android_packages_apps_Trebuchet-f2c45762f2ac88a322f91d6a9dc36ef6a81b18d8.tar.gz android_packages_apps_Trebuchet-f2c45762f2ac88a322f91d6a9dc36ef6a81b18d8.tar.bz2 android_packages_apps_Trebuchet-f2c45762f2ac88a322f91d6a9dc36ef6a81b18d8.zip | |
am f29471c7: Merge "Ensure that crop view is loaded before applying a wallpaper" into ub-launcher3-burnaby
* commit 'f29471c751b173b91989709b9ce9ca811bf20244':
Ensure that crop view is loaded before applying a wallpaper
| -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(); |