Merge "SnapdragonCamera: fix W+T UI issues" into camera.lnx.1.0-dev.1.0

3 files changed, 20 insertions, 17 deletions

diff --git a/res/layout/photo_module.xml b/res/layout/photo_module.xml
index c55433b3f..d65dbd4f6 100755
--- a/res/layout/photo_module.xml
+++ b/res/layout/photo_module.xml
@@ -117,11 +117,12 @@
             android:id="@+id/blur_degree_bar"
             android:orientation="horizontal"
             android:layout_gravity="bottom"
-            android:paddingBottom="80dp"
+            android:paddingBottom="130dp"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginBottom="30dip"
             android:layout_marginLeft="30dip"
-            android:layout_marginRight="30dip" />
+            android:layout_marginRight="30dip"
+            android:visibility="gone"/>
     </FrameLayout>
 </merge>
diff --git a/res/xml/camera_preferences.xml b/res/xml/camera_preferences.xml
index dc73d10da..bf9263ca4 100755
--- a/res/xml/camera_preferences.xml
+++ b/res/xml/camera_preferences.xml
@@ -397,9 +397,7 @@
     <ListPreference
         camera:key="pref_camera_bokeh_blur_degree_key"
         camera:defaultValue="@string/pref_camera_bokeh_blur_degree_default"
-        camera:title="@string/pref_camera_bokeh_blur_degree_title"
-        camera:entries="@array/pref_camera_bokeh_blur_degree_entries"
-        camera:entryValues="@array/pref_camera_bokeh_blur_degree_entry_values" />
+        camera:title="@string/pref_camera_bokeh_blur_degree_title"/>
 
 
     <ListPreference
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);
     }