diff options
| author | Ruben Brunk <rubenbrunk@google.com> | 2012-10-24 19:37:52 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-10-24 19:37:52 -0700 |
| commit | 0817895a0de7f0295ed06fa7ac4cff624479797a (patch) | |
| tree | 180aa6ed269841bae1f24afafaadb0e19777f608 /src/com | |
| parent | e7647cf87c7303c4f9b7a2dd57d6c70563a63655 (diff) | |
| parent | 644aa2529f24d7750cff0b448765933675c3afdb (diff) | |
| download | android_packages_apps_Snap-0817895a0de7f0295ed06fa7ac4cff624479797a.tar.gz android_packages_apps_Snap-0817895a0de7f0295ed06fa7ac4cff624479797a.tar.bz2 android_packages_apps_Snap-0817895a0de7f0295ed06fa7ac4cff624479797a.zip | |
Merge "Fixed blackscreen when launching crop from menu." into gb-ub-photos-arches
Diffstat (limited to 'src/com')
3 files changed, 15 insertions, 2 deletions
diff --git a/src/com/android/gallery3d/filtershow/cache/ImageLoader.java b/src/com/android/gallery3d/filtershow/cache/ImageLoader.java index 0ab45e29b..11d0d6443 100644 --- a/src/com/android/gallery3d/filtershow/cache/ImageLoader.java +++ b/src/com/android/gallery3d/filtershow/cache/ImageLoader.java @@ -38,6 +38,7 @@ import com.android.gallery3d.R; import com.android.gallery3d.common.Utils; import com.android.gallery3d.filtershow.FilterShowActivity; import com.android.gallery3d.filtershow.HistoryAdapter; +import com.android.gallery3d.filtershow.imageshow.ImageCrop; import com.android.gallery3d.filtershow.imageshow.ImageShow; import com.android.gallery3d.filtershow.presets.ImagePreset; import com.android.gallery3d.filtershow.tools.SaveCopyTask; @@ -312,8 +313,7 @@ public class ImageLoader { public void run() { for (int i = 0; i < mListeners.size(); i++) { ImageShow imageShow = mListeners.elementAt(i); - imageShow.updateImage(); - imageShow.invalidate(); + imageShow.imageLoaded(); } } }; diff --git a/src/com/android/gallery3d/filtershow/imageshow/ImageCrop.java b/src/com/android/gallery3d/filtershow/imageshow/ImageCrop.java index 863191a7a..35e8ad4b7 100644 --- a/src/com/android/gallery3d/filtershow/imageshow/ImageCrop.java +++ b/src/com/android/gallery3d/filtershow/imageshow/ImageCrop.java @@ -578,6 +578,14 @@ public class ImageCrop extends ImageGeometry { } @Override + public void imageLoaded() { + super.imageLoaded(); + syncLocalToMasterGeometry(); + applyOriginal(); + invalidate(); + } + + @Override protected void gainedVisibility() { float rot = getLocalRotation(); // if has changed orientation via rotate diff --git a/src/com/android/gallery3d/filtershow/imageshow/ImageShow.java b/src/com/android/gallery3d/filtershow/imageshow/ImageShow.java index 51476cc9a..bf22c891f 100644 --- a/src/com/android/gallery3d/filtershow/imageshow/ImageShow.java +++ b/src/com/android/gallery3d/filtershow/imageshow/ImageShow.java @@ -649,6 +649,11 @@ public class ImageShow extends View implements OnGestureListener, } } + public void imageLoaded() { + updateImage(); + invalidate(); + } + public void updateFilteredImage(Bitmap bitmap) { mFilteredImage = bitmap; } |