diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/com/android/camera/CameraActivity.java | 7 | ||||
-rw-r--r-- | src/com/android/camera/util/ApiHelper.java | 2 |
2 files changed, 8 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); diff --git a/src/com/android/camera/util/ApiHelper.java b/src/com/android/camera/util/ApiHelper.java index 271957ee1..a54477c93 100644 --- a/src/com/android/camera/util/ApiHelper.java +++ b/src/com/android/camera/util/ApiHelper.java @@ -22,6 +22,8 @@ import java.lang.reflect.Field; public class ApiHelper { public static final boolean AT_LEAST_16 = Build.VERSION.SDK_INT >= 16; + public static final boolean HAS_APP_GALLERY = + Build.VERSION.SDK_INT >= Build.VERSION_CODES.ICE_CREAM_SANDWICH_MR1; public static final boolean HAS_MEDIA_COLUMNS_WIDTH_AND_HEIGHT = Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN; public static final boolean HAS_AUTO_FOCUS_MOVE_CALLBACK = |