diff options
author | Owen Lin <owenlin@google.com> | 2009-06-25 10:24:02 -0700 |
---|---|---|
committer | Owen Lin <owenlin@google.com> | 2009-06-25 10:24:02 -0700 |
commit | 35bcfe4ef910bf29d5402c75e2c05ec0c255501d (patch) | |
tree | b7048f782ad39b2b24fe6ed10de2e6dca8422559 /src/com/android/camera/ViewImage.java | |
parent | 96269e0f8c2d6cad54f0ac8d3767d917f3ba7b4c (diff) | |
download | LegacyCamera-35bcfe4ef910bf29d5402c75e2c05ec0c255501d.zip LegacyCamera-35bcfe4ef910bf29d5402c75e2c05ec0c255501d.tar.gz LegacyCamera-35bcfe4ef910bf29d5402c75e2c05ec0c255501d.tar.bz2 |
Revert "It seems that there is no quarantee that "onActivityResult()" will be called"
This reverts commit 90bbbcbdfa4f2329dfdfda867a4bd58fa27a2840.
Diffstat (limited to 'src/com/android/camera/ViewImage.java')
-rw-r--r-- | src/com/android/camera/ViewImage.java | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/src/com/android/camera/ViewImage.java b/src/com/android/camera/ViewImage.java index 68c129c..af17ca8 100644 --- a/src/com/android/camera/ViewImage.java +++ b/src/com/android/camera/ViewImage.java @@ -176,7 +176,6 @@ public class ViewImage extends Activity implements View.OnClickListener { } private void showOnScreenControls(final boolean autoDismiss) { - if (mPaused) return; // If the view has not been attached to the window yet, the // zoomButtonControls will not able to show up. So delay it until the // view has attached to window. @@ -1110,14 +1109,6 @@ public class ViewImage extends Activity implements View.OnClickListener { // The CropImage activity passes back the Uri of the // cropped image as the Action rather than the Data. mSavedUri = Uri.parse(data.getAction()); - - // if onStart() runs before, then set the returned - // image as currentImage. - if (mAllImages != null) { - Image image = mAllImages.getImageForUri(mSavedUri); - mCurrentPosition = mAllImages.getImageIndex(image); - setImage(mCurrentPosition); - } } break; } |