diff options
| author | Linux Build Service Account <lnxbuild@quicinc.com> | 2018-01-15 10:53:24 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-01-15 10:53:24 -0800 |
| commit | 042bc19b99b8672c7827077ca8b99c9b5d812739 (patch) | |
| tree | 7c8656863769d50dfb57747f8cfc1ddef685d2f8 /src/com/android/camera/ui | |
| parent | 5c506530efac35927ccc6ece596734c081e8d596 (diff) | |
| parent | 30e4033320e245067d559eb62a02cc21624480d8 (diff) | |
| download | android_packages_apps_Snap-042bc19b99b8672c7827077ca8b99c9b5d812739.tar.gz android_packages_apps_Snap-042bc19b99b8672c7827077ca8b99c9b5d812739.tar.bz2 android_packages_apps_Snap-042bc19b99b8672c7827077ca8b99c9b5d812739.zip | |
Merge "SnapdragonCamera:reset EV and WB"
Diffstat (limited to 'src/com/android/camera/ui')
| -rwxr-xr-x[-rw-r--r--] | src/com/android/camera/ui/OneUICameraControls.java | 2 | ||||
| -rwxr-xr-x[-rw-r--r--] | src/com/android/camera/ui/ProMode.java | 11 |
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); + } + } } |