15 files changed, 33 insertions, 6 deletions

diff --git a/res/drawable-hdpi/bokeh_shutter_01.png b/res/drawable-hdpi/bokeh_shutter_01.png
new file mode 100755
index 000000000..051bc372d
--- /dev/null
+++ b/res/drawable-hdpi/bokeh_shutter_01.png
diff --git a/res/drawable-hdpi/bokeh_shutter_02.png b/res/drawable-hdpi/bokeh_shutter_02.png
new file mode 100755
index 000000000..ccbf3361a
--- /dev/null
+++ b/res/drawable-hdpi/bokeh_shutter_02.png
diff --git a/res/drawable-hdpi/bokeh_shutter_03.png b/res/drawable-hdpi/bokeh_shutter_03.png
new file mode 100755
index 000000000..861e07972
--- /dev/null
+++ b/res/drawable-hdpi/bokeh_shutter_03.png
diff --git a/res/drawable-hdpi/bokeh_shutter_04.png b/res/drawable-hdpi/bokeh_shutter_04.png
new file mode 100755
index 000000000..dc9ff6864
--- /dev/null
+++ b/res/drawable-hdpi/bokeh_shutter_04.png
diff --git a/res/drawable-hdpi/bokeh_shutter_05.png b/res/drawable-hdpi/bokeh_shutter_05.png
new file mode 100755
index 000000000..89bd851ad
--- /dev/null
+++ b/res/drawable-hdpi/bokeh_shutter_05.png
diff --git a/res/drawable-hdpi/bokeh_shutter_06.png b/res/drawable-hdpi/bokeh_shutter_06.png
new file mode 100755
index 000000000..66a6c7a94
--- /dev/null
+++ b/res/drawable-hdpi/bokeh_shutter_06.png
diff --git a/res/drawable-hdpi/bokeh_shutter_07.png b/res/drawable-hdpi/bokeh_shutter_07.png
new file mode 100755
index 000000000..021f32d18
--- /dev/null
+++ b/res/drawable-hdpi/bokeh_shutter_07.png
diff --git a/res/drawable-hdpi/ic_bokeh_off.png b/res/drawable-hdpi/ic_bokeh_off.png
new file mode 100755
index 000000000..d773fe2ba
--- /dev/null
+++ b/res/drawable-hdpi/ic_bokeh_off.png
diff --git a/res/drawable-hdpi/ic_bokeh_on.png b/res/drawable-hdpi/ic_bokeh_on.png
new file mode 100755
index 000000000..34232e862
--- /dev/null
+++ b/res/drawable-hdpi/ic_bokeh_on.png
diff --git a/res/drawable-mdpi/ic_bokeh_off.png b/res/drawable-mdpi/ic_bokeh_off.png
new file mode 100755
index 000000000..45a87e3cf
--- /dev/null
+++ b/res/drawable-mdpi/ic_bokeh_off.png
diff --git a/res/drawable-mdpi/ic_bokeh_on.png b/res/drawable-mdpi/ic_bokeh_on.png
new file mode 100755
index 000000000..91a9c9867
--- /dev/null
+++ b/res/drawable-mdpi/ic_bokeh_on.png
diff --git a/res/layout/camera_controls.xml b/res/layout/camera_controls.xml
index 59f395b19..5e337096d 100644..100755
--- a/res/layout/camera_controls.xml
+++ b/res/layout/camera_controls.xml
@@ -112,6 +112,10 @@
         android:id="@+id/ts_makeup_switcher"
         style="@style/ToggleButton" />
 
+    <com.android.camera.ui.RotateImageView
+        android:id="@+id/bokeh_switcher"
+        style="@style/ToggleButton" />
+
     <LinearLayout
         android:id="@+id/remaining_photos"
         android:layout_width="wrap_content"
diff --git a/res/layout/photo_module.xml b/res/layout/photo_module.xml
index 77c4def21..b1f12dcc7 100755
--- a/res/layout/photo_module.xml
+++ b/res/layout/photo_module.xml
@@ -116,12 +116,18 @@
             style="?android:attr/seekBarStyle"
             android:id="@+id/blur_degree_bar"
             android:orientation="horizontal"
-            android:layout_gravity="bottom"
-            android:layout_width="match_parent"
+            android:layout_width="200dp"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="160dip"
-            android:layout_marginLeft="30dip"
-            android:layout_marginRight="30dip"
+            android:visibility="gone"/>
+        <TextView
+            android:id="@+id/bokeh_tip_text"
+            android:background="@android:color/darker_gray"
+            android:textColor="@android:color/white"
+            android:textSize="20sp"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="130dip"
+            android:layout_gravity="bottom|center_horizontal"
             android:visibility="gone"/>
     </FrameLayout>
 </merge>
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 40b55892f..cc1f64777 100644..100755
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -635,6 +635,11 @@
         <item>@drawable/ic_hdr</item>
     </string-array>
 
+    <string-array name="pref_camera_bokeh_icons" translatable="false">
+        <item>@drawable/ic_bokeh_on</item>
+        <item>@drawable/ic_bokeh_off</item>
+    </string-array>
+
     <string-array name="pref_camera_hdr_entryvalues" translatable="false">
         <item>@string/setting_off_value</item>
         <item>@string/setting_on_value</item>
@@ -666,6 +671,16 @@
         <item>@drawable/ic_exposure_p3</item>
     </array>
 
+    <array name="bokeh_shutter_icons" translatable="false">
+        <item>@drawable/bokeh_shutter_01</item>
+        <item>@drawable/bokeh_shutter_02</item>
+        <item>@drawable/bokeh_shutter_03</item>
+        <item>@drawable/bokeh_shutter_04</item>
+        <item>@drawable/bokeh_shutter_05</item>
+        <item>@drawable/bokeh_shutter_06</item>
+        <item>@drawable/bokeh_shutter_07</item>
+    </array>
+
     <!--  Labels for Countdown timer -->
     <string-array name="pref_camera_countdown_labels">
         <item>@string/pref_camera_countdown_label_off</item>
diff --git a/res/xml/camera_preferences.xml b/res/xml/camera_preferences.xml
index bf9263ca4..d380a27be 100755
--- a/res/xml/camera_preferences.xml
+++ b/res/xml/camera_preferences.xml
@@ -380,11 +380,13 @@
             camera:entries="@array/pref_camera_instant_capture_entries"
             camera:entryValues="@array/pref_camera_instant_capture_entry_values" />
 
-    <ListPreference
+    <IconListPreference
         camera:key="pref_camera_bokeh_mode_key"
         camera:defaultValue="@string/pref_camera_bokeh_mode_default"
         camera:title="@string/pref_camera_bokeh_mode_title"
         camera:entries="@array/pref_camera_bokeh_mode_entries"
+        camera:icons="@array/pref_camera_bokeh_icons"
+        camera:largeIcons="@array/pref_camera_bokeh_icons"
         camera:entryValues="@array/pref_camera_bokeh_mode_entry_values" />
 
     <ListPreference