diff options
Diffstat (limited to 'src/com/android/camera/ImageViewTouchBase.java')
-rw-r--r-- | src/com/android/camera/ImageViewTouchBase.java | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/src/com/android/camera/ImageViewTouchBase.java b/src/com/android/camera/ImageViewTouchBase.java index 9993373..7cdf55e 100644 --- a/src/com/android/camera/ImageViewTouchBase.java +++ b/src/com/android/camera/ImageViewTouchBase.java @@ -13,6 +13,7 @@ import android.util.Config; import android.util.Log; import android.view.animation.Animation; import android.view.animation.TranslateAnimation; +import android.view.KeyEvent; import android.widget.ImageView; abstract public class ImageViewTouchBase extends ImageView { @@ -91,6 +92,17 @@ abstract public class ImageViewTouchBase extends ImageView { } } + @Override + public boolean onKeyDown(int keyCode, KeyEvent event) { + if (keyCode == KeyEvent.KEYCODE_BACK && getScale() > 1.0f) { + // If we're zoomed in, pressing Back jumps out to show the entire image, otherwise Back + // returns the user to the gallery. + zoomTo(1.0f); + return true; + } + return super.onKeyDown(keyCode, event); + } + protected Handler mHandler = new Handler(); protected int mLastXTouchPos; |