resolved conflicts for merge of b0870db3 to ub-camera-glacier

Change-Id: If06d585dbbe2d47ea92679bf63428fc2c0bca923

1 files changed, 28 insertions, 11 deletions

diff --git a/src/com/android/camera/FocusOverlayManager.java b/src/com/android/camera/FocusOverlayManager.java
index 537047803..ae9580115 100644
--- a/src/com/android/camera/FocusOverlayManager.java
+++ b/src/com/android/camera/FocusOverlayManager.java
@@ -162,7 +162,9 @@ public class FocusOverlayManager implements PreviewStatusListener.PreviewAreaCha
         // before camera is open. We will just return in this case, because
         // parameters will be set again later with the right parameters after
         // camera is open.
-        if (capabilities == null) return;
+        if (parameters == null) {
+            return;
+        }
         mCapabilities = capabilities;
         mFocusAreaSupported = mCapabilities.supports(CameraCapabilities.Feature.FOCUS_AREA);
         mMeteringAreaSupported = mCapabilities.supports(CameraCapabilities.Feature.METERING_AREA);
@@ -226,7 +228,9 @@ public class FocusOverlayManager implements PreviewStatusListener.PreviewAreaCha
     }
 
     public void onShutterUp(CameraCapabilities.FocusMode currentFocusMode) {
-        if (!mInitialized) return;
+        if (!mInitialized) {
+            return;
+        }
 
         if (needAutoFocusCall(currentFocusMode)) {
             // User releases half-pressed focus key.
@@ -242,7 +246,9 @@ public class FocusOverlayManager implements PreviewStatusListener.PreviewAreaCha
     }
 
     public void focusAndCapture(CameraCapabilities.FocusMode currentFocusMode) {
-        if (!mInitialized) return;
+        if (!mInitialized) {
+            return;
+        }
 
         if (!needAutoFocusCall(currentFocusMode)) {
             // Focus is not needed.
@@ -297,7 +303,9 @@ public class FocusOverlayManager implements PreviewStatusListener.PreviewAreaCha
     }
 
     public void onAutoFocusMoving(boolean moving) {
-        if (!mInitialized) return;
+        if (!mInitialized) {
+            return;
+        }
 
 
         // Ignore if the camera has detected some faces.
@@ -308,7 +316,9 @@ public class FocusOverlayManager implements PreviewStatusListener.PreviewAreaCha
 
         // Ignore if we have requested autofocus. This method only handles
         // continuous autofocus.
-        if (mState != STATE_IDLE) return;
+        if (mState != STATE_IDLE) {
+            return;
+        }
 
         // animate on false->true trasition only b/8219520
         if (moving && !mPreviousMoving) {
@@ -346,14 +356,18 @@ public class FocusOverlayManager implements PreviewStatusListener.PreviewAreaCha
     }
 
     public void onSingleTapUp(int x, int y) {
-        if (!mInitialized || mState == STATE_FOCUSING_SNAP_ON_FINISH) return;
+        if (!mInitialized || mState == STATE_FOCUSING_SNAP_ON_FINISH) {
+            return;
+        }
 
         // Let users be able to cancel previous touch focus.
         if ((mFocusArea != null) && (mState == STATE_FOCUSING ||
                     mState == STATE_SUCCESS || mState == STATE_FAIL)) {
             cancelAutoFocus();
         }
-        if (mPreviewRect.width() == 0 || mPreviewRect.height() == 0) return;
+        if (mPreviewRect.width() == 0 || mPreviewRect.height() == 0) {
+            return;
+        }
         // Initialize variables.
         // Initialize mFocusArea.
         if (mFocusAreaSupported) {
@@ -508,9 +522,10 @@ public class FocusOverlayManager implements PreviewStatusListener.PreviewAreaCha
     }
 
     public void updateFocusUI() {
-        if (!mInitialized) return;
-        // Show only focus indicator or face indicator.
-
+        if (!mInitialized) {
+            // Show only focus indicator or face indicator.
+            return;
+        }
         if (mState == STATE_IDLE) {
             if (mFocusArea == null) {
                 mUI.clearFocus();
@@ -535,7 +550,9 @@ public class FocusOverlayManager implements PreviewStatusListener.PreviewAreaCha
     }
 
     public void resetTouchFocus() {
-        if (!mInitialized) return;
+        if (!mInitialized) {
+            return;
+        }
 
         // Put focus indicator to the center. clear reset position
         mUI.clearFocus();