SnapdragonCamera:reset EV and WB

EV and WB are still set manually when
close promode,need to reset the values
of EV and WB to default.

Change-Id: I930c3190d702cd92cb63dc4ea4aa363ad2319ce1
CRs-Fixed: 2163642

2 files changed, 13 insertions, 0 deletions

diff --git a/src/com/android/camera/ui/OneUICameraControls.java b/src/com/android/camera/ui/OneUICameraControls.java
index 0d503502e..7c489acc3 100644..100755
--- a/src/com/android/camera/ui/OneUICameraControls.java
+++ b/src/com/android/camera/ui/OneUICameraControls.java
@@ -552,6 +552,8 @@ public class OneUICameraControls extends RotatableLayout {
     }
 
     public void setProMode(boolean promode) {
+        if (mProModeOn && !promode)
+            mProMode.resetEVandWB();
         mProModeOn = promode;
         initializeProMode(mProModeOn);
         mProMode.reinit();
diff --git a/src/com/android/camera/ui/ProMode.java b/src/com/android/camera/ui/ProMode.java
index b55d0c425..df1d19edb 100644..100755
--- a/src/com/android/camera/ui/ProMode.java
+++ b/src/com/android/camera/ui/ProMode.java
@@ -37,6 +37,7 @@ import android.graphics.Path;
 import android.graphics.PathMeasure;
 import android.graphics.Point;
 import android.util.AttributeSet;
+import android.util.Log;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
@@ -375,4 +376,14 @@ public class ProMode extends View {
         }
     }
 
+    public void resetEVandWB(){
+        if (mSettingsManager != null) {
+            String defaultEV = getResources().getString(
+                    R.string.pref_exposure_default);
+            String defualtWB = getResources().getString(
+                    R.string.pref_camera2_whitebalance_default);
+            mSettingsManager.setValue(SettingsManager.KEY_EXPOSURE,defaultEV);
+            mSettingsManager.setValue(SettingsManager.KEY_WHITE_BALANCE,defualtWB);
+        }
+    }
 }