summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/CameraActivity.java
diff options
context:
space:
mode:
authorMangesh Ghiware <mghiware@google.com>2013-09-18 18:25:26 -0700
committerMangesh Ghiware <mghiware@google.com>2013-09-18 18:25:26 -0700
commit5df64b0a818d4f85cb14602db725f05b0055c1d9 (patch)
tree14130c6b06a21992bd7aaf2ff80f7d137ce58833 /src/com/android/camera/CameraActivity.java
parent638e6f06c877d90b907f66ea9c22b3c6b73c7384 (diff)
downloadandroid_packages_apps_Snap-5df64b0a818d4f85cb14602db725f05b0055c1d9.tar.gz
android_packages_apps_Snap-5df64b0a818d4f85cb14602db725f05b0055c1d9.tar.bz2
android_packages_apps_Snap-5df64b0a818d4f85cb14602db725f05b0055c1d9.zip
Make Up button in filmstrip go to Gallery.
Bug: 10748904 Change-Id: If80f3354071893dc4f8bd60e4ca605d3626ecdf9
Diffstat (limited to 'src/com/android/camera/CameraActivity.java')
-rw-r--r--src/com/android/camera/CameraActivity.java7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java
index 46dc2ba1e..25dd38510 100644
--- a/src/com/android/camera/CameraActivity.java
+++ b/src/com/android/camera/CameraActivity.java
@@ -681,7 +681,12 @@ public class CameraActivity extends Activity
switch (item.getItemId()) {
case android.R.id.home:
// ActionBar's Up/Home button was clicked
- mFilmStripView.getController().goToFirstItem();
+ if (ApiHelper.HAS_APP_GALLERY) {
+ startActivity(Intent.makeMainSelectorActivity(
+ Intent.ACTION_MAIN, Intent.CATEGORY_APP_GALLERY));
+ } else {
+ mFilmStripView.getController().goToFirstItem();
+ }
return true;
case R.id.action_delete:
removeData(currentDataId);