diff options
author | Selim Cinek <cinek@google.com> | 2014-03-04 01:50:44 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-04 01:50:44 -0800 |
commit | 10acea596e3752d1eab693fd34209767e991c92d (patch) | |
tree | 8efbcc9c8f89c8e63f5a33422a4bd98403dd7d90 /WallpaperPicker/src/com/android/launcher3/WallpaperCropActivity.java | |
parent | 919ce78038836547480c37a444fe90b68f9c943f (diff) | |
parent | 0c255a946788499d7f169429890d5a423426593b (diff) | |
download | android_packages_apps_Trebuchet-10acea596e3752d1eab693fd34209767e991c92d.tar.gz android_packages_apps_Trebuchet-10acea596e3752d1eab693fd34209767e991c92d.tar.bz2 android_packages_apps_Trebuchet-10acea596e3752d1eab693fd34209767e991c92d.zip |
am 0c255a94: Merge "Changed behaviour of the wallpaper picker." into ub-now-lunchbox
* commit '0c255a946788499d7f169429890d5a423426593b':
Changed behaviour of the wallpaper picker.
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); } } }; |