diff options
| author | Jack Yoo <jyoo@codeaurora.org> | 2016-09-07 10:30:43 -0700 |
|---|---|---|
| committer | Jay Wang <jaywang@codeaurora.org> | 2016-09-27 15:54:54 -0700 |
| commit | 8f6566e427e0091e95974768596e29220c2f181b (patch) | |
| tree | a26e38cc252ed6ea74c96a7b04e13c48d9355f18 /src/com/android/camera/PreviewGestures.java | |
| parent | da315cfe9dcff36827dcf3cbaff53d823a4d228b (diff) | |
| download | android_packages_apps_Snap-8f6566e427e0091e95974768596e29220c2f181b.tar.gz android_packages_apps_Snap-8f6566e427e0091e95974768596e29220c2f181b.tar.bz2 android_packages_apps_Snap-8f6566e427e0091e95974768596e29220c2f181b.zip | |
SnapdrgaonCamera: Putting TrackingFocus jni hook
Adding tracking focus jni library loading part
and touch event
Change-Id: Ic570a09a0d93eb4b81e52334ba4a1bee2b67cb12
CRs-Fixed: 1067848
Diffstat (limited to 'src/com/android/camera/PreviewGestures.java')
| -rw-r--r-- | src/com/android/camera/PreviewGestures.java | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/src/com/android/camera/PreviewGestures.java b/src/com/android/camera/PreviewGestures.java index 5f95ebffd..6a1de4a08 100644 --- a/src/com/android/camera/PreviewGestures.java +++ b/src/com/android/camera/PreviewGestures.java @@ -23,6 +23,7 @@ import android.view.View; import com.android.camera.ui.PieRenderer; import com.android.camera.ui.RenderOverlay; +import com.android.camera.ui.TrackingFocusRenderer; import com.android.camera.ui.ZoomRenderer; /* PreviewGestures disambiguates touch events received on RenderOverlay @@ -45,6 +46,7 @@ public class PreviewGestures private SingleTapListener mTapListener; private RenderOverlay mOverlay; private PieRenderer mPie; + private TrackingFocusRenderer mTrackingFocus; private ZoomRenderer mZoom; private MotionEvent mDown; private MotionEvent mCurrent; @@ -123,9 +125,10 @@ public class PreviewGestures } public PreviewGestures(CameraActivity ctx, SingleTapListener tapListener, - ZoomRenderer zoom, PieRenderer pie) { + ZoomRenderer zoom, PieRenderer pie, TrackingFocusRenderer trackingfocus) { mTapListener = tapListener; mPie = pie; + mTrackingFocus = trackingfocus; mZoom = zoom; mMode = MODE_NONE; mScale = new ScaleGestureDetector(ctx, this); @@ -201,6 +204,10 @@ public class PreviewGestures return sendToPie(m); } + if (mTrackingFocus != null && mTrackingFocus.isVisible()) { + return sendToTrackingFocus(m); + } + if (mCaptureUI != null) { if (mCaptureUI.isPreviewMenuBeingShown()) { waitUntilNextDown = true; @@ -278,6 +285,10 @@ public class PreviewGestures return mOverlay.directDispatchTouch(m, mPie); } + private boolean sendToTrackingFocus(MotionEvent m) { + return mOverlay.directDispatchTouch(m, mTrackingFocus); + } + // OnScaleGestureListener implementation @Override public boolean onScale(ScaleGestureDetector detector) { |