diff options
author | Likai Ding <likaid@codeaurora.org> | 2013-07-22 10:36:14 +0800 |
---|---|---|
committer | emancebo <emancebo@cyngn.com> | 2014-09-04 10:40:17 -0700 |
commit | 2f15566fdc3dc524f3710715de9b004e2efcfae3 (patch) | |
tree | 26ae00a3a1f363db37b1eed02a1977c2d54d5e82 /res | |
parent | 12c89af7f5358587c7924f06e38a118d5461897e (diff) | |
download | android_packages_apps_Gallery2-2f15566fdc3dc524f3710715de9b004e2efcfae3.tar.gz android_packages_apps_Gallery2-2f15566fdc3dc524f3710715de9b004e2efcfae3.tar.bz2 android_packages_apps_Gallery2-2f15566fdc3dc524f3710715de9b004e2efcfae3.zip |
Gallery2: support audio effects during video play.
CRs-Fixed: 516108
CRs-Fixed: 516113
CRs-Fixed: 516114
Change-Id: I267c3c7e402fd5cf2bb223547003af491dd8289e
Diffstat (limited to 'res')
-rw-r--r-- | res/drawable-hdpi/knob.png | bin | 0 -> 34246 bytes | |||
-rw-r--r-- | res/drawable-hdpi/knob_bg.png | bin | 0 -> 14924 bytes | |||
-rw-r--r-- | res/drawable-hdpi/knob_toggle_off.png | bin | 0 -> 3071 bytes | |||
-rw-r--r-- | res/drawable-hdpi/knob_toggle_on.png | bin | 0 -> 3299 bytes | |||
-rw-r--r-- | res/layout/audio_effects_dialog.xml | 82 | ||||
-rw-r--r-- | res/layout/knob.xml | 74 | ||||
-rw-r--r-- | res/values-zh-rCN/strings.xml | 4 | ||||
-rw-r--r-- | res/values-zh-rTW/strings.xml | 4 | ||||
-rw-r--r-- | res/values/attrs.xml | 6 | ||||
-rw-r--r-- | res/values/colors.xml | 4 | ||||
-rwxr-xr-x[-rw-r--r--] | res/values/strings.xml | 15 |
11 files changed, 188 insertions, 1 deletions
diff --git a/res/drawable-hdpi/knob.png b/res/drawable-hdpi/knob.png Binary files differnew file mode 100644 index 000000000..a6871ad5a --- /dev/null +++ b/res/drawable-hdpi/knob.png diff --git a/res/drawable-hdpi/knob_bg.png b/res/drawable-hdpi/knob_bg.png Binary files differnew file mode 100644 index 000000000..342350937 --- /dev/null +++ b/res/drawable-hdpi/knob_bg.png diff --git a/res/drawable-hdpi/knob_toggle_off.png b/res/drawable-hdpi/knob_toggle_off.png Binary files differnew file mode 100644 index 000000000..a89595e2b --- /dev/null +++ b/res/drawable-hdpi/knob_toggle_off.png diff --git a/res/drawable-hdpi/knob_toggle_on.png b/res/drawable-hdpi/knob_toggle_on.png Binary files differnew file mode 100644 index 000000000..8b96e86f5 --- /dev/null +++ b/res/drawable-hdpi/knob_toggle_on.png diff --git a/res/layout/audio_effects_dialog.xml b/res/layout/audio_effects_dialog.xml new file mode 100644 index 000000000..83892c224 --- /dev/null +++ b/res/layout/audio_effects_dialog.xml @@ -0,0 +1,82 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +Copyright (c) 2013, 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" + xmlns:custom="http://schemas.android.com/apk/res/com.android.gallery3d" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:orientation="vertical" + android:gravity="center"> + + <LinearLayout + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:orientation="vertical" + android:gravity="center_horizontal" + android:paddingBottom="10dp"> + + <Switch + android:id="@+id/audio_effects_switch" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/audio_effects" + android:textAppearance="?android:attr/textAppearanceSmall" + android:layout_marginTop="10dp" + android:layout_marginLeft="25dp" + android:layout_marginRight="30dp" /> + + <LinearLayout + android:id="@+id/aEffectsPanel" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:orientation="horizontal" + android:layout_marginTop="5dp" + android:layout_marginBottom="10dp" + android:gravity="center_vertical"> + + <com.android.gallery3d.ui.Knob + android:id="@+id/bBStrengthKnob" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + custom:label="@string/bass_boost_strength" + custom:background="@drawable/knob_bg" + custom:foreground="@drawable/knob" /> + + <com.android.gallery3d.ui.Knob + android:id="@+id/vIStrengthKnob" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + custom:label="@string/virtualizer_strength" + custom:background="@drawable/knob_bg" + custom:foreground="@drawable/knob" /> + + </LinearLayout> + </LinearLayout> +</LinearLayout> diff --git a/res/layout/knob.xml b/res/layout/knob.xml new file mode 100644 index 000000000..41c982ebc --- /dev/null +++ b/res/layout/knob.xml @@ -0,0 +1,74 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +Copyright (c) 2013, 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="wrap_content" + android:layout_height="wrap_content"> + + <ImageView + android:id="@+id/knob_foreground" + android:layout_width="wrap_content" + android:layout_height="wrap_content" /> + <ImageView + android:id="@+id/knob_toggle_on" + android:layout_gravity="center_horizontal|center_vertical" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:src="@drawable/knob_toggle_on" + android:visibility="gone" /> + <ImageView + android:id="@+id/knob_toggle_off" + android:layout_gravity="center_horizontal|center_vertical" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:src="@drawable/knob_toggle_off" + android:visibility="gone" /> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_gravity="center_horizontal" + android:orientation="vertical" + android:gravity="center_horizontal"> + + <TextView + android:id="@+id/knob_value" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:visibility="gone" /> + <TextView + android:id="@+id/knob_label" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:ellipsize="marquee" + android:visibility="gone" /> + </LinearLayout> + +</FrameLayout> diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml index 0b224fd8f..4946552b2 100644 --- a/res/values-zh-rCN/strings.xml +++ b/res/values-zh-rCN/strings.xml @@ -436,4 +436,8 @@ <item quantity="one" msgid="6949174783125614798">"%1$d张照片"</item> <item quantity="other" msgid="3813306834113858135">"%1$d张照片"</item> </plurals> + + <string name="bass_boost_strength" msgid="882301530007752270">"低音增强"</string> + <string name="virtualizer_strength" msgid="5035111173763913313">"3D 音效"</string> + <string name="audio_effects" msgid="612896145300512593">"音效"</string> </resources> diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml index c7a3d733d..820629efd 100644 --- a/res/values-zh-rTW/strings.xml +++ b/res/values-zh-rTW/strings.xml @@ -436,4 +436,8 @@ <item quantity="one" msgid="6949174783125614798">"%1$d 張相片"</item> <item quantity="other" msgid="3813306834113858135">"%1$d 張相片"</item> </plurals> + + <string name="bass_boost_strength">"低音加強"</string> + <string name="virtualizer_strength">"3D 效果"</string> + <string name="audio_effects">"音效"</string> </resources> 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..5a20016b1 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">#505050</color> </resources> diff --git a/res/values/strings.xml b/res/values/strings.xml index d813d8852..ed77dbbe9 100644..100755 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -1102,4 +1102,19 @@ CHAR LIMIT = NONE] --> <!-- The tips of trimming video --> <string name="fail_trim">Sorry, this video file can not be trimmed</string> + + <!-- 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> </resources> |