Add back button handlng to CameraActivity.

This CL first detects whether user is in filmstrip mode i.e. not in Camera,
if so brings user back to the first item which is the Camera. If in Camera,
we route back handling to the current Camera module which enables already-
written module handling for back button e.g. backing out of pie menus.

Bug: 8781981
Change-Id: I18377ea5fbdcd8bd8c6fc3af9cb5322d5f5a889a

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;
     }