summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/CaptureUI.java
diff options
context:
space:
mode:
authorByunghun Jeon <bjeon@codeaurora.org>2016-03-09 17:54:54 -0800
committerJay Wang <jaywang@codeaurora.org>2016-03-30 15:55:15 -0700
commitecbee10d740381d11df172de027ef76a6136ace3 (patch)
treec211caa8691209e7e78d5bdbb7c5c614a4460b9f /src/com/android/camera/CaptureUI.java
parent0095c4455f5bba6352abe0476948ef99b42a0c96 (diff)
downloadandroid_packages_apps_Snap-ecbee10d740381d11df172de027ef76a6136ace3.tar.gz
android_packages_apps_Snap-ecbee10d740381d11df172de027ef76a6136ace3.tar.bz2
android_packages_apps_Snap-ecbee10d740381d11df172de027ef76a6136ace3.zip
SnapdragonCamera: Camera2 add touch to focus
Add touch to focus to Camera2 CRs-Fixed: 989750 Change-Id: I5c7c85dcc12eefb11e5f1b5e6a823a327b2647e4
Diffstat (limited to 'src/com/android/camera/CaptureUI.java')
-rw-r--r--src/com/android/camera/CaptureUI.java20
1 files changed, 19 insertions, 1 deletions
diff --git a/src/com/android/camera/CaptureUI.java b/src/com/android/camera/CaptureUI.java
index 01b66fb70..a6accae7b 100644
--- a/src/com/android/camera/CaptureUI.java
+++ b/src/com/android/camera/CaptureUI.java
@@ -281,6 +281,12 @@ public class CaptureUI implements PieListener,
public void onCameraOpened(CameraCharacteristics[] characteristics,
List<Integer> characteristicsIndex, PreferenceGroup prefGroup,
OnPreferenceChangedListener listener) {
+ if (mPieRenderer == null) {
+ mPieRenderer = new PieRenderer(mActivity);
+ mPieRenderer.setPieListener(this);
+ mRenderOverlay.addRenderer(mPieRenderer);
+ }
+
if (mMenu == null) {
mMenu = new CaptureMenu(mActivity, this);
mMenu.setListener(listener);
@@ -686,7 +692,7 @@ public class CaptureUI implements PieListener,
// focus UI implementation
private FocusIndicator getFocusIndicator() {
- return null;
+ return mPieRenderer;
}
@Override
@@ -780,6 +786,18 @@ public class CaptureUI implements PieListener,
}
}
+ public Point getSurfaceViewSize() {
+ Point point = new Point();
+ if (mSurfaceView != null) point.set(mSurfaceView.getWidth(), mSurfaceView.getHeight());
+ return point;
+ }
+
+ public Point getSurfaceView2Size() {
+ Point point = new Point();
+ if (mSurfaceView2 != null) point.set(mSurfaceView2.getWidth(), mSurfaceView2.getHeight());
+ return point;
+ }
+
public int getOrientation() {
return mOrientation;
}