summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEthan Chen <intervigil@gmail.com>2016-03-10 17:10:13 -0800
committerArne Coucheron <arco68@gmail.com>2018-01-26 01:03:41 +0100
commit204be5b8f9979864e66b3896d93b0709af3a1017 (patch)
tree599f7b44d7ca5b1c6f6d2085c7688b181c96c1e4 /src
parent6a1b3353fa49b0daa402c04dbe96308ace6a880b (diff)
downloadandroid_packages_apps_Snap-204be5b8f9979864e66b3896d93b0709af3a1017.tar.gz
android_packages_apps_Snap-204be5b8f9979864e66b3896d93b0709af3a1017.tar.bz2
android_packages_apps_Snap-204be5b8f9979864e66b3896d93b0709af3a1017.zip
Snap: Fall back to REVIEW intent before VIEW intent
Change-Id: Ie8f1dac602957cb871d0f8c7043ac0f434f4bfac
Diffstat (limited to 'src')
-rw-r--r--src/com/android/camera/CameraActivity.java16
1 files changed, 15 insertions, 1 deletions
diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java
index b040f36a7..4b5384f07 100644
--- a/src/com/android/camera/CameraActivity.java
+++ b/src/com/android/camera/CameraActivity.java
@@ -615,8 +615,22 @@ public class CameraActivity extends Activity
intent.putExtra(KEY_TOTAL_NUMBER, (adapter.getTotalNumber() -1));
startActivity(intent);
} catch (ActivityNotFoundException ex) {
- gotoViewPhoto(uri);
+ gotoReviewPhoto(uri);
} catch (IllegalArgumentException ex) {
+ gotoReviewPhoto(uri);
+ }
+ }
+
+ private void gotoReviewPhoto(Uri uri) {
+ try {
+ Log.w(TAG, "Gallery not found");
+ Intent intent = new Intent(CameraUtil.REVIEW_ACTION, uri);
+ startActivity(intent);
+ intent.putExtra(KEY_FROM_SNAPCAM, true);
+ intent.putExtra(KEY_TOTAL_NUMBER, getDataAdapter().getTotalNumber() - 1);
+ } catch (ActivityNotFoundException e) {
+ gotoViewPhoto(uri);
+ } catch (IllegalArgumentException e) {
gotoViewPhoto(uri);
}
}