summaryrefslogtreecommitdiffstats
path: root/src/com
diff options
context:
space:
mode:
authorEthan Chen <intervigil@gmail.com>2016-03-10 17:10:13 -0800
committerSteve Kondik <steve@cyngn.com>2016-11-02 12:24:51 -0700
commitc945e911548733b204c1752044d4a1b34b149470 (patch)
treef9199f7d87f78168c7d9e12d5e179228e6b94dca /src/com
parentba2e5c32363b539b80b4645af4fb166fe12e5926 (diff)
downloadandroid_packages_apps_Snap-c945e911548733b204c1752044d4a1b34b149470.tar.gz
android_packages_apps_Snap-c945e911548733b204c1752044d4a1b34b149470.tar.bz2
android_packages_apps_Snap-c945e911548733b204c1752044d4a1b34b149470.zip
Snap: Fall back to REVIEW intent before VIEW intent
Change-Id: Ie8f1dac602957cb871d0f8c7043ac0f434f4bfac
Diffstat (limited to 'src/com')
-rwxr-xr-xsrc/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 ec794f2cb..d21013169 100755
--- a/src/com/android/camera/CameraActivity.java
+++ b/src/com/android/camera/CameraActivity.java
@@ -608,8 +608,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);
}
}