diff options
author | Byunghun Jeon <bjeon@codeaurora.org> | 2014-06-16 17:42:26 -0700 |
---|---|---|
committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2014-11-17 17:49:35 -0800 |
commit | 41d18fed018678492323150c661f2b9f6c8931a8 (patch) | |
tree | 5154564878f6b61b1edc68ee8241cf0166ca210e /res | |
parent | 0231aab003276d2142fe745e50d6eb44e3f11c9c (diff) | |
download | android_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')
37 files changed, 952 insertions, 150 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 Binary files differnew file mode 100644 index 000000000..91fe52046 --- /dev/null +++ b/res/drawable/thumb_filter_aqua.png diff --git a/res/drawable/thumb_filter_emboss.png b/res/drawable/thumb_filter_emboss.png Binary files differnew file mode 100644 index 000000000..ebfc75325 --- /dev/null +++ b/res/drawable/thumb_filter_emboss.png diff --git a/res/drawable/thumb_filter_monochrome.png b/res/drawable/thumb_filter_monochrome.png Binary files differnew file mode 100644 index 000000000..9bfb2d540 --- /dev/null +++ b/res/drawable/thumb_filter_monochrome.png diff --git a/res/drawable/thumb_filter_negative.png b/res/drawable/thumb_filter_negative.png Binary files differnew file mode 100644 index 000000000..8520afe52 --- /dev/null +++ b/res/drawable/thumb_filter_negative.png diff --git a/res/drawable/thumb_filter_neon.png b/res/drawable/thumb_filter_neon.png Binary files differnew file mode 100644 index 000000000..27bb71b21 --- /dev/null +++ b/res/drawable/thumb_filter_neon.png diff --git a/res/drawable/thumb_filter_nofilter.png b/res/drawable/thumb_filter_nofilter.png Binary files differnew file mode 100644 index 000000000..fc790cd5f --- /dev/null +++ b/res/drawable/thumb_filter_nofilter.png diff --git a/res/drawable/thumb_filter_posterize.png b/res/drawable/thumb_filter_posterize.png Binary files differnew file mode 100644 index 000000000..fa8c34c80 --- /dev/null +++ b/res/drawable/thumb_filter_posterize.png diff --git a/res/drawable/thumb_filter_sepia.png b/res/drawable/thumb_filter_sepia.png Binary files differnew file mode 100644 index 000000000..5a77f8cbe --- /dev/null +++ b/res/drawable/thumb_filter_sepia.png diff --git a/res/drawable/thumb_filter_sketch.png b/res/drawable/thumb_filter_sketch.png Binary files differnew file mode 100644 index 000000000..baca1d4f0 --- /dev/null +++ b/res/drawable/thumb_filter_sketch.png diff --git a/res/drawable/thumb_filter_solarize.png b/res/drawable/thumb_filter_solarize.png Binary files differnew file mode 100644 index 000000000..96ab7ac13 --- /dev/null +++ b/res/drawable/thumb_filter_solarize.png diff --git a/res/layout-land/camera_controls.xml b/res/layout-land/camera_controls.xml index cf27af192..1d911badc 100644 --- a/res/layout-land/camera_controls.xml +++ b/res/layout-land/camera_controls.xml @@ -13,59 +13,109 @@ See the License for the specific language governing permissions and limitations under the License. --> -<com.android.camera.ui.CameraControls - xmlns:android="http://schemas.android.com/apk/res/android" +<com.android.camera.ui.CameraControls xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/camera_controls" android:layout_width="match_parent" android:layout_height="match_parent" > - <View - android:id="@+id/blocker" - android:clickable="true" - android:layout_height="match_parent" - android:layout_width="@dimen/switcher_size" - android:layout_gravity="right" /> - - <include layout="@layout/menu_indicators" - android:layout_width="64dip" - android:layout_height="64dip" - android:layout_marginTop="-5dip" - android:layout_marginRight="6dip" - android:layout_gravity="top|right"/> - - <com.android.camera.ui.PieMenuButton - android:id="@+id/menu" - style="@style/SwitcherButton" - android:contentDescription="@string/accessibility_menu_button" - android:layout_gravity="right|top" - android:layout_marginRight="2dip" /> - - <com.android.camera.ui.ModuleSwitcher - android:id="@+id/camera_switcher" - style="@style/SwitcherButton" - android:layout_gravity="right|bottom" - android:layout_marginRight="2dip" - android:contentDescription="@string/accessibility_mode_picker" /> - - <com.android.camera.ShutterButton - android:id="@+id/shutter_button" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="right|center_vertical" - android:layout_marginRight="@dimen/shutter_offset" - android:clickable="true" - android:contentDescription="@string/accessibility_shutter_button" - android:focusable="true" - android:scaleType="center" - android:src="@drawable/btn_new_shutter" /> + <View + android:id="@+id/blocker" + android:layout_width="@dimen/switcher_size" + android:layout_height="match_parent" + android:layout_gravity="right" + android:clickable="true" /> + + <include + android:layout_width="64dip" + android:layout_height="64dip" + android:layout_gravity="top|right" + android:layout_marginRight="8dip" + android:layout_marginTop="-8dip" + layout="@layout/menu_indicators" /> + + <com.android.camera.ui.RotatableLayout + android:id="@+id/menu" + style="@style/ToggleButtonOuter" + android:layout_marginRight="2dip" > <ImageView - android:id="@+id/preview_thumb" - android:visibility="invisible" - android:layout_width="@dimen/capture_size" - android:layout_height="@dimen/capture_size" - android:scaleType="centerInside" - android:layout_gravity="top|right" - android:contentDescription="@string/switch_photo_filmstrip" /> + style="@style/MenuButton" + android:layout_gravity="center" + android:contentDescription="@string/accessibility_menu_button" + android:src="@drawable/ic_settings" /> + </com.android.camera.ui.RotatableLayout> + + <com.android.camera.ui.ModuleSwitcher + android:id="@+id/camera_switcher" + style="@style/SwitcherButton" + android:layout_gravity="right|bottom" + android:layout_marginRight="2dip" + android:contentDescription="@string/accessibility_mode_picker" /> + + <com.android.camera.ShutterButton + android:id="@+id/shutter_button" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="right|center_vertical" + android:layout_marginRight="@dimen/shutter_offset" + android:clickable="true" + android:contentDescription="@string/accessibility_shutter_button" + android:focusable="true" + android:scaleType="center" + android:src="@drawable/btn_new_shutter" /> + + <ImageView + android:id="@+id/preview_thumb" + android:layout_width="@dimen/capture_size" + android:layout_height="@dimen/capture_size" + android:layout_gravity="top|right" + android:contentDescription="@string/switch_photo_filmstrip" + android:scaleType="centerInside" + android:visibility="invisible" /> + + <com.android.camera.ui.RotatableLayout + android:id="@+id/front_back_switcher" + style="@style/ToggleButtonOuter" > + + <com.android.camera.ui.RotateImageView + style="@style/ToggleButton" + android:layout_gravity="center" /> + </com.android.camera.ui.RotatableLayout> + + <com.android.camera.ui.RotatableLayout + android:id="@+id/flash_switcher" + style="@style/ToggleButtonOuter" > + + <com.android.camera.ui.RotateImageView + style="@style/ToggleButton" + android:layout_gravity="center" /> + </com.android.camera.ui.RotatableLayout> + + <com.android.camera.ui.RotatableLayout + android:id="@+id/hdr_switcher" + style="@style/ToggleButtonOuter" > + + <com.android.camera.ui.RotateImageView + style="@style/ToggleButton" + android:layout_gravity="center" /> + </com.android.camera.ui.RotatableLayout> + + <com.android.camera.ui.RotatableLayout + android:id="@+id/scene_mode_switcher" + style="@style/ToggleButtonOuter" > + + <com.android.camera.ui.RotateImageView + style="@style/ToggleButton" + android:layout_gravity="center" /> + </com.android.camera.ui.RotatableLayout> + + <com.android.camera.ui.RotatableLayout + android:id="@+id/filter_mode_switcher" + style="@style/ToggleButtonOuter" > + + <com.android.camera.ui.RotateImageView + style="@style/ToggleButton" + android:layout_gravity="center" /> + </com.android.camera.ui.RotatableLayout> </com.android.camera.ui.CameraControls> diff --git a/res/layout-port/camera_controls.xml b/res/layout-port/camera_controls.xml index a98ddff25..130efc748 100644 --- a/res/layout-port/camera_controls.xml +++ b/res/layout-port/camera_controls.xml @@ -13,59 +13,109 @@ See the License for the specific language governing permissions and limitations under the License. --> -<com.android.camera.ui.CameraControls - xmlns:android="http://schemas.android.com/apk/res/android" +<com.android.camera.ui.CameraControls xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/camera_controls" android:layout_width="match_parent" android:layout_height="match_parent" > - <View - android:id="@+id/blocker" - android:clickable="true" - android:layout_width="match_parent" - android:layout_height="@dimen/switcher_size" - android:layout_gravity="bottom" /> - - <include layout="@layout/menu_indicators" - android:layout_width="64dip" - android:layout_height="64dip" - android:layout_gravity="bottom|right" - android:layout_marginBottom="6dip" - android:layout_marginRight="-5dip" /> - - <com.android.camera.ui.PieMenuButton - android:id="@+id/menu" - style="@style/SwitcherButton" - android:layout_gravity="bottom|right" - android:layout_marginBottom="2dip" - android:contentDescription="@string/accessibility_menu_button" /> - - <com.android.camera.ui.ModuleSwitcher - android:id="@+id/camera_switcher" - style="@style/SwitcherButton" - android:layout_gravity="bottom|left" - android:layout_marginBottom="2dip" - android:contentDescription="@string/accessibility_mode_picker" /> - - <com.android.camera.ShutterButton - android:id="@+id/shutter_button" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="bottom|center_horizontal" - android:layout_marginBottom="@dimen/shutter_offset" - android:clickable="true" - android:contentDescription="@string/accessibility_shutter_button" - android:focusable="true" - android:scaleType="center" - android:src="@drawable/btn_new_shutter" /> + <View + android:id="@+id/blocker" + android:layout_width="match_parent" + android:layout_height="@dimen/switcher_size" + android:layout_gravity="bottom" + android:clickable="true" /> + + <include + android:layout_width="64dip" + android:layout_height="64dip" + android:layout_gravity="bottom|right" + android:layout_marginBottom="8dip" + android:layout_marginRight="-8dip" + layout="@layout/menu_indicators" /> + + <com.android.camera.ui.RotatableLayout + android:id="@+id/menu" + style="@style/MenuButtonOuter" + android:layout_marginRight="2dip" > <ImageView - android:id="@+id/preview_thumb" - android:visibility="invisible" - android:layout_width="@dimen/capture_size" - android:layout_height="@dimen/capture_size" - android:scaleType="centerInside" - android:layout_gravity="top|right" - android:contentDescription="@string/switch_photo_filmstrip" /> + style="@style/MenuButton" + android:layout_gravity="center" + android:contentDescription="@string/accessibility_menu_button" + android:src="@drawable/ic_settings" /> + </com.android.camera.ui.RotatableLayout> + + <com.android.camera.ui.ModuleSwitcher + android:id="@+id/camera_switcher" + style="@style/SwitcherButton" + android:layout_gravity="bottom|left" + android:layout_marginBottom="2dip" + android:contentDescription="@string/accessibility_mode_picker" /> + + <com.android.camera.ShutterButton + android:id="@+id/shutter_button" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="bottom|center_horizontal" + android:layout_marginBottom="@dimen/shutter_offset" + android:clickable="true" + android:contentDescription="@string/accessibility_shutter_button" + android:focusable="true" + android:scaleType="center" + android:src="@drawable/btn_new_shutter" /> + + <ImageView + android:id="@+id/preview_thumb" + android:layout_width="@dimen/capture_size" + android:layout_height="@dimen/capture_size" + android:layout_gravity="top|right" + android:contentDescription="@string/switch_photo_filmstrip" + android:scaleType="centerInside" + android:visibility="invisible" /> + + <com.android.camera.ui.RotatableLayout + android:id="@+id/front_back_switcher" + style="@style/ToggleButtonOuter" > + + <com.android.camera.ui.RotateImageView + style="@style/ToggleButton" + android:layout_gravity="center" /> + </com.android.camera.ui.RotatableLayout> + + <com.android.camera.ui.RotatableLayout + android:id="@+id/flash_switcher" + style="@style/ToggleButtonOuter" > + + <com.android.camera.ui.RotateImageView + style="@style/ToggleButton" + android:layout_gravity="center" /> + </com.android.camera.ui.RotatableLayout> + + <com.android.camera.ui.RotatableLayout + android:id="@+id/hdr_switcher" + style="@style/ToggleButtonOuter" > + + <com.android.camera.ui.RotateImageView + style="@style/ToggleButton" + android:layout_gravity="center" /> + </com.android.camera.ui.RotatableLayout> + + <com.android.camera.ui.RotatableLayout + android:id="@+id/scene_mode_switcher" + style="@style/ToggleButtonOuter" > + + <com.android.camera.ui.RotateImageView + style="@style/ToggleButton" + android:layout_gravity="center" /> + </com.android.camera.ui.RotatableLayout> + + <com.android.camera.ui.RotatableLayout + android:id="@+id/filter_mode_switcher" + style="@style/ToggleButtonOuter" > + + <com.android.camera.ui.RotateImageView + style="@style/ToggleButton" + android:layout_gravity="center" /> + </com.android.camera.ui.RotatableLayout> </com.android.camera.ui.CameraControls> diff --git a/res/layout/filter_mode_view.xml b/res/layout/filter_mode_view.xml new file mode 100644 index 000000000..a58e725bd --- /dev/null +++ b/res/layout/filter_mode_view.xml @@ -0,0 +1,57 @@ +<?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. +--> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center" + android:orientation="vertical" + android:padding="7dp" > + + <ImageView + android:id="@+id/image" + android:layout_width="80dp" + android:layout_height="80dp" + android:layout_gravity="center" + android:padding="2dp" /> + + <TextView + android:id="@+id/label" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center" + android:shadowColor="@android:color/black" + android:shadowDx="1" + android:shadowDy="1" + android:shadowRadius="2" + android:singleLine="true" + android:textColor="@android:color/white" + android:textSize="13sp" + android:textStyle="bold" /> + +</LinearLayout>
\ No newline at end of file diff --git a/res/layout/horiz_grid.xml b/res/layout/horiz_grid.xml new file mode 100644 index 000000000..910b0ea66 --- /dev/null +++ b/res/layout/horiz_grid.xml @@ -0,0 +1,42 @@ +<?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. +--> +<HorizontalScrollView xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:alpha="0.85" + android:background="@color/popup_background" + android:scrollbars="none" > + + <LinearLayout + android:id="@+id/layout" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="horizontal" /> + +</HorizontalScrollView> diff --git a/res/layout/list_menu.xml b/res/layout/list_menu.xml new file mode 100644 index 000000000..e110fd571 --- /dev/null +++ b/res/layout/list_menu.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. +--> +<com.android.camera.ui.ListMenu xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="@dimen/big_setting_popup_window_width" + android:layout_height="wrap_content" + android:alpha="0.85" + android:background="@color/popup_background" + android:scrollbars="none" > + +</com.android.camera.ui.ListMenu> diff --git a/res/layout/list_menu_item.xml b/res/layout/list_menu_item.xml new file mode 100644 index 000000000..fc29f3cba --- /dev/null +++ b/res/layout/list_menu_item.xml @@ -0,0 +1,68 @@ +<?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. +--> +<com.android.camera.ui.ListMenuItem xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:orientation="horizontal" + android:padding="5dip" > + + <ImageView + android:id="@+id/list_image" + android:layout_width="@dimen/setting_item_icon_width" + android:layout_height="@dimen/setting_item_icon_width" + android:layout_alignParentLeft="true" + android:layout_marginRight="20dp" + android:gravity="center" /> + + <TextView + android:id="@+id/title" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignTop="@+id/list_image" + android:layout_toRightOf="@+id/list_image" + android:textColor="@android:color/white" + android:textStyle="bold" /> + + <TextView + android:id="@+id/current_setting" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:layout_below="@id/title" + android:layout_marginTop="1dip" + android:layout_toRightOf="@+id/list_image" + android:shadowColor="@android:color/black" + android:shadowDx="1" + android:shadowDy="1" + android:shadowRadius="2" + android:text="@string/crop_save" + android:textColor="#33b5e5" + android:textSize="10dip" + android:textStyle="bold" /> + +</com.android.camera.ui.ListMenuItem> diff --git a/res/layout/list_sub_menu.xml b/res/layout/list_sub_menu.xml new file mode 100644 index 000000000..eaab0948e --- /dev/null +++ b/res/layout/list_sub_menu.xml @@ -0,0 +1,39 @@ +<?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. +--> +<com.android.camera.ui.ListSubMenu xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:alpha="0.85" + android:background="@drawable/list_border" + android:divider="@color/list_divider_color" + android:dividerHeight="1dp" + android:listSelector="@drawable/list_selector" + android:scrollbars="none" > + +</com.android.camera.ui.ListSubMenu> diff --git a/res/layout/list_sub_menu_item.xml b/res/layout/list_sub_menu_item.xml new file mode 100644 index 000000000..a79628b5d --- /dev/null +++ b/res/layout/list_sub_menu_item.xml @@ -0,0 +1,52 @@ +<?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. +--> +<com.android.camera.ui.CheckedLinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools" + style="@style/CustomSettingRow" + tools:ignore="UseCompoundDrawables" > + + <ImageView + android:id="@+id/image" + android:layout_width="@dimen/setting_item_icon_width" + android:layout_height="@dimen/setting_item_icon_width" + android:layout_marginRight="@dimen/setting_item_list_margin" + android:adjustViewBounds="true" + android:scaleType="fitCenter" /> + + <TextView + android:id="@+id/text" + style="@style/CustomSettingItemTitle" + android:shadowColor="@android:color/black" + android:shadowDx="1" + android:shadowDy="1" + android:shadowRadius="2" + android:textColor="@android:color/white" + android:textStyle="bold" /> + +</com.android.camera.ui.CheckedLinearLayout> diff --git a/res/layout/photo_module.xml b/res/layout/photo_module.xml index 89bc1ff39..5f6bcb0d5 100644 --- a/res/layout/photo_module.xml +++ b/res/layout/photo_module.xml @@ -43,6 +43,7 @@ <ProgressBar style="?android:attr/progressBarStyleHorizontal" android:id="@+id/progress" + android:visibility="gone" android:orientation="vertical" android:layout_width="200dip" android:layout_height="wrap_content" diff --git a/res/layout/scene_mode_view.xml b/res/layout/scene_mode_view.xml new file mode 100644 index 000000000..14e6d5d87 --- /dev/null +++ b/res/layout/scene_mode_view.xml @@ -0,0 +1,67 @@ +<?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. +--> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:layout_gravity="center" + android:orientation="vertical" + android:padding="5dp" > + + <LinearLayout + android:id="@+id/border" + android:layout_width="90dp" + android:layout_height="85dp" + android:layout_gravity="center" + android:background="@drawable/scene_mode_view_border" + android:orientation="vertical" + android:padding="2dp" > + + <ImageView + android:id="@+id/image" + android:layout_width="50dp" + android:layout_height="50dp" + android:layout_gravity="center" /> + + <TextView + android:id="@+id/label" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_gravity="center" + android:gravity="center" + android:shadowColor="@android:color/black" + android:shadowDx="1" + android:shadowDy="1" + android:shadowRadius="2" + android:singleLine="true" + android:textColor="@android:color/white" + android:textSize="13sp" + android:textStyle="bold" /> + </LinearLayout> + +</LinearLayout>
\ No newline at end of file diff --git a/res/layout/vertical_grid.xml b/res/layout/vertical_grid.xml new file mode 100644 index 000000000..0754d0483 --- /dev/null +++ b/res/layout/vertical_grid.xml @@ -0,0 +1,42 @@ +<?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. +--> +<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:alpha="0.85" + android:background="@color/popup_background" + android:scrollbars="none" > + + <LinearLayout + android:id="@+id/layout" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical" /> + +</ScrollView> diff --git a/res/values/arrays.xml b/res/values/arrays.xml index 71b4afccd..4ec1949da 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -403,27 +403,33 @@ <!-- Camera Preferences Scene Mode dialog box entries --> <string-array name="pref_camera_scenemode_entries" translatable="false"> - <item>@string/pref_camera_scenemode_entry_action</item> - <item>@string/pref_camera_scenemode_entry_night</item> <item>@string/pref_camera_scenemode_entry_auto</item> - <item>@string/pref_camera_scenemode_entry_sunset</item> - <item>@string/pref_camera_scenemode_entry_party</item> - <item>@string/pref_camera_scenemode_entry_asd</item> - <item>@string/pref_camera_scenemode_entry_portrait</item> + <!-- <item>@string/pref_camera_scenemode_entry_portrait</item> --> <item>@string/pref_camera_scenemode_entry_landscape</item> - <item>@string/pref_camera_scenemode_entry_night_portrait</item> - <item>@string/pref_camera_scenemode_entry_theatre</item> - <item>@string/pref_camera_scenemode_entry_beach</item> - <item>@string/pref_camera_scenemode_entry_snow</item> - <item>@string/pref_camera_scenemode_entry_steadyphoto</item> - <item>@string/pref_camera_scenemode_entry_fireworks</item> <item>@string/pref_camera_scenemode_entry_sports</item> - <item>@string/pref_camera_scenemode_entry_candlelight</item> - <item>@string/pref_camera_scenemode_entry_backlight</item> <item>@string/pref_camera_scenemode_entry_flowers</item> - <item>@string/pref_camera_scenemode_entry_ar</item> + <item>@string/pref_camera_scenemode_entry_backlight</item> + <item>@string/pref_camera_scenemode_entry_candlelight</item> + <item>@string/pref_camera_scenemode_entry_sunset</item> + <item>@string/pref_camera_scenemode_entry_night</item> + <item>@string/pref_camera_scenemode_entry_beach</item> + <item>@string/pref_camera_scenemode_entry_snow</item> </string-array> + <array name="scenemode_thumbnails" translatable="false"> + <item>@drawable/ic_scene_mode_auto</item> + <!-- <item>@drawable/ic_scene_mode_portrait</item> --> + <item>@drawable/ic_scene_mode_landscape</item> + <item>@drawable/ic_scene_mode_sports</item> + <item>@drawable/ic_scene_mode_flower</item> + <item>@drawable/ic_scene_mode_backlight</item> + <item>@drawable/ic_scene_mode_candlelight</item> + <item>@drawable/ic_scene_mode_sunset</item> + <item>@drawable/ic_scene_mode_night</item> + <item>@drawable/ic_scene_mode_beach</item> + <item>@drawable/ic_scene_mode_snow</item> + </array> + <string-array name="pref_camera_scenemode_labels"> <item>@string/pref_camera_scenemode_label_action</item> <item>@string/pref_camera_scenemode_label_night</item> @@ -441,25 +447,17 @@ </array> <string-array name="pref_camera_scenemode_entryvalues" translatable="false"> - <item>action</item> - <item>night</item> <item>auto</item> - <item>sunset</item> - <item>party</item> - <item>asd</item> - <item>portrait</item> + <!-- <item>portrait</item> --> <item>landscape</item> - <item>night-portrait</item> - <item>theatre</item> - <item>beach</item> - <item>snow</item> - <item>steadyphoto</item> - <item>fireworks</item> <item>sports</item> - <item>candlelight</item> - <item>backlight</item> <item>flowers</item> - <item>AR</item> + <item>backlight</item> + <item>candlelight</item> + <item>sunset</item> + <item>night</item> + <item>beach</item> + <item>snow</item> </string-array> <array name="camera_id_entries" translatable="false"> diff --git a/res/values/attrs.xml b/res/values/attrs.xml index 5a00a695a..b9c04f290 100644 --- a/res/values/attrs.xml +++ b/res/values/attrs.xml @@ -40,6 +40,7 @@ <attr name="singleIcon" format="reference" /> <attr name="icons" /> <attr name="largeIcons" format="reference" /> + <attr name="thumbnails" format="reference" /> <attr name="images" format="reference" /> </declare-styleable> diff --git a/res/values/colors.xml b/res/values/colors.xml index 4fe918094..cd7f5977d 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -70,4 +70,7 @@ <color name="face_detect_fail">#80d05060</color> <color name="gray">#FFAAAAAA</color> + <color name="setting_color">#ff10aadc</color> + <color name="setting_color_light">#ffade9fd</color> + <color name="list_divider_color">#d8ababab</color> </resources> diff --git a/res/values/dimens.xml b/res/values/dimens.xml index e2d4246df..f9a7ff047 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -92,9 +92,13 @@ <dimen name="focus_inner_stroke">2dp</dimen> <dimen name="zoom_ring_min">48dp</dimen> <dimen name="switcher_size">72dp</dimen> + <dimen name="menu_size">52dp</dimen> + <dimen name="menu_outer_size">80dp</dimen> + <dimen name="toggle_size">30dp</dimen> + <dimen name="toggle_outer_size">60dp</dimen> <dimen name="face_circle_stroke">2dip</dimen> <dimen name="zoom_font_size">14pt</dimen> - <dimen name="shutter_offset">-22dp</dimen> + <dimen name="shutter_offset">5dp</dimen> <dimen name="size_thumbnail">200dip</dimen> <dimen name="size_preview">400dip</dimen> <dimen name="navigation_bar_height">48dip</dimen> diff --git a/res/values/qcomarrays.xml b/res/values/qcomarrays.xml index 0b1037e72..abe13a117 100644 --- a/res/values/qcomarrays.xml +++ b/res/values/qcomarrays.xml @@ -222,6 +222,24 @@ <item>@string/pref_camera_coloreffect_entry_greentint</item> </string-array> + <array name="coloreffect_thumbnails" translatable="false"> + <item>@drawable/thumb_filter_nofilter</item> + <item>@drawable/thumb_filter_monochrome</item> + <item>@drawable/thumb_filter_sepia</item> + <item>@drawable/thumb_filter_negative</item> + <item>@drawable/thumb_filter_solarize</item> + <item>@drawable/thumb_filter_posterize</item> + <item>@drawable/thumb_filter_aqua</item> + <item>@drawable/thumb_filter_emboss</item> + <item>@drawable/thumb_filter_sketch</item> + <item>@drawable/thumb_filter_neon</item> + <item>0</item> + <item>0</item> + <item>0</item> + <item>0</item> + <item>0</item> + </array> + <string-array name="pref_camera_coloreffect_entryvalues" translatable="false"> <item>none</item> <item>mono</item> diff --git a/res/values/styles.xml b/res/values/styles.xml index ad32b0634..682337fe9 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -80,6 +80,14 @@ <item name="android:layout_height">wrap_content</item> <item name="android:listSelector">@drawable/bg_pressed</item> </style> + <style name="CustomSettingItemTitle"> + <item name="android:textSize">14sp</item> + <item name="android:gravity">left|center_vertical</item> + <item name="android:singleLine">true</item> + <item name="android:layout_weight">1</item> + <item name="android:layout_width">0dp</item> + <item name="android:layout_height">match_parent</item> + </style> <style name="SettingItemTitle"> <item name="android:textSize">@dimen/setting_item_text_size</item> <item name="android:gravity">left|center_vertical</item> @@ -107,6 +115,15 @@ <item name="android:paddingRight">@dimen/setting_item_list_margin</item> <item name="android:background">@drawable/setting_picker</item> </style> + <style name="CustomSettingRow"> + <item name="android:gravity">center_vertical</item> + <item name="android:orientation">horizontal</item> + <item name="android:layout_width">3000dp</item> + <item name="android:layout_height">@dimen/setting_row_height</item> + <item name="android:paddingLeft">10dp</item> + <item name="android:paddingRight">@dimen/setting_item_list_margin</item> + <item name="android:background">@drawable/setting_picker</item> + </style> <style name="OnViewfinderLabel"> <item name="android:gravity">center</item> <item name="android:layout_width">wrap_content</item> @@ -230,6 +247,24 @@ <item name="android:layout_height">@dimen/switcher_size</item> <item name="android:background">@drawable/bg_pressed_exit_fading</item> </style> + <style name="MenuButton"> + <item name="android:layout_width">@dimen/menu_size</item> + <item name="android:layout_height">@dimen/menu_size</item> + </style> + <style name="MenuButtonOuter"> + <item name="android:layout_width">@dimen/menu_outer_size</item> + <item name="android:layout_height">@dimen/menu_outer_size</item> + <item name="android:background">@drawable/bg_pressed_exit_fading</item> + </style> + <style name="ToggleButton"> + <item name="android:layout_width">@dimen/toggle_size</item> + <item name="android:layout_height">@dimen/toggle_size</item> + </style> + <style name="ToggleButtonOuter"> + <item name="android:layout_width">@dimen/toggle_outer_size</item> + <item name="android:layout_height">@dimen/toggle_outer_size</item> + <item name="android:background">@drawable/bg_pressed_exit_fading</item> + </style> <style name="MenuIndicator"> <item name="android:layout_width">wrap_content</item> <item name="android:layout_height">wrap_content</item> diff --git a/res/xml/camera_preferences.xml b/res/xml/camera_preferences.xml index 39c54daa7..c9008c3a7 100644 --- a/res/xml/camera_preferences.xml +++ b/res/xml/camera_preferences.xml @@ -25,17 +25,19 @@ camera:largeIcons="@array/camera_flashmode_largeicons" camera:entries="@array/pref_camera_flashmode_entries" camera:entryValues="@array/pref_camera_flashmode_entryvalues" - camera:labelList="@array/pref_camera_flashmode_labels" /> + camera:labelList="@array/pref_camera_flashmode_labels" + camera:singleIcon="@drawable/ic_settings_flash" /> <IconListPreference camera:key="pref_camera_exposure_key" camera:defaultValue="@string/pref_exposure_default" camera:title="@string/pref_exposure_title" - camera:singleIcon="@drawable/ic_exposure_holo_light" /> + camera:singleIcon="@drawable/ic_settings_exposure" /> <IconListPreference camera:key="pref_camera_scenemode_key" camera:defaultValue="@string/pref_camera_scenemode_default" camera:title="@string/pref_camera_scenemode_title" - camera:singleIcon="@drawable/ic_sce" + camera:singleIcon="@drawable/ic_settings_scenemode" + camera:thumbnails="@array/scenemode_thumbnails" camera:entries="@array/pref_camera_scenemode_entries" camera:entryValues="@array/pref_camera_scenemode_entryvalues" /> <IconListPreference @@ -43,6 +45,7 @@ camera:defaultValue="@string/pref_camera_whitebalance_default" camera:title="@string/pref_camera_whitebalance_title" camera:icons="@array/whitebalance_icons" + camera:singleIcon="@drawable/ic_settings_lightsource" camera:largeIcons="@array/whitebalance_largeicons" camera:entries="@array/pref_camera_whitebalance_entries" camera:entryValues="@array/pref_camera_whitebalance_entryvalues" @@ -52,19 +55,22 @@ camera:defaultValue="@string/pref_camera_recordlocation_default" camera:title="@string/pref_camera_recordlocation_title" camera:icons="@array/camera_recordlocation_icons" + camera:singleIcon="@drawable/ic_settings_location" camera:largeIcons="@array/camera_recordlocation_largeicons" camera:entries="@array/pref_camera_recordlocation_entries" camera:labelList="@array/pref_camera_recordlocation_labels" camera:entryValues="@array/pref_camera_recordlocation_entryvalues" /> - <ListPreference + <IconListPreference camera:key="pref_camera_picturesize_key" + camera:singleIcon="@drawable/ic_settings_picturesize" camera:title="@string/pref_camera_picturesize_title" camera:entries="@array/pref_camera_picturesize_entries" camera:entryValues="@array/pref_camera_picturesize_entryvalues" /> - <ListPreference + <IconListPreference camera:key="pref_camera_focusmode_key" camera:defaultValue="@array/pref_camera_focusmode_default_array" camera:title="@string/pref_camera_focusmode_title" + camera:singleIcon="@drawable/ic_settings_focus" camera:entries="@array/pref_camera_focusmode_entries" camera:labelList="@array/pref_camera_focusmode_labels" camera:entryValues="@array/pref_camera_focusmode_entryvalues" /> @@ -115,6 +121,7 @@ <CountDownTimerPreference camera:key="pref_camera_timer_key" camera:defaultValue="@string/pref_camera_timer_default" + camera:singleIcon="@drawable/ic_settings_countdowntimer" camera:title="@string/pref_camera_timer_title" /> <ListPreference camera:key="pref_camera_timer_sound_key" @@ -134,16 +141,19 @@ camera:title="@string/pref_camera_facerc_title" camera:entries="@array/pref_camera_facerc_entries" camera:entryValues="@array/pref_camera_facerc_entryvalues" /> - <ListPreference + <IconListPreference camera:key="pref_camera_coloreffect_key" camera:defaultValue="@string/pref_camera_coloreffect_default" camera:title="@string/pref_camera_coloreffect_title" camera:entries="@array/pref_camera_coloreffect_entries" + camera:thumbnails="@array/coloreffect_thumbnails" + camera:singleIcon="@drawable/ic_settings_filter" camera:entryValues="@array/pref_camera_coloreffect_entryvalues" /> - <ListPreference + <IconListPreference camera:key="pref_camera_jpegquality_key" camera:defaultValue="@string/pref_camera_jpegquality_default" camera:title="@string/pref_camera_jpegquality_title" + camera:singleIcon="@drawable/ic_settings_quality" camera:entries="@array/pref_camera_jpegquality_entries" camera:entryValues="@array/pref_camera_jpegquality_entryvalues" /> <ListPreference @@ -152,11 +162,12 @@ camera:title="@string/pref_camera_touchafaec_title" camera:entries="@array/pref_camera_touchafaec_entries" camera:entryValues="@array/pref_camera_touchafaec_entryvalues" /> - <ListPreference + <IconListPreference camera:key="pref_camera_iso_key" camera:defaultValue="@string/pref_camera_iso_default" camera:title="@string/pref_camera_iso_title" camera:entries="@array/pref_camera_iso_entries" + camera:singleIcon="@drawable/ic_settings_iso" camera:entryValues="@array/pref_camera_iso_entryvalues" /> <ListPreference camera:key="pref_camera_histogram_key" @@ -212,17 +223,19 @@ camera:title="@string/pref_camera_skinToneEnhancement_title" camera:entries="@array/pref_camera_skinToneEnhancement_entries" camera:entryValues="@array/pref_camera_skinToneEnhancement_entryvalues" /> - <ListPreference + <IconListPreference camera:key="pref_camera_facedetection_key" camera:defaultValue="@string/pref_camera_facedetection_default" camera:title="@string/pref_camera_facedetection_title" camera:entries="@array/pref_camera_facedetection_entries" + camera:singleIcon="@drawable/ic_settings_facerec" camera:entryValues="@array/pref_camera_facedetection_entryvalues" /> - <ListPreference + <IconListPreference camera:key="pref_camera_redeyereduction_key" camera:defaultValue="@string/pref_camera_redeyereduction_default" camera:title="@string/pref_camera_redeyereduction_title" camera:entries="@array/pref_camera_redeyereduction_entries" + camera:singleIcon="@drawable/ic_settings_redeye" camera:entryValues="@array/pref_camera_redeyereduction_entryvalues" /> <ListPreference camera:key="pref_camera_selectablezoneaf_key" @@ -236,11 +249,12 @@ camera:title="@string/pref_camera_zsl_title" camera:entries="@array/pref_camera_zsl_entries" camera:entryValues="@array/pref_camera_zsl_entryvalues" /> - <ListPreference + <IconListPreference camera:key="pref_camera_savepath_key" camera:defaultValue="@string/pref_camera_savepath_default" camera:title="@string/pref_camera_savepath_title" camera:entries="@array/pref_camera_savepath_entries" + camera:singleIcon="@drawable/ic_settings_storage" camera:entryValues="@array/pref_camera_savepath_entryvalues" /> <ListPreference camera:key="pref_camera_videosnapsize_key" @@ -254,14 +268,13 @@ camera:title="@string/pref_camera_advanced_features_title" camera:entries="@array/pref_camera_advanced_features_entries" camera:entryValues="@array/pref_camera_advanced_features_entryvalues" /> - - <ListPreference + <IconListPreference camera:key="pref_camera_longshot_key" camera:title="@string/pref_camera_longshot_title" camera:defaultValue="@string/pref_camera_longshot_default" camera:entries="@array/pref_camera_longshot_entries" + camera:singleIcon="@drawable/ic_settings_continuous" camera:entryValues="@array/pref_camera_longshot_entryvalues" /> - <ListPreference camera:key="pref_camera_auto_hdr_key" camera:defaultValue="@string/pref_camera_auto_hdr_default" diff --git a/res/xml/video_preferences.xml b/res/xml/video_preferences.xml index 362607cb3..12dfc700f 100644 --- a/res/xml/video_preferences.xml +++ b/res/xml/video_preferences.xml @@ -17,11 +17,12 @@ <PreferenceGroup xmlns:camera="http://schemas.android.com/apk/res/org.codeaurora.snapcam" camera:title="@string/pref_camcorder_settings_category"> - <ListPreference + <IconListPreference camera:key="pref_video_quality_key" camera:defaultValue="@string/pref_video_quality_default" camera:title="@string/pref_video_quality_title" camera:entries="@array/pref_video_quality_entries" + camera:singleIcon="@drawable/ic_settings_quality" camera:entryValues="@array/pref_video_quality_entryvalues"/> <ListPreference camera:key="pref_camera_videoencoder_key" @@ -51,13 +52,13 @@ camera:key="pref_camera_video_duration_key" camera:defaultValue="@string/pref_camera_video_duration_default" camera:title="@string/pref_camera_video_duration_title" + camera:singleIcon="@drawable/ic_settings_duration" camera:entries="@array/pref_camera_video_duration_entries" camera:entryValues="@array/pref_camera_video_duration_entryvalues" /> <IconListPreference camera:key="pref_video_time_lapse_frame_interval_key" camera:defaultValue="@string/pref_video_time_lapse_frame_interval_default" camera:title="@string/pref_video_time_lapse_frame_interval_title" - camera:singleIcon="@drawable/ic_timelapse_none" camera:entries="@array/pref_video_time_lapse_frame_interval_entries" camera:entryValues="@array/pref_video_time_lapse_frame_interval_entryvalues"/> <IconListPreference @@ -66,6 +67,7 @@ camera:title="@string/pref_camera_flashmode_title" camera:icons="@array/video_flashmode_icons" camera:largeIcons="@array/video_flashmode_largeicons" + camera:singleIcon="@drawable/ic_settings_flash" camera:entries="@array/pref_camera_video_flashmode_entries" camera:labelList="@array/pref_camera_video_flashmode_labels" camera:entryValues="@array/pref_camera_video_flashmode_entryvalues"/> @@ -77,6 +79,7 @@ camera:largeIcons="@array/whitebalance_largeicons" camera:entries="@array/pref_camera_whitebalance_entries" camera:labelList="@array/pref_camera_whitebalance_labels" + camera:singleIcon="@drawable/ic_settings_lightsource" camera:entryValues="@array/pref_camera_whitebalance_entryvalues"/> <IconListPreference camera:key="pref_camera_id_key" @@ -99,6 +102,7 @@ camera:defaultValue="@string/pref_camera_recordlocation_default" camera:title="@string/pref_camera_recordlocation_title" camera:icons="@array/camera_recordlocation_icons" + camera:singleIcon="@drawable/ic_settings_location" camera:largeIcons="@array/camera_recordlocation_largeicons" camera:entries="@array/pref_camera_recordlocation_entries" camera:entryValues="@array/pref_camera_recordlocation_entryvalues" /> @@ -114,16 +118,19 @@ camera:title="@string/pref_camera_dis_title" camera:entries="@array/pref_camera_dis_entries" camera:entryValues="@array/pref_camera_dis_entryvalues" /> - <ListPreference + <IconListPreference camera:key="pref_camera_coloreffect_key" camera:defaultValue="@string/pref_camera_coloreffect_default" camera:title="@string/pref_camera_coloreffect_title" camera:entries="@array/pref_camera_coloreffect_entries" + camera:thumbnails="@array/coloreffect_thumbnails" + camera:singleIcon="@drawable/ic_settings_filter" camera:entryValues="@array/pref_camera_coloreffect_entryvalues" /> - <ListPreference + <IconListPreference camera:key="pref_camera_hfr_key" camera:defaultValue="@string/pref_camera_hfr_default" camera:title="@string/pref_camera_hfr_title" + camera:singleIcon="@drawable/ic_settings_fps" camera:entries="@array/pref_camera_hfr_entries" camera:entryValues="@array/pref_camera_hfr_entryvalues"/> <ListPreference @@ -144,11 +151,12 @@ camera:title="@string/pref_camera_picturesize_title" camera:entries="@array/pref_camera_picturesize_entries" camera:entryValues="@array/pref_camera_picturesize_entryvalues" /> - <ListPreference + <IconListPreference camera:key="pref_camera_savepath_key" camera:defaultValue="@string/pref_camera_savepath_default" camera:title="@string/pref_camera_savepath_title" camera:entries="@array/pref_camera_savepath_entries" + camera:singleIcon="@drawable/ic_settings_storage" camera:entryValues="@array/pref_camera_savepath_entryvalues" /> <ListPreference camera:key="pref_camera_video_rotation_key" |