summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Martinz <amartinz@shiftphones.com>2020-05-06 12:00:19 +0200
committerJoey <joey@lineageos.org>2020-06-01 11:28:11 +0200
commita50c2496b28dd452025545f678e815239635dcda (patch)
treee922d318ca30ec3257c3e6172dfc51559979251d
parent31f7b4de418d5b3a7e0ddec0b120efcb40cde103 (diff)
downloadandroid_packages_apps_Snap-a50c2496b28dd452025545f678e815239635dcda.zip
android_packages_apps_Snap-a50c2496b28dd452025545f678e815239635dcda.tar.gz
android_packages_apps_Snap-a50c2496b28dd452025545f678e815239635dcda.tar.bz2
CaptureUI: handle secure capture when reviewing pictures
Test: run cts --skip-preconditions -m CtsProviderUiTestCases -t android.providerui.cts.MediaStoreUiTest#testImageCaptureWithInadequeteLocationPermissions Change-Id: I492103ff68036f4c3474d4172a3ba31ab19efe1b Signed-off-by: Alexander Martinz <amartinz@shiftphones.com>
-rwxr-xr-xsrc/com/android/camera/CaptureUI.java15
1 files changed, 11 insertions, 4 deletions
diff --git a/src/com/android/camera/CaptureUI.java b/src/com/android/camera/CaptureUI.java
index 51138a2..58b0005 100755
--- a/src/com/android/camera/CaptureUI.java
+++ b/src/com/android/camera/CaptureUI.java
@@ -483,10 +483,17 @@ public class CaptureUI implements PreviewGestures.SingleTapListener,
mReviewDoneButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
- if (intentMode == CaptureModule.INTENT_MODE_CAPTURE) {
- mModule.onCaptureDone();
- } else if (intentMode == CaptureModule.INTENT_MODE_VIDEO) {
- mModule.onRecordingDone(true);
+ switch (intentMode) {
+ case CaptureModule.INTENT_MODE_CAPTURE:
+ case CaptureModule.INTENT_MODE_CAPTURE_SECURE:
+ mModule.onCaptureDone();
+ break;
+ case CaptureModule.INTENT_MODE_VIDEO:
+ mModule.onRecordingDone(true);
+ break;
+ default:
+ Log.w(TAG, "Not handling review of intent mode: " + intentMode);
+ break;
}
}
});