summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/com/android/camera/CameraActivity.java9
1 files changed, 9 insertions, 0 deletions
diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java
index a57e45954..aadb7d75c 100644
--- a/src/com/android/camera/CameraActivity.java
+++ b/src/com/android/camera/CameraActivity.java
@@ -783,6 +783,15 @@ public class CameraActivity extends Activity
return super.onKeyUp(keyCode, event);
}
+ @Override
+ public void onBackPressed() {
+ if (!mFilmStripView.inCameraFullscreen()) {
+ mFilmStripView.getController().goToFirstItem();
+ } else if (!mCurrentModule.onBackPressed()) {
+ super.onBackPressed();
+ }
+ }
+
public boolean isAutoRotateScreen() {
return mAutoRotateScreen;
}