summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorJack Yoo <jyoo@codeaurora.org>2016-01-21 15:28:31 -0800
committerGerrit - the friendly Code Review server <code-review@localhost>2016-03-01 11:10:48 -0800
commit813c89e05e5723f7a51b9d95b37021dbd55b7654 (patch)
treedf54d3068f4db5e3c2f1b3b38d9ebde6797416d4 /res
parent1d415cfbdc221283a351aaf85029cb872bfa1988 (diff)
downloadandroid_packages_apps_Gallery2-813c89e05e5723f7a51b9d95b37021dbd55b7654.tar.gz
android_packages_apps_Gallery2-813c89e05e5723f7a51b9d95b37021dbd55b7654.tar.bz2
android_packages_apps_Gallery2-813c89e05e5723f7a51b9d95b37021dbd55b7654.zip
Gallery2: SeeStraight feature.
Introducing See Straight feature. Change-Id: I1074696cbf26f18b23181a968ec4e3130d8e1f80 CRs-Fixed: 967813
Diffstat (limited to 'res')
-rw-r--r--res/drawable/seestraight.xml62
-rw-r--r--res/layout/filtershow_main_panel.xml20
-rw-r--r--res/values/filtershow_ids.xml1
-rw-r--r--res/values/filtershow_strings.xml2
-rwxr-xr-xres/values/strings.xml1
5 files changed, 86 insertions, 0 deletions
diff --git a/res/drawable/seestraight.xml b/res/drawable/seestraight.xml
new file mode 100644
index 000000000..562ccde23
--- /dev/null
+++ b/res/drawable/seestraight.xml
@@ -0,0 +1,62 @@
+<!--
+ 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.
+-->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="32dp"
+ android:height="32dp"
+ android:viewportWidth="32"
+ android:viewportHeight="32">
+
+ <path
+ android:fillColor="#FFFFFF"
+ android:pathData="M 7.2 23.3 L 5.5 23.3 L 5.5 7.1 L 13.3 4.8 L 14.1 4.8 L 21.7 7.1 L 21.7 11.9 L 20 11.9 L 20 8.3 L 13.7 6.5 L 13.4 6.5 L 7.2 8.3 Z" />
+ <path
+ android:fillColor="#FFFFFF"
+ android:pathData="M 8.6 7 L 8 7 L 8 5.3 L 13.5 3.5 L 19.1 5.3 L 19.1 7 L 18.6 7 L 18.6 5.7 L 13.5 4.1 L 8.6 5.7 Z" />
+ <path
+ android:fillColor="#FFFFFF"
+ android:pathData="M 13.4 3.8 H 13.7 V 5.6 H 13.4 V 3.8 Z" />
+ <path
+ android:fillColor="#FFFFFF"
+ android:pathData="M 13 23.3 L 12.7 23.3 L 12.7 8.4 L 6.5 10.2 L 6.5 9.9 L 13 8.1 Z" />
+ <path
+ android:fillColor="#FFFFFF"
+ android:pathData="M 14.4 23.3 L 14.1 23.3 L 14.1 8 L 20.7 9.8 L 20.6 10.1 L 14.4 8.3 Z" />
+ <path
+ android:fillColor="#FFFFFF"
+ android:pathData="M29.8,27h-1.7v-1.4h1.7V27z M26.3,27h-1.8v-1.4h1.8V27z M22.6,27h-1.8v-1.4h1.8V27z
+M18.9,27h-1.8v-1.4 h1.8V27z M15.3,27h-1.8v-1.4h1.8V27z M11.6,27H9.8v-1.4h1.8V27z
+M8,27H6.2v-1.4H8V27z M4.3,27H2.5v-1.4h1.8V27z" />
+ <path
+ android:fillColor="#FFFFFF"
+ android:pathData="M 26.7 23.3 L 25 23.3 L 25 13.4 L 22.3 12.3 L 19.6 13.4 L 19.6 23.3 L 17.8 23.3 L 17.8 12.2 L 22 10.6 L 22.6 10.6 L 26.7 12.2 Z" />
+ <path
+ android:fillColor="#FFFFFF"
+ android:pathData="M 22.2 11.6 H 22.5 V 23.3 H 22.2 V 11.6 Z" />
+</vector>
diff --git a/res/layout/filtershow_main_panel.xml b/res/layout/filtershow_main_panel.xml
index 753ed3078..ee9990d3d 100644
--- a/res/layout/filtershow_main_panel.xml
+++ b/res/layout/filtershow_main_panel.xml
@@ -130,6 +130,16 @@
android:padding="2dip"
android:scaleType="centerInside"
android:src="@drawable/hazebuster"/>
+
+ <ImageButton
+ android:id="@+id/seeStraightButton"
+ android:layout_width="@dimen/thumbnail_size"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:background="@drawable/filtershow_button_background"
+ android:padding="2dip"
+ android:scaleType="centerInside"
+ android:src="@drawable/seestraight"/>
</LinearLayout>
<LinearLayout
@@ -219,6 +229,16 @@
android:gravity="center"
android:textColor="#ffffff"
android:textSize="@dimen/edit_main_font" />
+
+ <TextView
+ android:id="@+id/tvSeeStraight"
+ android:layout_width="@dimen/thumbnail_size"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:text="@string/seeStraight"
+ android:gravity="center"
+ android:textColor="#ffffff"
+ android:textSize="@dimen/edit_main_font" />
</LinearLayout>
</com.android.gallery3d.filtershow.CenteredLinearLayout>
</LinearLayout>
diff --git a/res/values/filtershow_ids.xml b/res/values/filtershow_ids.xml
index 70b3e72b2..0cd7082a7 100644
--- a/res/values/filtershow_ids.xml
+++ b/res/values/filtershow_ids.xml
@@ -56,4 +56,5 @@
<item type="id" name="editorDualCamFusion" />
<item type="id" name="trueScannerEditor" />
<item type="id" name="hazeBusterEditor" />
+ <item type="id" name="seeStraightEditor" />
</resources>
diff --git a/res/values/filtershow_strings.xml b/res/values/filtershow_strings.xml
index 2a7b50521..01f667efa 100644
--- a/res/values/filtershow_strings.xml
+++ b/res/values/filtershow_strings.xml
@@ -136,6 +136,8 @@
<string name="trueScanner">True Scanner</string>
<!-- HazeBuster button -->
<string name="hazeBuster">Haze Buster</string>
+ <!-- SeeStraight button -->
+ <string name="seeStraight">See Straight</string>
<!-- Label for the image exposure (brightness) filter button [CHAR LIMIT=10] -->
<string name="exposure" msgid="1229093066434614811">Exposure</string>
<!-- Label for the image sharpness (clarity, distinctness) filter button [CHAR LIMIT=10] -->
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 0873546ed..7bf28763a 100755
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1190,4 +1190,5 @@ CHAR LIMIT = NONE] -->
<string name="truescanner_normal">Normal</string>
<string name="truescanner_white">WhiteBoard</string>
<string name="hazebuster_acts">Haze Buster</string>
+ <string name="seestraight_acts">See Straight</string>
</resources>