From 5167fdf5b42e471a51a3bc44ca1a5adb69e676e2 Mon Sep 17 00:00:00 2001
From: Likai Ding <likaid@codeaurora.org>
Date: Mon, 22 Jul 2013 10:36:14 +0800
Subject: Gallery2: support audio effects during video play.

Porting from kk with fixes

Conflicts:
	res/values/strings.xml

Change-Id: I267c3c7e402fd5cf2bb223547003af491dd8289e
Signed-off-by: Xiaojing Zhang <zhangx@codeaurora.org>
---
 res/values/attrs.xml   |  6 +++++-
 res/values/colors.xml  |  4 ++++
 res/values/strings.xml | 15 +++++++++++++++
 3 files changed, 24 insertions(+), 1 deletion(-)

(limited to 'res/values')

diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 5a00a695a..eadd4f20b 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -42,5 +42,9 @@
         <attr name="largeIcons" format="reference" />
         <attr name="images" format="reference" />
     </declare-styleable>
-
+    <declare-styleable name="Knob">
+        <attr name="label" format="string" />
+        <attr name="background" format="integer" />
+        <attr name="foreground" format="integer" />
+    </declare-styleable>
 </resources>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 4fe918094..1f1d6ec1e 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -70,4 +70,8 @@
     <color name="face_detect_fail">#80d05060</color>
     <color name="gray">#FFAAAAAA</color>
 
+    <color name="highlight">#00a8ff</color>
+    <color name="lowlight">#00527c</color>
+    <color name="grey">#999999</color>
+    <color name="disabled_knob">#505050</color>
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index e19f95082..bb9bf188a 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1119,6 +1119,21 @@ CHAR LIMIT = NONE] -->
         <item quantity="other">%1$d photos</item>
     </plurals>
 
+    <!-- The label for the bass boost knob of the audio effects dialog. -->
+    <string name="bass_boost_strength">Bass boost</string>
+
+    <!-- The label for the 3d effect knob of the audio effects dialog. -->
+    <string name="virtualizer_strength">3D effect</string>
+
+    <!-- The label for the audio effects menu. -->
+    <string name="audio_effects">Audio effects</string>
+
+    <!-- Toast if user attempts to control audio effects without headphones plugged in. -->
+    <string name="headset_plug">Plug in headphones for these effects.</string>
+
+    <!-- The title of the audio effects dialog. -->
+    <string name="audio_effects_dialog_title">Snapdragon Audio+</string>
+
     <!-- The tips of trimming video -->
     <string name="fail_trim">Sorry, this video file can not be trimmed</string>
 </resources>
-- 
cgit v1.2.3