diff options
author | Alan Newberger <alann@google.com> | 2013-08-30 15:19:48 -0700 |
---|---|---|
committer | Alan Newberger <alann@google.com> | 2013-08-30 15:19:48 -0700 |
commit | 5f6b50deaf46fb546ebf6d0d6244ebf7fb79c7ca (patch) | |
tree | e5585127b3638713b75c94a8306c1097f8252e98 | |
parent | 2581af9b08ac913465303795745c3ce24eb0f20c (diff) | |
download | android_packages_apps_Snap-5f6b50deaf46fb546ebf6d0d6244ebf7fb79c7ca.tar.gz android_packages_apps_Snap-5f6b50deaf46fb546ebf6d0d6244ebf7fb79c7ca.tar.bz2 android_packages_apps_Snap-5f6b50deaf46fb546ebf6d0d6244ebf7fb79c7ca.zip |
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
-rw-r--r-- | src/com/android/camera/CameraActivity.java | 9 |
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; } |