diff options
| author | Linux Build Service Account <lnxbuild@quicinc.com> | 2017-08-30 19:47:20 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-08-30 19:47:20 -0700 |
| commit | 004f8683454e374b81788fd1a13d44c4d5f35bab (patch) | |
| tree | ba212c5f402f7e924ffc12cee7958cf9e8ba181f /src/com/android/camera/ui | |
| parent | db15c114eda09196c982ae020dbb018d0d8919b1 (diff) | |
| parent | b5533d51a7c97138235d29b35cec876d107aeadd (diff) | |
| download | android_packages_apps_Snap-004f8683454e374b81788fd1a13d44c4d5f35bab.tar.gz android_packages_apps_Snap-004f8683454e374b81788fd1a13d44c4d5f35bab.tar.bz2 android_packages_apps_Snap-004f8683454e374b81788fd1a13d44c4d5f35bab.zip | |
Merge "SnapdragonCamera: Sync LA.UM.6.4 to LA.UM.6.3"
Diffstat (limited to 'src/com/android/camera/ui')
| -rw-r--r--[-rwxr-xr-x] | src/com/android/camera/ui/Camera2FaceView.java | 2 | ||||
| -rw-r--r--[-rwxr-xr-x] | src/com/android/camera/ui/FaceView.java | 7 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/com/android/camera/ui/Camera2FaceView.java b/src/com/android/camera/ui/Camera2FaceView.java index 3b6d10541..81be61f81 100755..100644 --- a/src/com/android/camera/ui/Camera2FaceView.java +++ b/src/com/android/camera/ui/Camera2FaceView.java @@ -151,7 +151,9 @@ public class Camera2FaceView extends FaceView { faceBound.offset(-mCameraBound.left, -mCameraBound.top); mRect.set(faceBound); translateMatrix.mapRect(mRect); + if (LOGV) CameraUtil.dumpRect(mRect, "Original rect"); mMatrix.mapRect(mRect); + if (LOGV) CameraUtil.dumpRect(mRect, "Transformed rect"); mPaint.setColor(mColor); mRect.offset(dx, dy); diff --git a/src/com/android/camera/ui/FaceView.java b/src/com/android/camera/ui/FaceView.java index b617891e5..04b3664eb 100755..100644 --- a/src/com/android/camera/ui/FaceView.java +++ b/src/com/android/camera/ui/FaceView.java @@ -33,14 +33,17 @@ import android.view.View; import com.android.camera.PhotoUI; import com.android.camera.util.CameraUtil; +import com.android.camera.util.PersistUtil; import org.codeaurora.snapcam.R; import org.codeaurora.snapcam.wrapper.ExtendedFaceWrapper; public class FaceView extends View implements FocusIndicator, Rotatable, PhotoUI.SurfaceTextureSizeChangedListener { - protected static final String TAG = "CAM FaceView"; - protected final boolean LOGV = false; + protected static final String TAG = "CAM_FaceView"; + protected final boolean LOGV = + (PersistUtil.getCamera2Debug() == PersistUtil.CAMERA2_DEBUG_DUMP_LOG) || + (PersistUtil.getCamera2Debug() == PersistUtil.CAMERA2_DEBUG_DUMP_ALL); // The value for android.hardware.Camera.setDisplayOrientation. protected int mDisplayOrientation; // The orientation compensation for the face indicator to make it look |