SnapdragonCamera:RTB focus UI

According to the spec, hide tips when bokeh
succeeds, and show normal focus circle and tips
when bokeh succeeds.

Change-Id: Icefbc88d764b5db9f975baeef0f52fefadc4f08a
CRs-Fixed: 2083336

1 files changed, 38 insertions, 36 deletions

diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java
index 22b66b402..26c3a4d75 100755
--- a/src/com/android/camera/PhotoModule.java
+++ b/src/com/android/camera/PhotoModule.java
@@ -1263,14 +1263,21 @@ public class PhotoModule
                             break;
                         default:
                             tip = "Message type =" + metadata[2];
+                            break;
                     }
                     mDepthSuccess = metadata[2] == DEPTH_EFFECT_SUCCESS;
                     mActivity.runOnUiThread(new Runnable() {
                         @Override
                         public void run() {
                             if (mBokehTipText != null) {
-                                mBokehTipText.setText(tip);
+                                if (!mDepthSuccess) {
+                                    mBokehTipText.setVisibility(View.VISIBLE);
+                                    mBokehTipText.setText(tip);
+                                } else {
+                                    mBokehTipText.setVisibility(View.GONE);
+                                }
                             }
+                            mUI.enableBokehFocus(mDepthSuccess);
                         }
                     });
                 }
@@ -2226,9 +2233,37 @@ public class PhotoModule
             }
         }
 
-        if (mIsBokehMode) {
+        String bokehMode = mPreferences.getString(
+                CameraSettings.KEY_BOKEH_MODE,
+                mActivity.getString(R.string.pref_camera_bokeh_mode_default));
+        if (!bokehMode.equals(mActivity.getString(
+                R.string.pref_camera_bokeh_mode_entry_value_disable))) {
+            mIsBokehMode = true;
+            if (mCameraDevice != null) {
+                mCameraDevice.setMetadataCb(mMetaDataCallback);
+            }
             mUI.overrideSettings(CameraSettings.KEY_FLASH_MODE, Parameters.FLASH_MODE_OFF);
             mUI.overrideSettings(CameraSettings.KEY_SCENE_MODE, Parameters.SCENE_MODE_AUTO);
+            final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(mActivity);
+            final int degree = prefs.getInt(CameraSettings.KEY_BOKEH_BLUR_VALUE,50);
+            mUI.getBokehDegreeBar().setProgress(degree);
+            mUI.getBokehDegreeBar().setOnSeekBarChangeListener(mBlurDegreeListener);
+            mUI.enableBokehRender(true);
+            mUI.setBokehRenderDegree(degree);
+            mBokehTipText.setVisibility(View.VISIBLE);
+        } else {
+            mIsBokehMode = false;
+            if (mCameraDevice != null) {
+                mCameraDevice.setMetadataCb(null);
+            }
+            mUI.overrideSettings(CameraSettings.KEY_BOKEH_MPO,
+                    mActivity.getString(R.string.pref_camera_bokeh_mpo_default));
+            mUI.overrideSettings(CameraSettings.KEY_BOKEH_BLUR_VALUE,
+                    mActivity.getString(R.string.pref_camera_bokeh_blur_degree_default));
+            mUI.getBokehDegreeBar().setOnSeekBarChangeListener(null);
+            mUI.getBokehDegreeBar().setVisibility(View.GONE);
+            mUI.enableBokehRender(false);
+            mBokehTipText.setVisibility(View.GONE);
         }
     }
 
@@ -3876,7 +3911,7 @@ public class PhotoModule
         String bokehBlurDegree = mPreferences.getString(
                 CameraSettings.KEY_BOKEH_BLUR_VALUE,
                 mActivity.getString(R.string.pref_camera_bokeh_blur_degree_default));
-        final boolean supportBokeh = CameraSettings.isBokehModeSupported(mParameters);;
+        final boolean supportBokeh = CameraSettings.isBokehModeSupported(mParameters);
         mActivity.runOnUiThread(new Runnable() {
             @Override
             public void run() {
@@ -3902,41 +3937,8 @@ public class PhotoModule
             if(mManual3AEnabled != 0) {
                 mManual3AEnabled = 0;
             }
-            if (mCameraDevice != null) {
-                mCameraDevice.setMetadataCb(mMetaDataCallback);
-            }
-            final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(mActivity);
-            final  int degree = prefs.getInt(CameraSettings.KEY_BOKEH_BLUR_VALUE,50);
-            bokehBlurDegree = String.valueOf(degree);
-            mActivity.runOnUiThread(new Runnable() {
-                @Override
-                public void run() {
-                    mUI.getBokehDegreeBar().setProgress(degree);
-                    mUI.getBokehDegreeBar().setOnSeekBarChangeListener(mBlurDegreeListener);
-                    mUI.enableBokehRender(true);
-                    mUI.setBokehRenderDegree(degree);
-                    mBokehTipText.setVisibility(View.VISIBLE);
-                }
-            });
         } else {
             mIsBokehMode = false;
-            bokehBlurDegree = "0";
-            mActivity.runOnUiThread(new Runnable() {
-                @Override
-                public void run() {
-                    mUI.overrideSettings(CameraSettings.KEY_BOKEH_MPO,
-                            mActivity.getString(R.string.pref_camera_bokeh_mpo_default));
-                    mUI.overrideSettings(CameraSettings.KEY_BOKEH_BLUR_VALUE,
-                            mActivity.getString(R.string.pref_camera_bokeh_blur_degree_default));
-                    mUI.getBokehDegreeBar().setOnSeekBarChangeListener(null);
-                    mUI.getBokehDegreeBar().setVisibility(View.GONE);
-                    mUI.enableBokehRender(false);
-                    mBokehTipText.setVisibility(View.GONE);
-                }
-            });
-            if (mCameraDevice != null) {
-                mCameraDevice.setMetadataCb(null);
-            }
         }
         mParameters.set(CameraSettings.KEY_QC_BOKEH_MODE, bokehMode);
         mParameters.set(CameraSettings.KEY_QC_BOKEH_MPO_MODE, bokehMpo);