diff options
author | Camera Software Integration <camswint@localhost> | 2017-03-09 06:32:20 -0800 |
---|---|---|
committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-03-09 06:32:20 -0800 |
commit | 846ee0c2e67a5b50f29d7732dab6197ba346e53c (patch) | |
tree | e0b09776bee1270764595a856c63def4794f315c /src | |
parent | b7d5dd4620319193c241eb4a50001c03bc392a4b (diff) | |
parent | 41cabf1499bdd5465c403d39a10742baef454192 (diff) | |
download | android_packages_apps_Snap-846ee0c2e67a5b50f29d7732dab6197ba346e53c.tar.gz android_packages_apps_Snap-846ee0c2e67a5b50f29d7732dab6197ba346e53c.tar.bz2 android_packages_apps_Snap-846ee0c2e67a5b50f29d7732dab6197ba346e53c.zip |
Merge "SnapdragonCamera: fix W+T UI issues" into camera.lnx.1.0-dev.1.0
Diffstat (limited to 'src')
-rw-r--r-- | src/com/android/camera/PhotoModule.java | 28 |
1 files changed, 16 insertions, 12 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index d5f6d00ab..639cf91bf 100644 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -22,6 +22,7 @@ import android.app.Activity; import android.content.ContentResolver; import android.content.Context; import android.content.Intent; +import android.content.SharedPreferences; import android.content.SharedPreferences.Editor; import android.content.pm.PackageManager; import android.content.res.Configuration; @@ -51,6 +52,7 @@ import android.os.Looper; import android.os.Message; import android.os.MessageQueue; import android.os.SystemClock; +import android.preference.PreferenceManager; import android.provider.MediaStore; import android.util.DisplayMetrics; import android.util.Log; @@ -1576,17 +1578,16 @@ public class PhotoModule public void onStartTrackingTouch(SeekBar bar) { } public void onProgressChanged(SeekBar bar, int progress, boolean fromtouch) { - if (mPreferenceGroup != null) { - ListPreference blurValue = mPreferenceGroup.findPreference( - CameraSettings.KEY_BOKEH_BLUR_VALUE); - if (blurValue != null) { - blurValue.setValue(""+progress); - } + if (mParameters != null) { + mParameters.set(CameraSettings.KEY_QC_BOKEH_BLUR_VALUE, progress); } - mParameters.set(CameraSettings.KEY_QC_BOKEH_BLUR_VALUE, progress); Log.d(TAG,"seekbar bokeh degree = "+ progress); } public void onStopTrackingTouch(SeekBar bar) { + final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(mActivity); + SharedPreferences.Editor editor = prefs.edit(); + editor.putInt(CameraSettings.KEY_BOKEH_BLUR_VALUE, bar.getProgress()); + editor.apply(); } }; @@ -3725,6 +3726,9 @@ public class PhotoModule if(mManual3AEnabled != 0) { mManual3AEnabled = 0; } + 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() { @@ -3736,14 +3740,11 @@ public class PhotoModule mUI.overrideSettings(CameraSettings.KEY_LONGSHOT, mActivity.getString(R.string.pref_camera_longshot_default)); mBlurDegreeProgressBar.setVisibility(View.VISIBLE); - mBlurDegreeProgressBar.setProgress(50); + mBlurDegreeProgressBar.setProgress(degree); } }); - mParameters.set(CameraSettings.KEY_QC_BOKEH_MODE, bokehMode); - mParameters.set(CameraSettings.KEY_QC_BOKEH_MPO_MODE, bokehMpo); - mParameters.set(CameraSettings.KEY_QC_BOKEH_BLUR_VALUE, bokehBlurDegree); - } else { + bokehBlurDegree = "0"; mActivity.runOnUiThread(new Runnable() { @Override public void run() { @@ -3755,6 +3756,9 @@ public class PhotoModule } }); } + mParameters.set(CameraSettings.KEY_QC_BOKEH_MODE, bokehMode); + mParameters.set(CameraSettings.KEY_QC_BOKEH_MPO_MODE, bokehMpo); + mParameters.set(CameraSettings.KEY_QC_BOKEH_BLUR_VALUE, bokehBlurDegree); Log.v(TAG, "Bokeh Mode = " + bokehMode + " bokehMpo = " + bokehMpo + " bokehBlurDegree = " + bokehBlurDegree); } |