summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorJack Yoo <jyoo@codeaurora.org>2016-06-30 14:16:44 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2016-08-16 16:10:18 -0700
commit2fceef1ed0dfb3cb35062b6f6ebe8ca68e7bf87c (patch)
tree86a0cfd7ddb6ddde91dfb310d47d8f6e289f9d78 /res
parent039e6e3a2baa4c510306d32683cf258eb8e00e10 (diff)
downloadandroid_packages_apps_Snap-2fceef1ed0dfb3cb35062b6f6ebe8ca68e7bf87c.tar.gz
android_packages_apps_Snap-2fceef1ed0dfb3cb35062b6f6ebe8ca68e7bf87c.tar.bz2
android_packages_apps_Snap-2fceef1ed0dfb3cb35062b6f6ebe8ca68e7bf87c.zip
SnapdragonCamera: Bestpicture scene filter
Adding best picture selection scene filter Change-Id: Ifa0f544e80d161eaef743d611c712d8db48e5631 CRs-Fixed: 1050663
Diffstat (limited to 'res')
-rw-r--r--res/drawable-hdpi/pick_the_best_photo.pngbin0 -> 55579 bytes
-rw-r--r--res/drawable-hdpi/pick_the_best_photo_selected.pngbin0 -> 1151 bytes
-rw-r--r--res/drawable-hdpi/pick_the_best_photo_unselected.pngbin0 -> 1005 bytes
-rw-r--r--res/drawable-xhdpi/pick_the_best_photo.pngbin0 -> 56319 bytes
-rw-r--r--res/drawable-xhdpi/pick_the_best_photo_selected.pngbin0 -> 1726 bytes
-rw-r--r--res/drawable-xhdpi/pick_the_best_photo_unselected.pngbin0 -> 1523 bytes
-rw-r--r--res/drawable-xxhdpi/pick_the_best_photo.pngbin0 -> 57779 bytes
-rw-r--r--res/drawable-xxhdpi/pick_the_best_photo_selected.pngbin0 -> 2306 bytes
-rw-r--r--res/drawable-xxhdpi/pick_the_best_photo_unselected.pngbin0 -> 2118 bytes
-rw-r--r--res/layout/bestpicture_editor.xml69
-rw-r--r--res/layout/bestpicture_page.xml58
-rw-r--r--res/values/camera2arrays.xml3
-rw-r--r--res/values/qcomstrings.xml3
13 files changed, 133 insertions, 0 deletions
diff --git a/res/drawable-hdpi/pick_the_best_photo.png b/res/drawable-hdpi/pick_the_best_photo.png
new file mode 100644
index 000000000..f0b892136
--- /dev/null
+++ b/res/drawable-hdpi/pick_the_best_photo.png
Binary files differ
diff --git a/res/drawable-hdpi/pick_the_best_photo_selected.png b/res/drawable-hdpi/pick_the_best_photo_selected.png
new file mode 100644
index 000000000..d2b5f1508
--- /dev/null
+++ b/res/drawable-hdpi/pick_the_best_photo_selected.png
Binary files differ
diff --git a/res/drawable-hdpi/pick_the_best_photo_unselected.png b/res/drawable-hdpi/pick_the_best_photo_unselected.png
new file mode 100644
index 000000000..13bdec3e3
--- /dev/null
+++ b/res/drawable-hdpi/pick_the_best_photo_unselected.png
Binary files differ
diff --git a/res/drawable-xhdpi/pick_the_best_photo.png b/res/drawable-xhdpi/pick_the_best_photo.png
new file mode 100644
index 000000000..629af4a09
--- /dev/null
+++ b/res/drawable-xhdpi/pick_the_best_photo.png
Binary files differ
diff --git a/res/drawable-xhdpi/pick_the_best_photo_selected.png b/res/drawable-xhdpi/pick_the_best_photo_selected.png
new file mode 100644
index 000000000..92f11cb17
--- /dev/null
+++ b/res/drawable-xhdpi/pick_the_best_photo_selected.png
Binary files differ
diff --git a/res/drawable-xhdpi/pick_the_best_photo_unselected.png b/res/drawable-xhdpi/pick_the_best_photo_unselected.png
new file mode 100644
index 000000000..a558c7a1f
--- /dev/null
+++ b/res/drawable-xhdpi/pick_the_best_photo_unselected.png
Binary files differ
diff --git a/res/drawable-xxhdpi/pick_the_best_photo.png b/res/drawable-xxhdpi/pick_the_best_photo.png
new file mode 100644
index 000000000..2374b1848
--- /dev/null
+++ b/res/drawable-xxhdpi/pick_the_best_photo.png
Binary files differ
diff --git a/res/drawable-xxhdpi/pick_the_best_photo_selected.png b/res/drawable-xxhdpi/pick_the_best_photo_selected.png
new file mode 100644
index 000000000..522e9f2ba
--- /dev/null
+++ b/res/drawable-xxhdpi/pick_the_best_photo_selected.png
Binary files differ
diff --git a/res/drawable-xxhdpi/pick_the_best_photo_unselected.png b/res/drawable-xxhdpi/pick_the_best_photo_unselected.png
new file mode 100644
index 000000000..98e18b07e
--- /dev/null
+++ b/res/drawable-xxhdpi/pick_the_best_photo_unselected.png
Binary files differ
diff --git a/res/layout/bestpicture_editor.xml b/res/layout/bestpicture_editor.xml
new file mode 100644
index 000000000..6c35c27a1
--- /dev/null
+++ b/res/layout/bestpicture_editor.xml
@@ -0,0 +1,69 @@
+<?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.
+-->
+<FrameLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
+
+ <android.support.v4.view.ViewPager
+ android:id="@+id/bestpicture_pager"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_gravity="center" />
+
+ <RelativeLayout
+ android:layout_width="match_parent"
+ android:layout_height="50dp"
+ android:background="#b2191919">
+ <LinearLayout
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:layout_alignParentRight="true">
+ <TextView
+ android:id="@+id/bestpicture_done"
+ android:text="@string/bestpicture_done"
+ android:textColor="#ffffff"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center"/>
+ </LinearLayout>
+ </RelativeLayout>
+ <RelativeLayout
+ android:layout_width="match_parent"
+ android:layout_height="50dp"
+ android:layout_gravity="bottom"
+ android:background="#b2191919">
+ <com.android.camera.ui.DotsView
+ android:id="@+id/dots_view"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_centerInParent="true" />
+ </RelativeLayout>
+</FrameLayout>
diff --git a/res/layout/bestpicture_page.xml b/res/layout/bestpicture_page.xml
new file mode 100644
index 000000000..d6b6022c8
--- /dev/null
+++ b/res/layout/bestpicture_page.xml
@@ -0,0 +1,58 @@
+<?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.
+-->
+<FrameLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
+ <ImageView
+ android:id="@+id/image_view"
+ android:adjustViewBounds="true"
+ android:scaleType="fitXY"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center" />
+ <RelativeLayout
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:id="@+id/click_view">
+ <LinearLayout
+ android:layout_width="wrap_content"
+ android:layout_height="150dp"
+ android:layout_alignParentBottom="true"
+ android:layout_alignParentRight="true">
+ <ImageView
+ android:id="@+id/picture_select"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="top"
+ android:layout_marginRight="20dp"/>
+ </LinearLayout>
+ </RelativeLayout>
+</FrameLayout>
diff --git a/res/values/camera2arrays.xml b/res/values/camera2arrays.xml
index 37a33ec17..bb5eeca50 100644
--- a/res/values/camera2arrays.xml
+++ b/res/values/camera2arrays.xml
@@ -133,6 +133,7 @@
<item>8</item>
<item>9</item>
<item>-1</item>
+ <item>103</item>
</string-array>
<!-- Camera Preferences Scene Mode dialog box entries -->
@@ -153,6 +154,7 @@
<item>@string/pref_camera_scenemode_entry_beach</item>
<item>@string/pref_camera_scenemode_entry_snow</item>
<item>@string/pref_camera_scenemode_entry_asd</item>
+ <item>@string/pref_camera_scenemode_entry_bestpicture</item>
</string-array>
<array name="pref_camera2_scenemode_thumbnails" translatable="false">
@@ -172,6 +174,7 @@
<item>@drawable/ic_scene_mode_beach</item>
<item>@drawable/ic_scene_mode_snow</item>
<item>@drawable/ic_scene_mode_smartauto</item>
+ <item>@drawable/pick_the_best_photo</item>
</array>
<string-array name="pref_camera2_whitebalance_entryvalues" translatable="false">
diff --git a/res/values/qcomstrings.xml b/res/values/qcomstrings.xml
index f8f1f1963..c75be9ab0 100644
--- a/res/values/qcomstrings.xml
+++ b/res/values/qcomstrings.xml
@@ -1023,5 +1023,8 @@
<string name="pref_camera2_videosnap_entry_enable" translatable="true">Enable</string>
<string name="pref_camera2_videosnap_entry_disable" translatable="true">Disable</string>
<string name="pref_camera2_trackingfocus_title" translatable="true">Tracking Focus</string>
+ <string name="pref_camera_scenemode_entry_bestpicture" translatable="true">BestPicture</string>
+ <string name="bestpicture_done" translatable="true">DONE</string>
+ <string name="bestpicture_at_least_one_picture" translatable="true">At least, one picture has to be chosen.</string>
</resources>