summaryrefslogtreecommitdiffstats
path: root/res/drawable
diff options
context:
space:
mode:
authorByunghun Jeon <bjeon@codeaurora.org>2014-06-16 17:42:26 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2014-11-17 17:49:35 -0800
commit41d18fed018678492323150c661f2b9f6c8931a8 (patch)
tree5154564878f6b61b1edc68ee8241cf0166ca210e /res/drawable
parent0231aab003276d2142fe745e50d6eb44e3f11c9c (diff)
downloadandroid_packages_apps_Snap-41d18fed018678492323150c661f2b9f6c8931a8.tar.gz
android_packages_apps_Snap-41d18fed018678492323150c661f2b9f6c8931a8.tar.bz2
android_packages_apps_Snap-41d18fed018678492323150c661f2b9f6c8931a8.zip
SnapdragonCamera: Modify SnapdragonCamera UI
Modified SnapdragonCamera setting menus with new icons Change-Id: I726296dfb100ac81ad6f1cd84420ae27c0ae1201
Diffstat (limited to 'res/drawable')
-rw-r--r--res/drawable/bg_pressed_exit_fading.xml1
-rw-r--r--res/drawable/btn_new_shutter.xml4
-rw-r--r--res/drawable/btn_new_shutter_video.xml4
-rw-r--r--res/drawable/list_border.xml38
-rw-r--r--res/drawable/list_selector.xml34
-rw-r--r--res/drawable/scene_mode_view_border.xml36
-rw-r--r--res/drawable/scene_mode_view_border_selected.xml36
-rw-r--r--res/drawable/shutter_button_anim.xml73
-rw-r--r--res/drawable/thumb_filter_aqua.pngbin0 -> 30363 bytes
-rw-r--r--res/drawable/thumb_filter_emboss.pngbin0 -> 45718 bytes
-rw-r--r--res/drawable/thumb_filter_monochrome.pngbin0 -> 17269 bytes
-rw-r--r--res/drawable/thumb_filter_negative.pngbin0 -> 37390 bytes
-rw-r--r--res/drawable/thumb_filter_neon.pngbin0 -> 45101 bytes
-rw-r--r--res/drawable/thumb_filter_nofilter.pngbin0 -> 36334 bytes
-rw-r--r--res/drawable/thumb_filter_posterize.pngbin0 -> 42378 bytes
-rw-r--r--res/drawable/thumb_filter_sepia.pngbin0 -> 27422 bytes
-rw-r--r--res/drawable/thumb_filter_sketch.pngbin0 -> 43786 bytes
-rw-r--r--res/drawable/thumb_filter_solarize.pngbin0 -> 36841 bytes
18 files changed, 222 insertions, 4 deletions
diff --git a/res/drawable/bg_pressed_exit_fading.xml b/res/drawable/bg_pressed_exit_fading.xml
index d317e8b5a..4661467bd 100644
--- a/res/drawable/bg_pressed_exit_fading.xml
+++ b/res/drawable/bg_pressed_exit_fading.xml
@@ -16,6 +16,7 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android"
android:exitFadeDuration="@android:integer/config_mediumAnimTime">
+ <item android:state_enabled="false" android:drawable="@android:color/transparent" />
<item android:state_pressed="true" android:drawable="@drawable/list_pressed_holo_light" />
<item android:drawable="@android:color/transparent" />
</selector>
diff --git a/res/drawable/btn_new_shutter.xml b/res/drawable/btn_new_shutter.xml
index 7a3eb81a9..5b9d6f724 100644
--- a/res/drawable/btn_new_shutter.xml
+++ b/res/drawable/btn_new_shutter.xml
@@ -15,7 +15,7 @@
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:state_pressed="true" android:drawable="@drawable/btn_shutter_pressed" />
- <item android:drawable="@drawable/btn_shutter_default" />
+ <item android:state_pressed="true" android:drawable="@drawable/shutter_button_dim" />
+ <item android:drawable="@drawable/shutter_button_0" />
</selector>
diff --git a/res/drawable/btn_new_shutter_video.xml b/res/drawable/btn_new_shutter_video.xml
index e87b456f6..518b362d8 100644
--- a/res/drawable/btn_new_shutter_video.xml
+++ b/res/drawable/btn_new_shutter_video.xml
@@ -15,7 +15,7 @@
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:state_pressed="true" android:drawable="@drawable/btn_shutter_video_pressed" />
- <item android:drawable="@drawable/btn_shutter_video_default" />
+ <item android:state_pressed="true" android:drawable="@drawable/shutter_button_video_dim" />
+ <item android:drawable="@drawable/shutter_button_video" />
</selector>
diff --git a/res/drawable/list_border.xml b/res/drawable/list_border.xml
new file mode 100644
index 000000000..1ab11ddfe
--- /dev/null
+++ b/res/drawable/list_border.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (c) 2014, 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.
+-->
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+ android:shape="rectangle" >
+
+ <solid android:color="@color/setting_color" />
+
+ <stroke
+ android:width="1dip"
+ android:color="@color/list_divider_color" />
+
+</shape>
diff --git a/res/drawable/list_selector.xml b/res/drawable/list_selector.xml
new file mode 100644
index 000000000..ada9b365a
--- /dev/null
+++ b/res/drawable/list_selector.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (c) 2014, 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.
+-->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+ <item android:drawable="@color/setting_color_light" android:state_pressed="true"/>
+ <item android:drawable="@android:color/transparent"/>
+
+</selector>
diff --git a/res/drawable/scene_mode_view_border.xml b/res/drawable/scene_mode_view_border.xml
new file mode 100644
index 000000000..68431ece6
--- /dev/null
+++ b/res/drawable/scene_mode_view_border.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (c) 2014, 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.
+-->
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+ android:shape="rectangle" >
+
+ <stroke
+ android:width="1dip"
+ android:color="#cc000000" />
+
+</shape>
diff --git a/res/drawable/scene_mode_view_border_selected.xml b/res/drawable/scene_mode_view_border_selected.xml
new file mode 100644
index 000000000..535e2d168
--- /dev/null
+++ b/res/drawable/scene_mode_view_border_selected.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (c) 2014, 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.
+-->
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+ android:shape="rectangle" >
+
+ <stroke
+ android:width="1dip"
+ android:color="#cc33b5e5" />
+
+</shape>
diff --git a/res/drawable/shutter_button_anim.xml b/res/drawable/shutter_button_anim.xml
new file mode 100644
index 000000000..914977244
--- /dev/null
+++ b/res/drawable/shutter_button_anim.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (c) 2014, 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.
+-->
+<animation-list xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/shutter_button_pressed"
+ android:oneshot="true" >
+
+ <item
+ android:drawable="@drawable/shutter_button_0"
+ android:duration="33"/>
+ <item
+ android:drawable="@drawable/shutter_button_1"
+ android:duration="33"/>
+ <item
+ android:drawable="@drawable/shutter_button_2"
+ android:duration="33"/>
+ <item
+ android:drawable="@drawable/shutter_button_3"
+ android:duration="33"/>
+ <item
+ android:drawable="@drawable/shutter_button_4"
+ android:duration="33"/>
+ <item
+ android:drawable="@drawable/shutter_button_5"
+ android:duration="33"/>
+ <item
+ android:drawable="@drawable/shutter_button_6"
+ android:duration="33"/>
+ <item
+ android:drawable="@drawable/shutter_button_5"
+ android:duration="33"/>
+ <item
+ android:drawable="@drawable/shutter_button_4"
+ android:duration="33"/>
+ <item
+ android:drawable="@drawable/shutter_button_3"
+ android:duration="33"/>
+ <item
+ android:drawable="@drawable/shutter_button_2"
+ android:duration="33"/>
+ <item
+ android:drawable="@drawable/shutter_button_1"
+ android:duration="33"/>
+ <item
+ android:drawable="@drawable/shutter_button_0"
+ android:duration="33"/>
+
+</animation-list>
diff --git a/res/drawable/thumb_filter_aqua.png b/res/drawable/thumb_filter_aqua.png
new file mode 100644
index 000000000..91fe52046
--- /dev/null
+++ b/res/drawable/thumb_filter_aqua.png
Binary files differ
diff --git a/res/drawable/thumb_filter_emboss.png b/res/drawable/thumb_filter_emboss.png
new file mode 100644
index 000000000..ebfc75325
--- /dev/null
+++ b/res/drawable/thumb_filter_emboss.png
Binary files differ
diff --git a/res/drawable/thumb_filter_monochrome.png b/res/drawable/thumb_filter_monochrome.png
new file mode 100644
index 000000000..9bfb2d540
--- /dev/null
+++ b/res/drawable/thumb_filter_monochrome.png
Binary files differ
diff --git a/res/drawable/thumb_filter_negative.png b/res/drawable/thumb_filter_negative.png
new file mode 100644
index 000000000..8520afe52
--- /dev/null
+++ b/res/drawable/thumb_filter_negative.png
Binary files differ
diff --git a/res/drawable/thumb_filter_neon.png b/res/drawable/thumb_filter_neon.png
new file mode 100644
index 000000000..27bb71b21
--- /dev/null
+++ b/res/drawable/thumb_filter_neon.png
Binary files differ
diff --git a/res/drawable/thumb_filter_nofilter.png b/res/drawable/thumb_filter_nofilter.png
new file mode 100644
index 000000000..fc790cd5f
--- /dev/null
+++ b/res/drawable/thumb_filter_nofilter.png
Binary files differ
diff --git a/res/drawable/thumb_filter_posterize.png b/res/drawable/thumb_filter_posterize.png
new file mode 100644
index 000000000..fa8c34c80
--- /dev/null
+++ b/res/drawable/thumb_filter_posterize.png
Binary files differ
diff --git a/res/drawable/thumb_filter_sepia.png b/res/drawable/thumb_filter_sepia.png
new file mode 100644
index 000000000..5a77f8cbe
--- /dev/null
+++ b/res/drawable/thumb_filter_sepia.png
Binary files differ
diff --git a/res/drawable/thumb_filter_sketch.png b/res/drawable/thumb_filter_sketch.png
new file mode 100644
index 000000000..baca1d4f0
--- /dev/null
+++ b/res/drawable/thumb_filter_sketch.png
Binary files differ
diff --git a/res/drawable/thumb_filter_solarize.png b/res/drawable/thumb_filter_solarize.png
new file mode 100644
index 000000000..96ab7ac13
--- /dev/null
+++ b/res/drawable/thumb_filter_solarize.png
Binary files differ