diff options
author | Selim Cinek <cinek@google.com> | 2014-02-28 17:18:59 +0100 |
---|---|---|
committer | Selim Cinek <cinek@google.com> | 2014-03-03 18:09:06 +0100 |
commit | ffed65886ecd83f52dc1c052897511c95a5f371a (patch) | |
tree | e289aab5183961bd4fd5903b7daa5feca8a228ef /WallpaperPicker/src/com/android/launcher3/WallpaperCropActivity.java | |
parent | 4f462f4a8b9fc6897d9fab9ad31c06e0b8f79373 (diff) | |
download | android_packages_apps_Trebuchet-ffed65886ecd83f52dc1c052897511c95a5f371a.tar.gz android_packages_apps_Trebuchet-ffed65886ecd83f52dc1c052897511c95a5f371a.tar.bz2 android_packages_apps_Trebuchet-ffed65886ecd83f52dc1c052897511c95a5f371a.zip |
Changed behaviour of the wallpaper picker.
When opening the picker, the currently chosen wallpaper is
shown in the background.
In this change also the nullpointer was fixed when deleting
the currently selected wallpaper and setting it, because we
revert to the old wallpaper in that case.
When going into the same live wallpaper than the currently
selected we are going back to home if the user sets it or
goes back now, in order for the user not to loose state.
The real fix for this will be done later when the following
bug will be fixed: b/13241760
Bug: 12063773
Bug: 13219612
Change-Id: I7c6abb25755eca99c3255278e0884d1ff4749b55
Diffstat (limited to 'WallpaperPicker/src/com/android/launcher3/WallpaperCropActivity.java')
-rw-r--r-- | WallpaperPicker/src/com/android/launcher3/WallpaperCropActivity.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/WallpaperPicker/src/com/android/launcher3/WallpaperCropActivity.java b/WallpaperPicker/src/com/android/launcher3/WallpaperCropActivity.java index 23fbe73a3..561c4bb6a 100644 --- a/WallpaperPicker/src/com/android/launcher3/WallpaperCropActivity.java +++ b/WallpaperPicker/src/com/android/launcher3/WallpaperCropActivity.java @@ -75,7 +75,7 @@ public class WallpaperCropActivity extends Activity { protected CropView mCropView; protected Uri mUri; - private View mSetWallpaperButton; + protected View mSetWallpaperButton; @Override protected void onCreate(Bundle savedInstanceState) { @@ -117,7 +117,7 @@ public class WallpaperCropActivity extends Activity { // Load image in background final BitmapRegionTileSource.UriBitmapSource bitmapSource = new BitmapRegionTileSource.UriBitmapSource(this, imageUri, 1024); - mSetWallpaperButton.setVisibility(View.INVISIBLE); + mSetWallpaperButton.setEnabled(false); Runnable onLoad = new Runnable() { public void run() { if (bitmapSource.getLoadingState() != BitmapSource.State.LOADED) { @@ -126,7 +126,7 @@ public class WallpaperCropActivity extends Activity { Toast.LENGTH_LONG).show(); finish(); } else { - mSetWallpaperButton.setVisibility(View.VISIBLE); + mSetWallpaperButton.setEnabled(true); } } }; |