diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2015-01-18 20:30:02 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2015-01-18 20:30:02 -0800 |
| commit | d917dde9ecd18dd6dd8f78bd6d4c89d417a90878 (patch) | |
| tree | 62e843ca41a94d90ee22e82f69f4e5815b4bc40e /src/com/android/camera/CameraActivity.java | |
| parent | 7100c54b11bed6500a0b63310c190f8203180d6d (diff) | |
| parent | 762b4350b731e1c2189c871dc77627df2be87549 (diff) | |
| download | android_packages_apps_Snap-d917dde9ecd18dd6dd8f78bd6d4c89d417a90878.tar.gz android_packages_apps_Snap-d917dde9ecd18dd6dd8f78bd6d4c89d417a90878.tar.bz2 android_packages_apps_Snap-d917dde9ecd18dd6dd8f78bd6d4c89d417a90878.zip | |
Merge "SnapdragonCamera: implement refocus feature"
Diffstat (limited to 'src/com/android/camera/CameraActivity.java')
| -rw-r--r-- | src/com/android/camera/CameraActivity.java | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java index d460867a6..849dc33e3 100644 --- a/src/com/android/camera/CameraActivity.java +++ b/src/com/android/camera/CameraActivity.java @@ -527,6 +527,15 @@ public class CameraActivity extends Activity if (img == null) return; Uri uri = img.getContentUri(); + if (mCurrentModule instanceof PhotoModule) { + if (((PhotoModule) mCurrentModule).isRefocus()) { + Intent intent = new Intent(); + intent.setClass(this, RefocusActivity.class); + intent.setData(uri); + startActivity(intent); + return; + } + } Intent intent = new Intent(Intent.ACTION_VIEW, uri); startActivity(intent); } |