summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/CameraActivity.java
diff options
context:
space:
mode:
authorJack Yoo <jyoo@codeaurora.org>2016-06-15 16:34:57 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2016-07-07 09:41:00 -0700
commitc8513bf1f30d0cf0257feaf4956e5179cfefe52b (patch)
treece19b18241ff94ba26e9bba5b2f41886e8103d8c /src/com/android/camera/CameraActivity.java
parent12d17d80e1227e9164e7e0aa7524cd39d23bf124 (diff)
downloadandroid_packages_apps_Snap-c8513bf1f30d0cf0257feaf4956e5179cfefe52b.tar.gz
android_packages_apps_Snap-c8513bf1f30d0cf0257feaf4956e5179cfefe52b.tar.bz2
android_packages_apps_Snap-c8513bf1f30d0cf0257feaf4956e5179cfefe52b.zip
SnapdragonCamera: Adding ubifocus post proc filter
Introducing ubifocus to camera2. Change-Id: I611bea207b9cbbde56a23720b22a5a5e3daa215f CRs-Fixed: 1035245
Diffstat (limited to 'src/com/android/camera/CameraActivity.java')
-rw-r--r--src/com/android/camera/CameraActivity.java15
1 files changed, 15 insertions, 0 deletions
diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java
index e3b4573d1..68d9c7c3a 100644
--- a/src/com/android/camera/CameraActivity.java
+++ b/src/com/android/camera/CameraActivity.java
@@ -249,6 +249,7 @@ public class CameraActivity extends Activity
private Cursor mCursor;
private WakeLock mWakeLock;
+ private static final int REFOCUS_ACTIVITY_CODE = 1;
private class MyOrientationEventListener
extends OrientationEventListener {
@@ -576,6 +577,16 @@ public class CameraActivity extends Activity
return;
}
}
+ if (mCurrentModule instanceof CaptureModule) {
+ if (((CaptureModule) mCurrentModule).isRefocus()) {
+ Intent intent = new Intent();
+ intent.setClass(this, RefocusActivity.class);
+ intent.setData(uri);
+ intent.setFlags(RefocusActivity.MAP_ROTATED);
+ startActivityForResult(intent, REFOCUS_ACTIVITY_CODE);
+ return;
+ }
+ }
try {
Intent intent = IntentHelper.getGalleryIntent(this);
intent.setAction(Intent.ACTION_VIEW);
@@ -1624,6 +1635,10 @@ public class CameraActivity extends Activity
if (requestCode == REQ_CODE_DONT_SWITCH_TO_PREVIEW) {
mResetToPreviewOnResume = false;
mIsEditActivityInProgress = false;
+ } else if (requestCode == REFOCUS_ACTIVITY_CODE) {
+ if(resultCode == RESULT_OK) {
+ mCaptureModule.setRefocusLastTaken(false);
+ }
} else {
super.onActivityResult(requestCode, resultCode, data);
}