Merge "Gallery2: Add dual camera filters" into ui_dev_2.0

31 files changed, 120 insertions, 0 deletions

diff --git a/res/drawable-hdpi/filtershow_dualcam_blur.png b/res/drawable-hdpi/filtershow_dualcam_blur.png
new file mode 100644
index 000000000..ef0a93171
--- /dev/null
+++ b/res/drawable-hdpi/filtershow_dualcam_blur.png
diff --git a/res/drawable-hdpi/filtershow_dualcam_focus.png b/res/drawable-hdpi/filtershow_dualcam_focus.png
new file mode 100644
index 000000000..d1d92c171
--- /dev/null
+++ b/res/drawable-hdpi/filtershow_dualcam_focus.png
diff --git a/res/drawable-hdpi/filtershow_dualcam_fusion.png b/res/drawable-hdpi/filtershow_dualcam_fusion.png
new file mode 100644
index 000000000..344ce25d5
--- /dev/null
+++ b/res/drawable-hdpi/filtershow_dualcam_fusion.png
diff --git a/res/drawable-hdpi/filtershow_dualcam_halo.png b/res/drawable-hdpi/filtershow_dualcam_halo.png
new file mode 100644
index 000000000..cd4359b69
--- /dev/null
+++ b/res/drawable-hdpi/filtershow_dualcam_halo.png
diff --git a/res/drawable-hdpi/filtershow_dualcam_sketch.png b/res/drawable-hdpi/filtershow_dualcam_sketch.png
new file mode 100644
index 000000000..f04db3e6f
--- /dev/null
+++ b/res/drawable-hdpi/filtershow_dualcam_sketch.png
diff --git a/res/drawable-hdpi/ic_photoeditor_dualcam.png b/res/drawable-hdpi/ic_photoeditor_dualcam.png
new file mode 100644
index 000000000..f3227f1a9
--- /dev/null
+++ b/res/drawable-hdpi/ic_photoeditor_dualcam.png
diff --git a/res/drawable-mdpi/filtershow_dualcam_blur.png b/res/drawable-mdpi/filtershow_dualcam_blur.png
new file mode 100644
index 000000000..a654c2034
--- /dev/null
+++ b/res/drawable-mdpi/filtershow_dualcam_blur.png
diff --git a/res/drawable-mdpi/filtershow_dualcam_focus.png b/res/drawable-mdpi/filtershow_dualcam_focus.png
new file mode 100644
index 000000000..b06d7027f
--- /dev/null
+++ b/res/drawable-mdpi/filtershow_dualcam_focus.png
diff --git a/res/drawable-mdpi/filtershow_dualcam_fusion.png b/res/drawable-mdpi/filtershow_dualcam_fusion.png
new file mode 100644
index 000000000..3be06b9cf
--- /dev/null
+++ b/res/drawable-mdpi/filtershow_dualcam_fusion.png
diff --git a/res/drawable-mdpi/filtershow_dualcam_halo.png b/res/drawable-mdpi/filtershow_dualcam_halo.png
new file mode 100644
index 000000000..9f3692126
--- /dev/null
+++ b/res/drawable-mdpi/filtershow_dualcam_halo.png
diff --git a/res/drawable-mdpi/filtershow_dualcam_sketch.png b/res/drawable-mdpi/filtershow_dualcam_sketch.png
new file mode 100644
index 000000000..5dc2c1931
--- /dev/null
+++ b/res/drawable-mdpi/filtershow_dualcam_sketch.png
diff --git a/res/drawable-mdpi/ic_photoeditor_dualcam.png b/res/drawable-mdpi/ic_photoeditor_dualcam.png
new file mode 100644
index 000000000..6b05972a8
--- /dev/null
+++ b/res/drawable-mdpi/ic_photoeditor_dualcam.png
diff --git a/res/drawable-xhdpi/filtershow_dualcam_blur.png b/res/drawable-xhdpi/filtershow_dualcam_blur.png
new file mode 100644
index 000000000..5fa98ecbc
--- /dev/null
+++ b/res/drawable-xhdpi/filtershow_dualcam_blur.png
diff --git a/res/drawable-xhdpi/filtershow_dualcam_focus.png b/res/drawable-xhdpi/filtershow_dualcam_focus.png
new file mode 100644
index 000000000..9d972d389
--- /dev/null
+++ b/res/drawable-xhdpi/filtershow_dualcam_focus.png
diff --git a/res/drawable-xhdpi/filtershow_dualcam_fusion.png b/res/drawable-xhdpi/filtershow_dualcam_fusion.png
new file mode 100644
index 000000000..747c7e2de
--- /dev/null
+++ b/res/drawable-xhdpi/filtershow_dualcam_fusion.png
diff --git a/res/drawable-xhdpi/filtershow_dualcam_halo.png b/res/drawable-xhdpi/filtershow_dualcam_halo.png
new file mode 100644
index 000000000..c62e5ef9d
--- /dev/null
+++ b/res/drawable-xhdpi/filtershow_dualcam_halo.png
diff --git a/res/drawable-xhdpi/filtershow_dualcam_sketch.png b/res/drawable-xhdpi/filtershow_dualcam_sketch.png
new file mode 100644
index 000000000..8eb72b1ac
--- /dev/null
+++ b/res/drawable-xhdpi/filtershow_dualcam_sketch.png
diff --git a/res/drawable-xhdpi/ic_photoeditor_dualcam.png b/res/drawable-xhdpi/ic_photoeditor_dualcam.png
new file mode 100644
index 000000000..663df2f8c
--- /dev/null
+++ b/res/drawable-xhdpi/ic_photoeditor_dualcam.png
diff --git a/res/drawable-xxhdpi/filtershow_dualcam_blur.png b/res/drawable-xxhdpi/filtershow_dualcam_blur.png
new file mode 100644
index 000000000..22f46f0dd
--- /dev/null
+++ b/res/drawable-xxhdpi/filtershow_dualcam_blur.png
diff --git a/res/drawable-xxhdpi/filtershow_dualcam_focus.png b/res/drawable-xxhdpi/filtershow_dualcam_focus.png
new file mode 100644
index 000000000..57de383e3
--- /dev/null
+++ b/res/drawable-xxhdpi/filtershow_dualcam_focus.png
diff --git a/res/drawable-xxhdpi/filtershow_dualcam_fusion.png b/res/drawable-xxhdpi/filtershow_dualcam_fusion.png
new file mode 100644
index 000000000..8533a9075
--- /dev/null
+++ b/res/drawable-xxhdpi/filtershow_dualcam_fusion.png
diff --git a/res/drawable-xxhdpi/filtershow_dualcam_halo.png b/res/drawable-xxhdpi/filtershow_dualcam_halo.png
new file mode 100644
index 000000000..345c1f83a
--- /dev/null
+++ b/res/drawable-xxhdpi/filtershow_dualcam_halo.png
diff --git a/res/drawable-xxhdpi/filtershow_dualcam_sketch.png b/res/drawable-xxhdpi/filtershow_dualcam_sketch.png
new file mode 100644
index 000000000..383dcff75
--- /dev/null
+++ b/res/drawable-xxhdpi/filtershow_dualcam_sketch.png
diff --git a/res/drawable-xxhdpi/ic_photoeditor_dualcam.png b/res/drawable-xxhdpi/ic_photoeditor_dualcam.png
new file mode 100644
index 000000000..0953e2c0c
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_photoeditor_dualcam.png
diff --git a/res/layout-land/filtershow_main_panel.xml b/res/layout-land/filtershow_main_panel.xml
index e508e767b..2202f102c 100644
--- a/res/layout-land/filtershow_main_panel.xml
+++ b/res/layout-land/filtershow_main_panel.xml
@@ -93,6 +93,15 @@
                     android:scaleType="centerInside"
                     android:visibility="gone"
                     android:src="@drawable/ic_photoeditor_makeup"/>
+            <ImageButton
+                    android:id="@+id/dualCamButton"
+                    android:layout_width="@dimen/thumbnail_size"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
+                    android:background="@drawable/filtershow_button_background"
+                    android:padding="2dip"
+                    android:scaleType="centerInside"
+                    android:src="@drawable/ic_photoeditor_dualcam"/>
 
         </LinearLayout>
 
diff --git a/res/layout/filtershow_dualcamera_editor.xml b/res/layout/filtershow_dualcamera_editor.xml
new file mode 100644
index 000000000..a845e25c9
--- /dev/null
+++ b/res/layout/filtershow_dualcamera_editor.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (c) 2015, The Linux Foundation. All rights reserved.
+
+    Redistribution and use in source and binary forms, with or without
+    modification, are permitted provided that the following conditions are
+    met:
+        * Redistributions of source code must retain the above copyright
+          notice, this list of conditions and the following disclaimer.
+        * Redistributions in binary form must reproduce the above
+          copyright notice, this list of conditions and the following
+          disclaimer in the documentation and/or other materials provided
+          with the distribution.
+        * Neither the name of The Linux Foundation nor the names of its
+          contributors may be used to endorse or promote products derived
+          from this software without specific prior written permission.
+
+    THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
+    WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
+    ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
+    BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+    BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+    WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+    OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+    IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-->
+
+
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:iconbutton="http://schemas.android.com/apk/res/com.android.gallery3d"
+    android:id="@+id/editorDualCam"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_weight="1" >
+
+    <com.android.gallery3d.filtershow.imageshow.ImageDualCamera
+        android:id="@+id/imageDualCamera"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" />
+
+</FrameLayout>
diff --git a/res/layout/filtershow_main_panel.xml b/res/layout/filtershow_main_panel.xml
index f8b26b088..1dc4e9f3f 100644
--- a/res/layout/filtershow_main_panel.xml
+++ b/res/layout/filtershow_main_panel.xml
@@ -106,6 +106,15 @@
                     android:visibility="gone"
                     android:src="@drawable/ic_photoeditor_makeup"/>
 
+            <ImageButton
+                    android:id="@+id/dualCamButton"
+                    android:layout_width="@dimen/thumbnail_size"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
+                    android:background="@drawable/filtershow_button_background"
+                    android:padding="2dip"
+                    android:scaleType="centerInside"
+                    android:src="@drawable/ic_photoeditor_dualcam"/>
         </LinearLayout>
 
     </com.android.gallery3d.filtershow.CenteredLinearLayout>
diff --git a/res/menu/filtershow_menu_fusion.xml b/res/menu/filtershow_menu_fusion.xml
new file mode 100644
index 000000000..f80349eb1
--- /dev/null
+++ b/res/menu/filtershow_menu_fusion.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (c) 2015, The Linux Foundation. All rights reserved.
+
+    Redistribution and use in source and binary forms, with or without
+    modification, are permitted provided that the following conditions are
+    met:
+        * Redistributions of source code must retain the above copyright
+          notice, this list of conditions and the following disclaimer.
+        * Redistributions in binary form must reproduce the above
+          copyright notice, this list of conditions and the following
+          disclaimer in the documentation and/or other materials provided
+          with the distribution.
+        * Neither the name of The Linux Foundation nor the names of its
+          contributors may be used to endorse or promote products derived
+          from this software without specific prior written permission.
+
+    THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
+    WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
+    ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
+    BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+    BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+    WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+    OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+    IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-->
+
+<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <group android:id="@+id/fusion_popupmenu" >
+        <item
+            android:id="@+id/fusion_menu_choose_segment"
+            android:title="@string/fusion_pick_point"/>
+        <item
+            android:id="@+id/fusion_menu_choose_underlay"
+            android:title="@string/fusion_pick_underlay"/>
+    </group>
+
+</menu>
\ No newline at end of file
diff --git a/res/raw/sketch.jpg b/res/raw/sketch.jpg
new file mode 100644
index 000000000..bf347f702
--- /dev/null
+++ b/res/raw/sketch.jpg
diff --git a/res/values/filtershow_ids.xml b/res/values/filtershow_ids.xml
index 58f16dcd1..7dc34c357 100644
--- a/res/values/filtershow_ids.xml
+++ b/res/values/filtershow_ids.xml
@@ -51,4 +51,7 @@
     <item type="id" name="editorGrad" />
     <item type="id" name="editorChanSat" />
     <item type="id" name="editorMakeup" />
+    <item type="id" name="editorDualCam" />
+    <item type="id" name="editorDualCamSketch" />
+    <item type="id" name="editorDualCamFusion" />
 </resources>
diff --git a/res/values/filtershow_strings.xml b/res/values/filtershow_strings.xml
index 9a6b08f08..fc75fb9b9 100644
--- a/res/values/filtershow_strings.xml
+++ b/res/values/filtershow_strings.xml
@@ -192,6 +192,16 @@
     <string name="downsample">Downsample</string>
     <!--  Label for the "neutral density graduated filter" filter effect  [CHAR LIMIT=15] -->
     <string name="grad">Graduated</string>
+    <!--  Label for the "refocus" dual camera effect  [CHAR LIMIT=15] -->
+    <string name="focus">Focus</string>
+    <!--  Label for the "bokeh" dual camera effect  [CHAR LIMIT=15] -->
+    <string name="blur">Bokeh</string>
+    <!--  Label for the "fusion" dual camera effect  [CHAR LIMIT=15] -->
+    <string name="fusion">Fusion</string>
+    <!--  Label for the "sketch" dual camera effect  [CHAR LIMIT=15] -->
+    <string name="sketch">Sketch</string>
+    <!--  Label for the "halo" dual camera effect  [CHAR LIMIT=15] -->
+    <string name="halo">Halo</string>
     <!--  Label for the Brightness effect  [CHAR LIMIT=20] -->
     <string name="editor_grad_brightness">Brightness</string>
     <!--  Label for the Contrast filter effect  [CHAR LIMIT=20] -->
@@ -328,4 +338,7 @@
     <!-- Label for exif tags in the information panel [CHAR LIMIT=50] -->
     <string name="filtershow_exif_copyright">Copyright</string>
 
+    <string name="fusion_pick_point">Pick Segment</string>
+    <string name="fusion_pick_underlay">Pick Underlay</string>
+
 </resources>