summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
Diffstat (limited to 'res')
-rwxr-xr-xres/drawable-hdpi/blackboard.pngbin0 -> 12231 bytes
-rwxr-xr-xres/drawable-hdpi/bw.pngbin0 -> 13812 bytes
-rwxr-xr-x[-rw-r--r--]res/drawable-hdpi/focus.pngbin15562 -> 13753 bytes
-rwxr-xr-x[-rw-r--r--]res/drawable-hdpi/fusion.pngbin22420 -> 18830 bytes
-rwxr-xr-x[-rw-r--r--]res/drawable-hdpi/halo.pngbin18272 -> 19538 bytes
-rwxr-xr-xres/drawable-hdpi/motion.pngbin0 -> 13189 bytes
-rwxr-xr-xres/drawable-hdpi/negative.pngbin0 -> 19656 bytes
-rwxr-xr-x[-rw-r--r--]res/drawable-hdpi/none.pngbin16866 -> 19608 bytes
-rwxr-xr-xres/drawable-hdpi/posterize.pngbin0 -> 16930 bytes
-rwxr-xr-x[-rw-r--r--]res/drawable-hdpi/sketch.pngbin23417 -> 14844 bytes
-rwxr-xr-xres/drawable-hdpi/whiteboard.pngbin0 -> 13018 bytes
-rwxr-xr-xres/drawable-hdpi/zoom.pngbin0 -> 17337 bytes
-rwxr-xr-xres/drawable-xhdpi/blackboard.pngbin0 -> 24610 bytes
-rwxr-xr-xres/drawable-xhdpi/bw.pngbin0 -> 30239 bytes
-rwxr-xr-x[-rw-r--r--]res/drawable-xhdpi/focus.pngbin23754 -> 27291 bytes
-rwxr-xr-x[-rw-r--r--]res/drawable-xhdpi/fusion.pngbin36951 -> 40890 bytes
-rwxr-xr-x[-rw-r--r--]res/drawable-xhdpi/halo.pngbin30310 -> 44186 bytes
-rwxr-xr-xres/drawable-xhdpi/motion.pngbin0 -> 27015 bytes
-rwxr-xr-xres/drawable-xhdpi/negative.pngbin0 -> 44515 bytes
-rwxr-xr-xres/drawable-xhdpi/none.pngbin0 -> 44479 bytes
-rwxr-xr-xres/drawable-xhdpi/posterize.pngbin0 -> 37259 bytes
-rwxr-xr-x[-rw-r--r--]res/drawable-xhdpi/sketch.pngbin40439 -> 32652 bytes
-rwxr-xr-xres/drawable-xhdpi/three_d.pngbin0 -> 2639 bytes
-rwxr-xr-xres/drawable-xhdpi/whiteboard.pngbin0 -> 26494 bytes
-rwxr-xr-xres/drawable-xhdpi/zoom.pngbin0 -> 37610 bytes
-rwxr-xr-xres/drawable-xxhdpi/blackboard.pngbin0 -> 37472 bytes
-rwxr-xr-xres/drawable-xxhdpi/bw.pngbin0 -> 52504 bytes
-rwxr-xr-x[-rw-r--r--]res/drawable-xxhdpi/focus.pngbin49557 -> 43738 bytes
-rwxr-xr-x[-rw-r--r--]res/drawable-xxhdpi/fusion.pngbin84358 -> 69500 bytes
-rwxr-xr-x[-rw-r--r--]res/drawable-xxhdpi/halo.pngbin68562 -> 77915 bytes
-rwxr-xr-xres/drawable-xxhdpi/motion.pngbin0 -> 43611 bytes
-rwxr-xr-xres/drawable-xxhdpi/negative.pngbin0 -> 78232 bytes
-rwxr-xr-x[-rw-r--r--]res/drawable-xxhdpi/none.pngbin63931 -> 78603 bytes
-rwxr-xr-xres/drawable-xxhdpi/posterize.pngbin0 -> 63763 bytes
-rwxr-xr-x[-rw-r--r--]res/drawable-xxhdpi/sketch.pngbin113272 -> 56448 bytes
-rwxr-xr-xres/drawable-xxhdpi/three_d.pngbin0 -> 5794 bytes
-rwxr-xr-xres/drawable-xxhdpi/whiteboard.pngbin0 -> 38273 bytes
-rwxr-xr-xres/drawable-xxhdpi/zoom.pngbin0 -> 63260 bytes
-rwxr-xr-xres/layout/activity_three_dimensional.xml74
-rwxr-xr-xres/layout/filtershow_actionbar_dualcam_fusion.xml45
-rwxr-xr-xres/layout/three_d_button.xml52
-rwxr-xr-xres/values-zh-rCN/filtershow_strings.xml24
-rwxr-xr-x[-rw-r--r--]res/values/filtershow_strings.xml20
43 files changed, 215 insertions, 0 deletions
diff --git a/res/drawable-hdpi/blackboard.png b/res/drawable-hdpi/blackboard.png
new file mode 100755
index 000000000..6cb6e31d4
--- /dev/null
+++ b/res/drawable-hdpi/blackboard.png
Binary files differ
diff --git a/res/drawable-hdpi/bw.png b/res/drawable-hdpi/bw.png
new file mode 100755
index 000000000..fa8175473
--- /dev/null
+++ b/res/drawable-hdpi/bw.png
Binary files differ
diff --git a/res/drawable-hdpi/focus.png b/res/drawable-hdpi/focus.png
index a168a05d0..64eb95fa2 100644..100755
--- a/res/drawable-hdpi/focus.png
+++ b/res/drawable-hdpi/focus.png
Binary files differ
diff --git a/res/drawable-hdpi/fusion.png b/res/drawable-hdpi/fusion.png
index 7abeb245f..52438ae8e 100644..100755
--- a/res/drawable-hdpi/fusion.png
+++ b/res/drawable-hdpi/fusion.png
Binary files differ
diff --git a/res/drawable-hdpi/halo.png b/res/drawable-hdpi/halo.png
index f32da8519..35a462056 100644..100755
--- a/res/drawable-hdpi/halo.png
+++ b/res/drawable-hdpi/halo.png
Binary files differ
diff --git a/res/drawable-hdpi/motion.png b/res/drawable-hdpi/motion.png
new file mode 100755
index 000000000..1a03479a2
--- /dev/null
+++ b/res/drawable-hdpi/motion.png
Binary files differ
diff --git a/res/drawable-hdpi/negative.png b/res/drawable-hdpi/negative.png
new file mode 100755
index 000000000..b4989d4af
--- /dev/null
+++ b/res/drawable-hdpi/negative.png
Binary files differ
diff --git a/res/drawable-hdpi/none.png b/res/drawable-hdpi/none.png
index 58a7fd833..107b299b3 100644..100755
--- a/res/drawable-hdpi/none.png
+++ b/res/drawable-hdpi/none.png
Binary files differ
diff --git a/res/drawable-hdpi/posterize.png b/res/drawable-hdpi/posterize.png
new file mode 100755
index 000000000..042b686c1
--- /dev/null
+++ b/res/drawable-hdpi/posterize.png
Binary files differ
diff --git a/res/drawable-hdpi/sketch.png b/res/drawable-hdpi/sketch.png
index f43f6ace1..e1603a9b7 100644..100755
--- a/res/drawable-hdpi/sketch.png
+++ b/res/drawable-hdpi/sketch.png
Binary files differ
diff --git a/res/drawable-hdpi/whiteboard.png b/res/drawable-hdpi/whiteboard.png
new file mode 100755
index 000000000..584da40a1
--- /dev/null
+++ b/res/drawable-hdpi/whiteboard.png
Binary files differ
diff --git a/res/drawable-hdpi/zoom.png b/res/drawable-hdpi/zoom.png
new file mode 100755
index 000000000..ea1211f29
--- /dev/null
+++ b/res/drawable-hdpi/zoom.png
Binary files differ
diff --git a/res/drawable-xhdpi/blackboard.png b/res/drawable-xhdpi/blackboard.png
new file mode 100755
index 000000000..287a6f717
--- /dev/null
+++ b/res/drawable-xhdpi/blackboard.png
Binary files differ
diff --git a/res/drawable-xhdpi/bw.png b/res/drawable-xhdpi/bw.png
new file mode 100755
index 000000000..d0052d162
--- /dev/null
+++ b/res/drawable-xhdpi/bw.png
Binary files differ
diff --git a/res/drawable-xhdpi/focus.png b/res/drawable-xhdpi/focus.png
index ea695b49c..c58f4c674 100644..100755
--- a/res/drawable-xhdpi/focus.png
+++ b/res/drawable-xhdpi/focus.png
Binary files differ
diff --git a/res/drawable-xhdpi/fusion.png b/res/drawable-xhdpi/fusion.png
index 158fcbb2e..625eb85c3 100644..100755
--- a/res/drawable-xhdpi/fusion.png
+++ b/res/drawable-xhdpi/fusion.png
Binary files differ
diff --git a/res/drawable-xhdpi/halo.png b/res/drawable-xhdpi/halo.png
index 8047a73e1..93846175d 100644..100755
--- a/res/drawable-xhdpi/halo.png
+++ b/res/drawable-xhdpi/halo.png
Binary files differ
diff --git a/res/drawable-xhdpi/motion.png b/res/drawable-xhdpi/motion.png
new file mode 100755
index 000000000..7d2b8a6ba
--- /dev/null
+++ b/res/drawable-xhdpi/motion.png
Binary files differ
diff --git a/res/drawable-xhdpi/negative.png b/res/drawable-xhdpi/negative.png
new file mode 100755
index 000000000..a1eab0da7
--- /dev/null
+++ b/res/drawable-xhdpi/negative.png
Binary files differ
diff --git a/res/drawable-xhdpi/none.png b/res/drawable-xhdpi/none.png
new file mode 100755
index 000000000..703556222
--- /dev/null
+++ b/res/drawable-xhdpi/none.png
Binary files differ
diff --git a/res/drawable-xhdpi/posterize.png b/res/drawable-xhdpi/posterize.png
new file mode 100755
index 000000000..157ad30e3
--- /dev/null
+++ b/res/drawable-xhdpi/posterize.png
Binary files differ
diff --git a/res/drawable-xhdpi/sketch.png b/res/drawable-xhdpi/sketch.png
index 357cb4176..f4fc6eb82 100644..100755
--- a/res/drawable-xhdpi/sketch.png
+++ b/res/drawable-xhdpi/sketch.png
Binary files differ
diff --git a/res/drawable-xhdpi/three_d.png b/res/drawable-xhdpi/three_d.png
new file mode 100755
index 000000000..ab8d4df54
--- /dev/null
+++ b/res/drawable-xhdpi/three_d.png
Binary files differ
diff --git a/res/drawable-xhdpi/whiteboard.png b/res/drawable-xhdpi/whiteboard.png
new file mode 100755
index 000000000..1225d335f
--- /dev/null
+++ b/res/drawable-xhdpi/whiteboard.png
Binary files differ
diff --git a/res/drawable-xhdpi/zoom.png b/res/drawable-xhdpi/zoom.png
new file mode 100755
index 000000000..f3eac3d73
--- /dev/null
+++ b/res/drawable-xhdpi/zoom.png
Binary files differ
diff --git a/res/drawable-xxhdpi/blackboard.png b/res/drawable-xxhdpi/blackboard.png
new file mode 100755
index 000000000..0881d3b4c
--- /dev/null
+++ b/res/drawable-xxhdpi/blackboard.png
Binary files differ
diff --git a/res/drawable-xxhdpi/bw.png b/res/drawable-xxhdpi/bw.png
new file mode 100755
index 000000000..a2accdd11
--- /dev/null
+++ b/res/drawable-xxhdpi/bw.png
Binary files differ
diff --git a/res/drawable-xxhdpi/focus.png b/res/drawable-xxhdpi/focus.png
index 8d58fd6ce..15bb4a415 100644..100755
--- a/res/drawable-xxhdpi/focus.png
+++ b/res/drawable-xxhdpi/focus.png
Binary files differ
diff --git a/res/drawable-xxhdpi/fusion.png b/res/drawable-xxhdpi/fusion.png
index 1e88b9b6b..8bd69e348 100644..100755
--- a/res/drawable-xxhdpi/fusion.png
+++ b/res/drawable-xxhdpi/fusion.png
Binary files differ
diff --git a/res/drawable-xxhdpi/halo.png b/res/drawable-xxhdpi/halo.png
index 99ed56f6c..d3a69f9e4 100644..100755
--- a/res/drawable-xxhdpi/halo.png
+++ b/res/drawable-xxhdpi/halo.png
Binary files differ
diff --git a/res/drawable-xxhdpi/motion.png b/res/drawable-xxhdpi/motion.png
new file mode 100755
index 000000000..7eb4c2cff
--- /dev/null
+++ b/res/drawable-xxhdpi/motion.png
Binary files differ
diff --git a/res/drawable-xxhdpi/negative.png b/res/drawable-xxhdpi/negative.png
new file mode 100755
index 000000000..90a609fd0
--- /dev/null
+++ b/res/drawable-xxhdpi/negative.png
Binary files differ
diff --git a/res/drawable-xxhdpi/none.png b/res/drawable-xxhdpi/none.png
index 6e54e7d59..74e451920 100644..100755
--- a/res/drawable-xxhdpi/none.png
+++ b/res/drawable-xxhdpi/none.png
Binary files differ
diff --git a/res/drawable-xxhdpi/posterize.png b/res/drawable-xxhdpi/posterize.png
new file mode 100755
index 000000000..0bc95dffc
--- /dev/null
+++ b/res/drawable-xxhdpi/posterize.png
Binary files differ
diff --git a/res/drawable-xxhdpi/sketch.png b/res/drawable-xxhdpi/sketch.png
index be89c59a0..22931feaa 100644..100755
--- a/res/drawable-xxhdpi/sketch.png
+++ b/res/drawable-xxhdpi/sketch.png
Binary files differ
diff --git a/res/drawable-xxhdpi/three_d.png b/res/drawable-xxhdpi/three_d.png
new file mode 100755
index 000000000..ab58b4553
--- /dev/null
+++ b/res/drawable-xxhdpi/three_d.png
Binary files differ
diff --git a/res/drawable-xxhdpi/whiteboard.png b/res/drawable-xxhdpi/whiteboard.png
new file mode 100755
index 000000000..f584c3fce
--- /dev/null
+++ b/res/drawable-xxhdpi/whiteboard.png
Binary files differ
diff --git a/res/drawable-xxhdpi/zoom.png b/res/drawable-xxhdpi/zoom.png
new file mode 100755
index 000000000..2c1dd02da
--- /dev/null
+++ b/res/drawable-xxhdpi/zoom.png
Binary files differ
diff --git a/res/layout/activity_three_dimensional.xml b/res/layout/activity_three_dimensional.xml
new file mode 100755
index 000000000..316c9ad71
--- /dev/null
+++ b/res/layout/activity_three_dimensional.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (c) 2016, 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.
+-->
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:orientation="vertical"
+ tools:context="com.android.gallery3d.app.dualcam3d.ThreeDimensionalActivity">
+
+ <include layout="@layout/three_d_button" />
+
+ <com.android.gallery3d.app.dualcam3d.GLView
+ android:id="@+id/image"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent" />
+
+ <LinearLayout
+ android:id="@+id/mode_3d"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="top|end"
+ android:orientation="vertical"
+ android:visibility="gone">
+
+ <Button
+ android:id="@+id/mode_gyro"
+ android:layout_width="wrap_content"
+ android:layout_height="40dp"
+ android:text="@string/grad"
+ android:textAlignment="center" />
+
+ <Button
+ android:id="@+id/mode_auto"
+ android:layout_width="wrap_content"
+ android:layout_height="40dp"
+ android:text="@string/auto"
+ android:textAlignment="center" />
+
+ <Button
+ android:id="@+id/mode_touch"
+ android:layout_width="wrap_content"
+ android:layout_height="40dp"
+ android:text="@string/trueportrait_touch_up"
+ android:textAlignment="center" />
+ </LinearLayout>
+
+</merge>
diff --git a/res/layout/filtershow_actionbar_dualcam_fusion.xml b/res/layout/filtershow_actionbar_dualcam_fusion.xml
new file mode 100755
index 000000000..c5cec2572
--- /dev/null
+++ b/res/layout/filtershow_actionbar_dualcam_fusion.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+ Copyright (c) 2016, 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.
+-->
+
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_weight="1">
+
+ <ImageButton
+ android:id="@+id/pick_underlay"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:layout_alignParentRight="true"
+ android:background="@android:color/transparent"
+ android:paddingEnd="16dp"
+ android:paddingStart="16dp"
+ android:src="@drawable/tp_bg_select" />
+
+</RelativeLayout> \ No newline at end of file
diff --git a/res/layout/three_d_button.xml b/res/layout/three_d_button.xml
new file mode 100755
index 000000000..eb8366db3
--- /dev/null
+++ b/res/layout/three_d_button.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (c) 2016, 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.
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/three_d_button"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="100dp"
+ android:layout_marginEnd="50dp"
+ android:layout_alignParentTop="true"
+ android:layout_alignParentEnd="true"
+ android:layout_gravity="bottom"
+ android:orientation="horizontal"
+ android:theme="@android:style/Theme.DeviceDefault"
+ android:visibility="gone">
+
+ <ImageButton
+ android:id="@+id/three_dimensional"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:layout_gravity="center_vertical"
+ android:layout_weight="1"
+ android:background="?android:attr/actionBarItemBackground"
+ android:src="@drawable/three_d"
+ android:visibility="visible" />
+</LinearLayout>
diff --git a/res/values-zh-rCN/filtershow_strings.xml b/res/values-zh-rCN/filtershow_strings.xml
index 3d73589bf..0c372c2e1 100755
--- a/res/values-zh-rCN/filtershow_strings.xml
+++ b/res/values-zh-rCN/filtershow_strings.xml
@@ -154,9 +154,33 @@
<string name="filtershow_exif_f_stop" msgid="6081797865604483139">"光圈值"</string>
<string name="filtershow_exif_exposure_time" msgid="4099067062781294115">"曝光时间"</string>
<string name="filtershow_exif_copyright" msgid="8801875918803737581">"版权"</string>
+ <!-- Label for the "refocus" dual camera effect [CHAR LIMIT=15] -->
+ <string name="focus">对焦</string>
+ <!-- Label for the "fusion" dual camera effect [CHAR LIMIT=15] -->
+ <string name="fusion">背景切换</string>
+ <!-- Label for the "sketch" dual camera effect [CHAR LIMIT=15] -->
+ <string name="sketch">素描</string>
+ <!-- Label for the "halo" dual camera effect [CHAR LIMIT=15] -->
+ <string name="halo">光环</string>
+ <!-- Label for the "zoom" dual camera effect [CHAR LIMIT=15] -->
+ <string name="zoom">缩放模糊</string>
+ <!-- Label for the "motion" dual camera effect [CHAR LIMIT=15] -->
+ <string name="motion">动态模糊</string>
+ <!-- Label for the "bw" dual camera effect [CHAR LIMIT=15] -->
+ <string name="bw">去色</string>
+ <!-- Label for the "blackboard" dual camera effect [CHAR LIMIT=15] -->
+ <string name="blackboard">黑板</string>
+ <!-- Label for the "whiteboard" dual camera effect [CHAR LIMIT=15] -->
+ <string name="whiteboard">白板</string>
+ <!-- Label for the "posterize" dual camera effect [CHAR LIMIT=15] -->
+ <string name="posterize">色块化</string>
+ <!-- Label for the "negative" dual camera effect [CHAR LIMIT=15] -->
+ <string name="dc_negative">负片</string>
<string name="color">滤镜</string>
<string name="frames">相框</string>
+ <string name="dual_camera_effects">双摄像头效果</string>
+ <string name="dual_camera_effects_intro">此功能可将双摄像头效果应用到背景上,如动态模糊和素描。.你可以将两张照片合并到一起来创建一个有趣的效果。这个功能在你的摄像头和照片的主体有一个短距离时效果最好。</string>
<string name="trueportrait_intro">此功能用于增强人像照。你可以将效果应用于照片背景,例如“模糊”和“速写”。你也可以将两张照片拼在一起来给你的人像照创建一个有趣的背景。</string>
</resources>
diff --git a/res/values/filtershow_strings.xml b/res/values/filtershow_strings.xml
index 7c0212e7e..bdf5acebd 100644..100755
--- a/res/values/filtershow_strings.xml
+++ b/res/values/filtershow_strings.xml
@@ -208,6 +208,20 @@
<string name="sketch">Sketch</string>
<!-- Label for the "halo" dual camera effect [CHAR LIMIT=15] -->
<string name="halo">Halo</string>
+ <!-- Label for the "zoom" dual camera effect [CHAR LIMIT=15] -->
+ <string name="zoom">Zoom</string>
+ <!-- Label for the "motion" dual camera effect [CHAR LIMIT=15] -->
+ <string name="motion">Motion</string>
+ <!-- Label for the "bw" dual camera effect [CHAR LIMIT=15] -->
+ <string name="bw">B/W</string>
+ <!-- Label for the "blackboard" dual camera effect [CHAR LIMIT=15] -->
+ <string name="blackboard">Blackboard</string>
+ <!-- Label for the "whiteboard" dual camera effect [CHAR LIMIT=15] -->
+ <string name="whiteboard">Whiteboard</string>
+ <!-- Label for the "posterize" dual camera effect [CHAR LIMIT=15] -->
+ <string name="posterize">Posterize</string>
+ <!-- Label for the "negative" dual camera effect [CHAR LIMIT=15] -->
+ <string name="dc_negative">negative</string>
<!-- Label for the "blur" true portrait effect [CHAR LIMIT=15] -->
<string name="blur">Blur</string>
<!-- Label for the "motion blur" true portrait effect [CHAR LIMIT=15] -->
@@ -350,6 +364,8 @@
<string name="fusion_pick_point">Pick Segment</string>
<string name="fusion_pick_underlay">Pick Underlay</string>
+ <string name="dual_camera_effects">Dual Camera Effects</string>
+ <string name="dual_camera_effects_intro">Allows you to apply background effects, such as "Motion" and "Sketch". You can also merge two photos together for interesting effects. This feature works best when you have a short distance your camera and the main subject of you picture.</string>
<string name="dualcam_no_segment_toast">No segment found at this point</string>
<string name="dualcam_filter_not_supported">Dual camera filters not supported for this image</string>
<string name="trueportrait_intro">Allows you to enhance photos of people. You can apply effects to the background, such as \"blur\" and \"sketch\". You can also merge two photos together to create interesting backgrounds for your portrait photos.</string>
@@ -359,6 +375,7 @@
<string name="trueportrait_edit_background_toast">Use your finger to paint in any areas of the background that were missed.</string>
<string name="trueportrait_edit_help">To zoom, use two fingers to pinch open or closed. You can also drag with two fingers to re-position the image. This can make it easier to fix any problem areas.</string>
<string name="trueportrait_fusion_intro">Your foreground person can be copied and pasted onto any photo in your Gallery. You can try using different background photos to create new and interesting portraits.</string>
+ <string name="dualcam_fusion_intro">Your foreground can be copied and pasted onto any photo in your Gallery. \n\nYou can try using different background photos to create new and interesting portraits.</string>
<string name="do_not_show_again">Do not show again</string>
<string name="trueportrait_touch_up">Touch Up</string>
<string name="fusion_pick_background">Select Background Photo</string>
@@ -372,8 +389,11 @@
<string name="background">Background</string>
<string name="brush_size">Brush Size</string>
+ <string name="pref_dualcam_intro_show_key" translatable="false">pref_dualcam_intro_show_key</string>
<string name="pref_trueportrait_intro_show_key" translatable="false">pref_trueportrait_intro_show_key</string>
<string name="pref_trueportrait_edit_intro_show_key" translatable="false">pref_trueportrait_edit_intro_show_key</string>
<string name="pref_trueportrait_fusion_intro_show_key" translatable="false">pref_trueportrait_fusion_intro_show_key</string>
<string name="pref_trueportrait_fusion_underlay_key" translatable="false">pref_trueportrait_fusion_underlay_key</string>
+ <string name="pref_dualcam_fusion_underlay_key" translatable="false">pref_dualcam_fusion_underlay_key</string>
+ <string name="pref_dualcam_fusion_intro_show_key" translatable="false">pref_trueportrait_fusion_intro_show_key</string>
</resources>