diff options
| author | Byunghun Jeon <bjeon@codeaurora.org> | 2016-07-14 11:13:36 -0700 |
|---|---|---|
| committer | Jay Wang <jaywang@codeaurora.org> | 2016-09-27 11:08:28 -0700 |
| commit | a6038bde5f3fbdd05519f1be8ad6f369fd0365bf (patch) | |
| tree | ab9761c31171a7053b329a3d08573b370f747336 /res | |
| parent | 8eefd5866870e7293665df25625ab69fb8e2de0f (diff) | |
| download | android_packages_apps_Snap-a6038bde5f3fbdd05519f1be8ad6f369fd0365bf.tar.gz android_packages_apps_Snap-a6038bde5f3fbdd05519f1be8ad6f369fd0365bf.tar.bz2 android_packages_apps_Snap-a6038bde5f3fbdd05519f1be8ad6f369fd0365bf.zip | |
SnapdragonCamera: Add OneUI to Camera2
Add new UI called OneUI to Camera2.
It replaces icons, adds 2 new activities for scene menu
and setting menu.
There is no module change anymore
Change-Id: If712e6af7bbc29726dae387168aefbcd2d7c1ea9
CRs-Fixed: 1066519
Diffstat (limited to 'res')
61 files changed, 751 insertions, 65 deletions
diff --git a/res/drawable/audio_encoding.png b/res/drawable/audio_encoding.png Binary files differnew file mode 100644 index 000000000..0cb04c62a --- /dev/null +++ b/res/drawable/audio_encoding.png diff --git a/res/drawable/auto.png b/res/drawable/auto.png Binary files differnew file mode 100644 index 000000000..48a510e1d --- /dev/null +++ b/res/drawable/auto.png diff --git a/res/drawable/auto_snapshot_size.png b/res/drawable/auto_snapshot_size.png Binary files differnew file mode 100644 index 000000000..0c8a05652 --- /dev/null +++ b/res/drawable/auto_snapshot_size.png diff --git a/res/drawable/backlight.png b/res/drawable/backlight.png Binary files differnew file mode 100644 index 000000000..3460a3f07 --- /dev/null +++ b/res/drawable/backlight.png diff --git a/res/drawable/beach.png b/res/drawable/beach.png Binary files differnew file mode 100644 index 000000000..bbd7773c7 --- /dev/null +++ b/res/drawable/beach.png diff --git a/res/drawable/beautify.png b/res/drawable/beautify.png Binary files differnew file mode 100644 index 000000000..c9db3f01b --- /dev/null +++ b/res/drawable/beautify.png diff --git a/res/drawable/blur.png b/res/drawable/blur.png Binary files differnew file mode 100644 index 000000000..6b25cee2f --- /dev/null +++ b/res/drawable/blur.png diff --git a/res/drawable/candlelight.png b/res/drawable/candlelight.png Binary files differnew file mode 100644 index 000000000..a2c24ae14 --- /dev/null +++ b/res/drawable/candlelight.png diff --git a/res/drawable/clock.png b/res/drawable/clock.png Binary files differnew file mode 100644 index 000000000..50d0e2a4e --- /dev/null +++ b/res/drawable/clock.png diff --git a/res/drawable/continuous_shot.png b/res/drawable/continuous_shot.png Binary files differnew file mode 100644 index 000000000..74cfc8fa8 --- /dev/null +++ b/res/drawable/continuous_shot.png diff --git a/res/drawable/countdown_timer.png b/res/drawable/countdown_timer.png Binary files differnew file mode 100644 index 000000000..ddd0175ef --- /dev/null +++ b/res/drawable/countdown_timer.png diff --git a/res/drawable/exposure.png b/res/drawable/exposure.png Binary files differnew file mode 100644 index 000000000..85f3b4e72 --- /dev/null +++ b/res/drawable/exposure.png diff --git a/res/drawable/face_detection.png b/res/drawable/face_detection.png Binary files differnew file mode 100644 index 000000000..7081cec41 --- /dev/null +++ b/res/drawable/face_detection.png diff --git a/res/drawable/filters.png b/res/drawable/filters.png Binary files differnew file mode 100644 index 000000000..e9527a3aa --- /dev/null +++ b/res/drawable/filters.png diff --git a/res/drawable/flash.png b/res/drawable/flash.png Binary files differnew file mode 100644 index 000000000..09d400487 --- /dev/null +++ b/res/drawable/flash.png diff --git a/res/drawable/flash_off.png b/res/drawable/flash_off.png Binary files differnew file mode 100644 index 000000000..af122bb7e --- /dev/null +++ b/res/drawable/flash_off.png diff --git a/res/drawable/flower.png b/res/drawable/flower.png Binary files differnew file mode 100644 index 000000000..c035b80f4 --- /dev/null +++ b/res/drawable/flower.png diff --git a/res/drawable/front_back_camera.png b/res/drawable/front_back_camera.png Binary files differnew file mode 100644 index 000000000..1e13a8410 --- /dev/null +++ b/res/drawable/front_back_camera.png diff --git a/res/drawable/gps_location.png b/res/drawable/gps_location.png Binary files differnew file mode 100644 index 000000000..09e011ab3 --- /dev/null +++ b/res/drawable/gps_location.png diff --git a/res/drawable/hdr.png b/res/drawable/hdr.png Binary files differnew file mode 100644 index 000000000..45f27d721 --- /dev/null +++ b/res/drawable/hdr.png diff --git a/res/drawable/image_stabilization.png b/res/drawable/image_stabilization.png Binary files differnew file mode 100644 index 000000000..80ddebcf8 --- /dev/null +++ b/res/drawable/image_stabilization.png diff --git a/res/drawable/iso.png b/res/drawable/iso.png Binary files differnew file mode 100644 index 000000000..3667a8b3f --- /dev/null +++ b/res/drawable/iso.png diff --git a/res/drawable/landscape.png b/res/drawable/landscape.png Binary files differnew file mode 100644 index 000000000..59e977867 --- /dev/null +++ b/res/drawable/landscape.png diff --git a/res/drawable/more_options.png b/res/drawable/more_options.png Binary files differnew file mode 100644 index 000000000..5dca7f1e5 --- /dev/null +++ b/res/drawable/more_options.png diff --git a/res/drawable/night.png b/res/drawable/night.png Binary files differnew file mode 100644 index 000000000..7d89a48f7 --- /dev/null +++ b/res/drawable/night.png diff --git a/res/drawable/noise_reduction.png b/res/drawable/noise_reduction.png Binary files differnew file mode 100644 index 000000000..ab5860e38 --- /dev/null +++ b/res/drawable/noise_reduction.png diff --git a/res/drawable/optizoom.png b/res/drawable/optizoom.png Binary files differnew file mode 100644 index 000000000..63f627a05 --- /dev/null +++ b/res/drawable/optizoom.png diff --git a/res/drawable/photo_capture.png b/res/drawable/photo_capture.png Binary files differnew file mode 100644 index 000000000..89cdb9a8f --- /dev/null +++ b/res/drawable/photo_capture.png diff --git a/res/drawable/picture_quality.png b/res/drawable/picture_quality.png Binary files differnew file mode 100644 index 000000000..eaafcc557 --- /dev/null +++ b/res/drawable/picture_quality.png diff --git a/res/drawable/picture_size.png b/res/drawable/picture_size.png Binary files differnew file mode 100644 index 000000000..bea524a74 --- /dev/null +++ b/res/drawable/picture_size.png diff --git a/res/drawable/portrait.png b/res/drawable/portrait.png Binary files differnew file mode 100644 index 000000000..c378bdb5f --- /dev/null +++ b/res/drawable/portrait.png diff --git a/res/drawable/settings.png b/res/drawable/settings.png Binary files differnew file mode 100644 index 000000000..a6c699e0c --- /dev/null +++ b/res/drawable/settings.png diff --git a/res/drawable/shutter_sound.png b/res/drawable/shutter_sound.png Binary files differnew file mode 100644 index 000000000..675ff31a4 --- /dev/null +++ b/res/drawable/shutter_sound.png diff --git a/res/drawable/snow.png b/res/drawable/snow.png Binary files differnew file mode 100644 index 000000000..5d115413c --- /dev/null +++ b/res/drawable/snow.png diff --git a/res/drawable/sports.png b/res/drawable/sports.png Binary files differnew file mode 100644 index 000000000..741635a45 --- /dev/null +++ b/res/drawable/sports.png diff --git a/res/drawable/storage.png b/res/drawable/storage.png Binary files differnew file mode 100644 index 000000000..d17cf73a4 --- /dev/null +++ b/res/drawable/storage.png diff --git a/res/drawable/sunset.png b/res/drawable/sunset.png Binary files differnew file mode 100644 index 000000000..1c5fe61c1 --- /dev/null +++ b/res/drawable/sunset.png diff --git a/res/drawable/tracking_focus.png b/res/drawable/tracking_focus.png Binary files differnew file mode 100644 index 000000000..5e1744fcc --- /dev/null +++ b/res/drawable/tracking_focus.png diff --git a/res/drawable/ubifocus.png b/res/drawable/ubifocus.png Binary files differnew file mode 100644 index 000000000..3af770723 --- /dev/null +++ b/res/drawable/ubifocus.png diff --git a/res/drawable/video_capture.png b/res/drawable/video_capture.png Binary files differnew file mode 100644 index 000000000..f0c7c2289 --- /dev/null +++ b/res/drawable/video_capture.png diff --git a/res/drawable/video_duration.png b/res/drawable/video_duration.png Binary files differnew file mode 100644 index 000000000..0cd1b5af3 --- /dev/null +++ b/res/drawable/video_duration.png diff --git a/res/drawable/video_encoding.png b/res/drawable/video_encoding.png Binary files differnew file mode 100644 index 000000000..b4d0a7439 --- /dev/null +++ b/res/drawable/video_encoding.png diff --git a/res/drawable/video_quality.png b/res/drawable/video_quality.png Binary files differnew file mode 100644 index 000000000..eaafcc557 --- /dev/null +++ b/res/drawable/video_quality.png diff --git a/res/drawable/video_rotation.png b/res/drawable/video_rotation.png Binary files differnew file mode 100644 index 000000000..1caed7142 --- /dev/null +++ b/res/drawable/video_rotation.png diff --git a/res/drawable/video_stop.png b/res/drawable/video_stop.png Binary files differnew file mode 100644 index 000000000..e3c4eecaf --- /dev/null +++ b/res/drawable/video_stop.png diff --git a/res/drawable/white_balance.png b/res/drawable/white_balance.png Binary files differnew file mode 100644 index 000000000..31e8dda70 --- /dev/null +++ b/res/drawable/white_balance.png diff --git a/res/drawable/x.png b/res/drawable/x.png Binary files differnew file mode 100644 index 000000000..2174df77b --- /dev/null +++ b/res/drawable/x.png diff --git a/res/layout/capture_module.xml b/res/layout/capture_module.xml index 41757c535..4b9a178c0 100644 --- a/res/layout/capture_module.xml +++ b/res/layout/capture_module.xml @@ -93,6 +93,6 @@ <include style="@style/CameraControls" - layout="@layout/camera_controls" + layout="@layout/one_ui_layout" android:layout_gravity="center" /> </merge> diff --git a/res/layout/one_ui_layout.xml b/res/layout/one_ui_layout.xml new file mode 100644 index 000000000..22c2c42e3 --- /dev/null +++ b/res/layout/one_ui_layout.xml @@ -0,0 +1,113 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (c) 2016, The Linux Foundation. All rights reserved. + Not a Contribution. + + Copyright (C) 2013 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<com.android.camera.ui.OneUICameraControls xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/camera_controls" + android:layout_width="match_parent" + android:layout_height="match_parent"> + + <com.android.camera.ui.FlashToggleButton + android:id="@+id/flash_button" + style="@style/OneUIMenuButton" + android:src="@drawable/flash" /> + + <com.android.camera.ui.RotateImageView + android:id="@+id/mute_button" + style="@style/OneUIMenuButton" + android:contentDescription="@string/mute_button_desc" + android:src="@drawable/ic_unmuted_button" + android:visibility="gone" /> + + <com.android.camera.ShutterButton + android:id="@+id/shutter_button" + android:layout_width="70dp" + android:layout_height="70dp" + android:clickable="true" + android:contentDescription="@string/accessibility_shutter_button" + android:focusable="true" + android:scaleType="fitCenter" + android:src="@drawable/photo_capture" /> + + <com.android.camera.ui.RotateImageView + android:id="@+id/video_button" + android:layout_width="55dp" + android:layout_height="55dp" + android:clickable="true" + android:contentDescription="@string/accessibility_shutter_button" + android:focusable="true" + android:scaleType="fitCenter" + android:src="@drawable/video_capture" /> + + <com.android.camera.ui.RotateImageView + android:id="@+id/preview_thumb" + android:layout_width="@dimen/capture_size" + android:layout_height="@dimen/capture_size" + android:layout_gravity="top|right" + android:background="@android:color/transparent" + android:contentDescription="@string/switch_photo_filmstrip" + android:scaleType="fitCenter" /> + + <com.android.camera.ui.RotateImageView + android:id="@+id/front_back_switcher" + style="@style/OneUIMenuButton" + android:src="@drawable/front_back_camera" /> + + <com.android.camera.ui.RotateImageView + android:id="@+id/hdr_switcher" + style="@style/OneUIMenuButton" /> + + <com.android.camera.ui.RotateImageView + android:id="@+id/scene_mode_switcher" + style="@style/OneUIMenuButton" + android:src="@drawable/more_options" /> + + <com.android.camera.ui.RotateImageView + android:id="@+id/filter_mode_switcher" + style="@style/OneUIMenuButton" + android:src="@drawable/filters" /> + + <com.android.camera.ui.RotateImageView + android:id="@+id/ts_makeup_switcher" + style="@style/OneUIMenuButton" + android:src="@drawable/beautify" /> + + <LinearLayout + android:id="@+id/remaining_photos" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:background="@android:color/transparent" + android:orientation="horizontal" + android:visibility="gone"> + + <TextView + android:id="@+id/remaining_photos_text" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:background="@android:color/transparent" + android:textColor="@android:color/white" + android:visibility="gone" /> + + <ImageView + android:id="@+id/remaining_photos_image" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:src="@drawable/remaining_sheets" + android:visibility="gone" /> + </LinearLayout> + +</com.android.camera.ui.OneUICameraControls> diff --git a/res/layout/preference.xml b/res/layout/preference.xml new file mode 100644 index 000000000..68b931fbb --- /dev/null +++ b/res/layout/preference.xml @@ -0,0 +1,74 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (c) 2016, The Linux Foundation. All rights reserved. + Not a Contribution. + + Copyright (C) 2006 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="50dp" + android:background="?android:attr/selectableItemBackground" + android:gravity="center_vertical" + android:paddingEnd="?android:attr/scrollbarSize"> + + <ImageView + android:id="@+android:id/icon" + android:layout_width="25dp" + android:layout_height="25dp" + android:layout_gravity="center" + android:layout_marginEnd="30dp" + android:layout_marginStart="15dp" + android:scaleType="fitCenter" /> + + <RelativeLayout + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginBottom="6dip" + android:layout_marginEnd="6dip" + android:layout_marginTop="6dip" + android:layout_weight="1"> + + <TextView + android:id="@+android:id/title" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:ellipsize="marquee" + android:fadingEdge="horizontal" + android:singleLine="true" + android:textAppearance="?android:attr/textAppearanceLarge" + android:textSize="14sp" /> + + <TextView + android:id="@+android:id/summary" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignStart="@android:id/title" + android:layout_below="@android:id/title" + android:maxLines="4" + android:textAppearance="?android:attr/textAppearanceSmall" + android:textColor="#ff2d82e2" + android:textSize="11sp" /> + + </RelativeLayout> + + <!-- Preference should place its actual preference widget here. --> + <LinearLayout + android:id="@+android:id/widget_frame" + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:gravity="center_vertical" + android:orientation="vertical" /> + +</LinearLayout> diff --git a/res/layout/preferences_category.xml b/res/layout/preferences_category.xml new file mode 100644 index 000000000..3dae03b0a --- /dev/null +++ b/res/layout/preferences_category.xml @@ -0,0 +1,39 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (c) 2016, The Linux Foundation. All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are + met: + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above + copyright notice, this list of conditions and the following + disclaimer in the documentation and/or other materials provided + with the distribution. + * Neither the name of The Linux Foundation nor the names of its + contributors may be used to endorse or promote products derived + from this software without specific prior written permission. + + THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED + WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT + ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS + BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR + BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE + OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN + IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +--> +<TextView xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@android:id/title" + android:layout_width="match_parent" + android:layout_height="50dp" + android:gravity="center_vertical" + android:paddingLeft="15dp" + android:paddingTop="15dp" + android:textAllCaps="true" + android:textColor="#ff999999" + android:textSize="14sp" + android:textStyle="bold" /> diff --git a/res/layout/scene_mode_grid.xml b/res/layout/scene_mode_grid.xml new file mode 100644 index 000000000..b149b4cfe --- /dev/null +++ b/res/layout/scene_mode_grid.xml @@ -0,0 +1,43 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (c) 2016, The Linux Foundation. All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are + met: + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above + copyright notice, this list of conditions and the following + disclaimer in the documentation and/or other materials provided + with the distribution. + * Neither the name of The Linux Foundation nor the names of its + contributors may be used to endorse or promote products derived + from this software without specific prior written permission. + + THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED + WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT + ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS + BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR + BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE + OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN + IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +--> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical"> + + <GridView + android:id="@+id/grid" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:columnWidth="@dimen/scene_mode_width" + android:horizontalSpacing="10dp" + android:numColumns="auto_fit" + android:stretchMode="columnWidth" + android:verticalSpacing="10dp"></GridView> +</LinearLayout>
\ No newline at end of file diff --git a/res/layout/scene_mode_menu_layout.xml b/res/layout/scene_mode_menu_layout.xml new file mode 100644 index 000000000..9c10bd73e --- /dev/null +++ b/res/layout/scene_mode_menu_layout.xml @@ -0,0 +1,69 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (c) 2016, The Linux Foundation. All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are + met: + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above + copyright notice, this list of conditions and the following + disclaimer in the documentation and/or other materials provided + with the distribution. + * Neither the name of The Linux Foundation nor the names of its + contributors may be used to endorse or promote products derived + from this software without specific prior written permission. + + THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED + WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT + ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS + BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR + BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE + OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN + IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +--> +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:background="@drawable/blur" + android:padding="5dp"> + + <ImageView + android:id="@+id/close_button" + android:layout_width="40dp" + android:layout_height="40dp" + android:layout_alignParentRight="true" + android:layout_alignParentTop="true" + android:padding="10dp" + android:scaleType="fitCenter" + android:src="@drawable/x" /> + + <android.support.v4.view.ViewPager + android:id="@+id/pager" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_above="@+id/page_indicator" + android:layout_below="@+id/close_button" /> + + <com.android.camera.ui.DotsView + android:id="@+id/page_indicator" + android:layout_width="80dp" + android:layout_height="25dp" + android:layout_above="@+id/setting_button" + android:layout_centerHorizontal="true" + android:layout_margin="5dp" /> + + <com.android.camera.ui.RotateImageView + android:id="@+id/setting_button" + android:layout_width="30dp" + android:layout_height="30dp" + android:layout_alignParentBottom="true" + android:layout_centerHorizontal="true" + android:layout_margin="10dp" + android:scaleType="fitCenter" + android:src="@drawable/settings" /> +</RelativeLayout> diff --git a/res/layout/scene_mode_menu_view.xml b/res/layout/scene_mode_menu_view.xml new file mode 100644 index 000000000..cfa0dba9c --- /dev/null +++ b/res/layout/scene_mode_menu_view.xml @@ -0,0 +1,62 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (c) 2016, The Linux Foundation. All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are + met: + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above + copyright notice, this list of conditions and the following + disclaimer in the documentation and/or other materials provided + with the distribution. + * Neither the name of The Linux Foundation nor the names of its + contributors may be used to endorse or promote products derived + from this software without specific prior written permission. + + THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED + WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT + ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS + BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR + BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE + OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN + IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +--> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="90dp" + android:layout_height="90dp" + android:layout_gravity="center" + android:orientation="vertical" + android:padding="5dp"> + + <LinearLayout + android:id="@+id/border" + android:layout_width="80dp" + android:layout_height="80dp" + android:layout_gravity="center" + android:gravity="center" + android:orientation="vertical" + android:padding="2dp"> + + <ImageView + android:id="@+id/image" + android:layout_width="30dp" + android:layout_height="30dp" + android:layout_gravity="center" + android:scaleType="fitCenter" /> + + <TextView + android:id="@+id/label" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_gravity="center" + android:gravity="center" + android:textColor="@android:color/white" + android:textSize="12sp" /> + </LinearLayout> + +</LinearLayout> diff --git a/res/values/camera2arrays.xml b/res/values/camera2arrays.xml index 1f590fc32..e5fcb7fdf 100644 --- a/res/values/camera2arrays.xml +++ b/res/values/camera2arrays.xml @@ -34,8 +34,8 @@ </string-array> <string-array name="pref_camera2_camera2_entryvalues" translatable="false"> - <item>@string/pref_camera2_camera2_value_disable</item> - <item>@string/pref_camera2_camera2_value_enable</item> + <item>@string/setting_off_value</item> + <item>@string/setting_on_value</item> </string-array> <string-array name="pref_camera2_mono_only_entries" translatable="true"> @@ -44,8 +44,8 @@ </string-array> <string-array name="pref_camera2_mono_only_entryvalues" translatable="false"> - <item>on</item> - <item>off</item> + <item>@string/setting_on_value</item> + <item>@string/setting_off_value</item> </string-array> <string-array name="pref_camera2_initial_camera_entries" translatable="true"> @@ -86,8 +86,8 @@ </string-array> <string-array name="pref_camera2_mono_preview_entryvalues" translatable="false"> - <item>@string/pref_camera2_mono_preview_value_on</item> - <item>@string/pref_camera2_mono_preview_value_off</item> + <item>@string/setting_on_value</item> + <item>@string/setting_off_value</item> </string-array> <string-array name="pref_camera2_clearsight_entries" translatable="true"> @@ -96,8 +96,8 @@ </string-array> <string-array name="pref_camera2_clearsight_entryvalues" translatable="false"> - <item>@string/pref_camera2_clearsight_value_off</item> - <item>@string/pref_camera2_clearsight_value_on</item> + <item>@string/setting_off_value</item> + <item>@string/setting_on_value</item> </string-array> <string-array name="pref_camera2_mpo_entries" translatable="true"> @@ -158,21 +158,21 @@ </string-array> <array name="pref_camera2_scenemode_thumbnails" translatable="false"> - <item>@drawable/ic_scene_mode_auto</item> - <item>@drawable/ic_scene_mode_hdr</item> - <item>@drawable/ic_scene_mode_hdr</item> - <item>@drawable/ic_scene_mode_refocus</item> - <item>@drawable/ic_scene_mode_optizoom</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> + <item>@drawable/auto</item> + <item>@drawable/hdr</item> + <item>@drawable/hdr</item> + <item>@drawable/ubifocus</item> + <item>@drawable/optizoom</item> + <item>@drawable/portrait</item> + <item>@drawable/landscape</item> + <item>@drawable/sports</item> + <item>@drawable/flower</item> + <item>@drawable/backlight</item> + <item>@drawable/candlelight</item> + <item>@drawable/sunset</item> + <item>@drawable/night</item> + <item>@drawable/beach</item> + <item>@drawable/snow</item> <item>@drawable/ic_scene_mode_smartauto</item> <item>@drawable/pick_the_best_photo</item> </array> @@ -297,31 +297,26 @@ <!-- Camera Preferences flash mode dialog box entries --> <string-array name="pref_camera2_flashmode_entries" translatable="false"> <item>@string/pref_camera_flashmode_entry_off</item> - <item>@string/pref_camera_flashmode_entry_auto</item> <item>@string/pref_camera_flashmode_entry_on</item> </string-array> <string-array name="pref_camera2_flashmode_labels" translatable="false"> <item>@string/pref_camera_flashmode_label_off</item> - <item>@string/pref_camera_flashmode_label_auto</item> <item>@string/pref_camera_flashmode_label_on</item> </string-array> <string-array name="pref_camera2_flashmode_entryvalues" translatable="false"> - <item>1</item> - <item>2</item> - <item>3</item> + <item>@string/setting_off_value</item> + <item>@string/setting_on_value</item> </string-array> <array name="pref_camera2_flashmode_icons" translatable="false"> <item>@drawable/ic_flash_off_holo_light</item> - <item>@drawable/ic_flash_auto_holo_light</item> <item>@drawable/ic_flash_on_holo_light</item> </array> <array name="pref_camera2_flashmode_largeicons" translatable="false"> <item>@drawable/ic_flash_off_holo_light</item> - <item>@drawable/ic_flash_auto_holo_light</item> <item>@drawable/ic_flash_on_holo_light</item> </array> @@ -431,8 +426,8 @@ </string-array> <string-array name="pref_camera2_recordlocation_entryvalues" translatable="false"> - <item>off</item> - <item>on</item> + <item>@string/setting_off_value</item> + <item>@string/setting_on_value</item> </string-array> <array name="pref_camera2_recordlocation_entries" translatable="false"> @@ -566,8 +561,8 @@ </string-array> <string-array name="pref_camera2_redeyereduction_entryvalues" translatable="false"> - <item>disable</item> - <item>enable</item> + <item>@string/setting_off_value</item> + <item>@string/setting_on_value</item> </string-array> <!-- Camera Preferences Long Shot dialog box entries --> @@ -586,8 +581,8 @@ <item>@string/pref_camera_filter_mode_entry_on</item> </string-array> <string-array name="pref_camera2_filter_mode_entryvalues" translatable="false"> - <item>Off</item> - <item>On</item> + <item>@string/setting_off_value</item> + <item>@string/setting_on_value</item> </string-array> <string-array name="pref_camera2_filter_mode_icons" translatable="false"> @@ -668,8 +663,8 @@ </string-array> <string-array name="pref_camera2_dis_entryvalues" translatable="false"> - <item>@string/pref_camera_dis_value_disable</item> - <item>@string/pref_camera_dis_value_enable</item> + <item>@string/setting_off_value</item> + <item>@string/setting_on_value</item> </string-array> <string-array name="pref_camera2_noise_reduction_entries" translatable="false"> @@ -816,8 +811,8 @@ for time lapse recording --> </string-array> <string-array name="pref_camera2_facedetection_entryvalues" translatable="false"> - <item>off</item> - <item>on</item> + <item>@string/setting_off_value</item> + <item>@string/setting_on_value</item> </string-array> <string-array name="pref_camera2_videosnap_entries" translatable="true"> @@ -826,8 +821,22 @@ for time lapse recording --> </string-array> <string-array name="pref_camera2_videosnap_entryvalues" translatable="false"> - <item>@string/pref_camera2_videosnap_value_enable</item> - <item>@string/pref_camera2_videosnap_value_disable</item> + <item>@string/setting_on_value</item> + <item>@string/setting_off_value</item> + </string-array> + + <string-array name="pref_camera2_timer_entries" translatable="false"> + <item>@string/pref_camera2_timer_entry_off</item> + <item>@string/pref_camera2_timer_entry_2sec</item> + <item>@string/pref_camera2_timer_entry_5sec</item> + <item>@string/pref_camera2_timer_entry_10sec</item> + </string-array> + + <string-array name="pref_camera2_timer_entryvalues" translatable="false"> + <item>@string/pref_camera2_timer_value_off</item> + <item>@string/pref_camera2_timer_value_2sec</item> + <item>@string/pref_camera2_timer_value_5sec</item> + <item>@string/pref_camera2_timer_value_10sec</item> </string-array> <string-array name="pref_camera2_shutter_sound_entries" translatable="true"> diff --git a/res/values/dimens.xml b/res/values/dimens.xml index 96394ad66..2a58a33e2 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -165,7 +165,7 @@ <dimen name="scene_mode_padding">10dp</dimen> <dimen name="filter_mode_height">100dp</dimen> <dimen name="filter_mode_width">100dp</dimen> - <dimen name="filter_mode_padding">10dp</dimen> + <dimen name="filter_mode_padding">0dp</dimen> <dimen name="remaining_photos_margin">67dp</dimen> <dimen name="tsmakeup_mode_paddingBottom">96dp</dimen> diff --git a/res/values/qcomstrings.xml b/res/values/qcomstrings.xml index 330cb8979..9d87cb1ce 100644 --- a/res/values/qcomstrings.xml +++ b/res/values/qcomstrings.xml @@ -999,7 +999,7 @@ <string name="pref_camera2_scenemode_default" translatable="false">0</string> <string name="pref_camera2_whitebalance_default" translatable="false">1</string> <string name="pref_camera2_coloreffect_default" translatable="false">0</string> - <string name="pref_camera2_flashmode_default" translatable="false">2</string> + <string name="pref_camera2_flashmode_default" translatable="false">@string/setting_off_value</string> <string name="pref_camera2_makeup_title" translatable="true">Makeup</string> @@ -1034,5 +1034,15 @@ <string name="pref_camera2_shutter_sound_entry_on" translatable="true">On</string> <string name="pref_camera2_shutter_sound_entry_off" translatable="true">Off</string> <string name="pref_camera2_shutter_sound_title" translatable="true">Shutter Sound</string> + + <string name="pref_camera2_timer_entry_off" translatable="false">Off</string> + <string name="pref_camera2_timer_entry_2sec" translatable="false">2 seconds</string> + <string name="pref_camera2_timer_entry_5sec" translatable="false">5 seconds</string> + <string name="pref_camera2_timer_entry_10sec" translatable="false">10 seconds</string> + + <string name="pref_camera2_timer_value_off" translatable="false">0</string> + <string name="pref_camera2_timer_value_2sec" translatable="false">2</string> + <string name="pref_camera2_timer_value_5sec" translatable="false">5</string> + <string name="pref_camera2_timer_value_10sec" translatable="false">10</string> </resources> diff --git a/res/values/styles.xml b/res/values/styles.xml index 4a7284874..765210fe2 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -19,6 +19,10 @@ <style name="Theme.ProxyLauncher" parent="@android:Theme.Translucent.NoTitleBar"> </style> + <style name="Theme.OneUISettings" parent="@android:style/Theme.Material.Light.NoActionBar.Fullscreen"> + <item name="android:colorAccent">#5999e1</item> + </style> + <style name="Theme.Camera" parent="Theme.CameraBase"> <item name="android:windowFullscreen">true</item> <item name="android:windowActionBar">false</item> @@ -262,6 +266,12 @@ <item name="android:layout_height">@dimen/toggle_outer_size</item> <item name="android:scaleType">center</item> </style> + <style name="OneUIMenuButton"> + <item name="android:layout_width">45dp</item> + <item name="android:layout_height">45dp</item> + <item name="android:padding">10dp</item> + <item name="android:scaleType">fitCenter</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 742c09d33..a9540550b 100644 --- a/res/xml/camera_preferences.xml +++ b/res/xml/camera_preferences.xml @@ -382,7 +382,7 @@ <ListPreference camera:key="pref_camera2_camera2_key" - camera:defaultValue="@string/pref_camera2_camera2_default" + camera:defaultValue="@string/setting_off_value" camera:title="@string/pref_camera2_camera2_title" camera:entries="@array/pref_camera2_camera2_entries" camera:entryValues="@array/pref_camera2_camera2_entryvalues" /> diff --git a/res/xml/capture_preferences.xml b/res/xml/capture_preferences.xml index 29a12281f..5ddb60c89 100644 --- a/res/xml/capture_preferences.xml +++ b/res/xml/capture_preferences.xml @@ -80,21 +80,21 @@ camera:title="@string/pref_camera_savepath_title"/> <ListPreference - camera:defaultValue="@string/pref_camera2_mono_only_default" + camera:defaultValue="@string/setting_off_value" camera:entries="@array/pref_camera2_mono_only_entries" camera:entryValues="@array/pref_camera2_mono_only_entryvalues" camera:key="pref_camera2_mono_only_key" camera:title="@string/pref_camera2_mono_only_title"/> <ListPreference - camera:defaultValue="@string/pref_camera2_mono_preview_default" + camera:defaultValue="@string/setting_off_value" camera:entries="@array/pref_camera2_mono_preview_entries" camera:entryValues="@array/pref_camera2_mono_preview_entryvalues" camera:key="pref_camera2_mono_preview_key" camera:title="@string/pref_camera2_mono_preview_title"/> <ListPreference - camera:defaultValue="@string/pref_camera2_clearsight_default" + camera:defaultValue="@string/setting_on_value" camera:entries="@array/pref_camera2_clearsight_entries" camera:entryValues="@array/pref_camera2_clearsight_entryvalues" camera:key="pref_camera2_clearsight_key" @@ -127,7 +127,7 @@ camera:title="@string/pref_camera_scenemode_title"/> <IconListPreference - camera:defaultValue="@string/pref_camera_redeyereduction_default" + camera:defaultValue="@string/setting_off_value" camera:entries="@array/pref_camera2_redeyereduction_entries" camera:entryValues="@array/pref_camera2_redeyereduction_entryvalues" camera:key="pref_camera2_redeyereduction_key" @@ -165,7 +165,7 @@ camera:title="@string/pref_camera_iso_title"/> <IconListPreference - camera:defaultValue="@string/pref_camera_longshot_default" + camera:defaultValue="@string/setting_off_value" camera:entries="@array/pref_camera2_longshot_entries" camera:entryValues="@array/pref_camera2_longshot_entryvalues" camera:key="pref_camera2_longshot_key" @@ -220,7 +220,7 @@ camera:title="@string/pref_camera_audioencoder_title"/> <IconListPreference - camera:defaultValue="@string/pref_camera_dis_default" + camera:defaultValue="@string/setting_off_value" camera:entries="@array/pref_camera2_dis_entries" camera:entryValues="@array/pref_camera2_dis_entryvalues" camera:key="pref_camera2_dis_key" @@ -234,17 +234,6 @@ camera:key="pref_camera2_noise_reduction_key" camera:title="@string/pref_camera_noise_reduction_title"/> - <IconListPreference - camera:defaultValue="@string/pref_camera_video_flashmode_default" - camera:entries="@array/pref_camera2_video_flashmode_entries" - camera:entryValues="@array/pref_camera2_video_flashmode_entryvalues" - camera:icons="@array/video_flashmode_icons" - camera:key="pref_camera2_video_flashmode_key" - camera:labelList="@array/pref_camera2_video_flashmode_labels" - camera:largeIcons="@array/video_flashmode_largeicons" - camera:singleIcon="@drawable/ic_settings_flash" - camera:title="@string/pref_camera_flashmode_title"/> - <ListPreference camera:defaultValue="@string/pref_camera_video_rotation_default" camera:entries="@array/pref_camera2_video_rotation_entries" @@ -260,7 +249,7 @@ camera:title="@string/pref_video_time_lapse_frame_interval_title"/> <IconListPreference - camera:defaultValue="@string/pref_camera_facedetection_default" + camera:defaultValue="@string/setting_off_value" camera:entries="@array/pref_camera2_facedetection_entries" camera:entryValues="@array/pref_camera2_facedetection_entryvalues" camera:key="pref_camera2_facedetection_key" @@ -268,7 +257,7 @@ camera:title="@string/pref_camera_facedetection_title"/> <ListPreference - camera:defaultValue="@string/pref_camera2_videosnap_default" + camera:defaultValue="@string/setting_on_value" camera:entries="@array/pref_camera2_videosnap_entries" camera:entryValues="@array/pref_camera2_videosnap_entryvalues" camera:key="pref_camera2_videosnap_key" diff --git a/res/xml/setting_menu_preferences.xml b/res/xml/setting_menu_preferences.xml new file mode 100644 index 000000000..a606b342c --- /dev/null +++ b/res/xml/setting_menu_preferences.xml @@ -0,0 +1,268 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (c) 2016, The Linux Foundation. All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are + met: + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above + copyright notice, this list of conditions and the following + disclaimer in the documentation and/or other materials provided + with the distribution. + * Neither the name of The Linux Foundation nor the names of its + contributors may be used to endorse or promote products derived + from this software without specific prior written permission. + + THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED + WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT + ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS + BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR + BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE + OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN + IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +--> +<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" + android:key="screen"> + <PreferenceCategory + android:key="general" + android:layout="@layout/preferences_category" + android:title="GENERAL"> + <SwitchPreference + android:defaultValue="false" + android:icon="@drawable/gps_location" + android:key="pref_camera2_recordlocation_key" + android:layout="@layout/preference" + android:title="@string/pref_camera_recordlocation_title" /> + + <SwitchPreference + android:defaultValue="false" + android:icon="@drawable/face_detection" + android:key="pref_camera2_facedetection_key" + android:layout="@layout/preference" + android:title="@string/pref_camera_facedetection_title" /> + + <ListPreference + android:defaultValue="@string/pref_camera_savepath_default" + android:entries="@array/pref_camera2_savepath_entries" + android:entryValues="@array/pref_camera2_savepath_entryvalues" + android:icon="@drawable/storage" + android:key="pref_camera2_savepath_key" + android:layout="@layout/preference" + android:summary="%s" + android:title="@string/pref_camera_savepath_title" /> + </PreferenceCategory> + + <PreferenceCategory + android:key="photo" + android:layout="@layout/preferences_category" + android:title="STILL CAMERA"> + <ListPreference + android:defaultValue="@string/pref_camera2_timer_value_off" + android:entries="@array/pref_camera2_timer_entries" + android:entryValues="@array/pref_camera2_timer_entryvalues" + android:icon="@drawable/countdown_timer" + android:key="pref_camera2_timer_key" + android:layout="@layout/preference" + android:summary="%s" + android:title="@string/pref_camera_timer_title" /> + + <SwitchPreference + android:defaultValue="false" + android:icon="@drawable/continuous_shot" + android:key="pref_camera2_longshot_key" + android:layout="@layout/preference" + android:title="@string/pref_camera_longshot_title" /> + + <ListPreference + android:entries="@array/pref_camera2_picturesize_entries" + android:entryValues="@array/pref_camera2_picturesize_entryvalues" + android:icon="@drawable/picture_size" + android:key="pref_camera2_picturesize_key" + android:layout="@layout/preference" + android:summary="%s" + android:title="@string/pref_camera_picturesize_title" /> + + <ListPreference + android:defaultValue="@string/pref_camera_jpegquality_default" + android:entries="@array/pref_camera2_jpegquality_entries" + android:entryValues="@array/pref_camera2_jpegquality_entryvalues" + android:icon="@drawable/picture_quality" + android:key="pref_camera2_jpegquality_key" + android:layout="@layout/preference" + android:summary="%s" + android:title="@string/pref_camera_jpegquality_title" /> + + <SwitchPreference + android:defaultValue="false" + android:icon="@drawable/ic_settings_redeye" + android:key="pref_camera2_redeyereduction_key" + android:layout="@layout/preference" + android:title="@string/pref_camera_redeyereduction_title" /> + + <ListPreference + android:defaultValue="@string/pref_exposure_default" + android:icon="@drawable/exposure" + android:key="pref_camera2_exposure_key" + android:layout="@layout/preference" + android:summary="%s" + android:title="@string/pref_exposure_title" /> + + <ListPreference + android:defaultValue="@string/pref_camera2_whitebalance_default" + android:entries="@array/pref_camera2_whitebalance_entries" + android:entryValues="@array/pref_camera2_whitebalance_entryvalues" + android:icon="@drawable/white_balance" + android:key="pref_camera2_whitebalance_key" + android:layout="@layout/preference" + android:summary="%s" + android:title="@string/pref_camera_whitebalance_title" /> + + <SwitchPreference + android:defaultValue="false" + android:icon="@drawable/ic_settings_flash" + android:key="pref_selfie_flash_key" + android:layout="@layout/preference" + android:title="@string/pref_selfie_flash_title" /> + + <SwitchPreference + android:defaultValue="true" + android:icon="@drawable/shutter_sound" + android:key="pref_camera2_shutter_sound_key" + android:layout="@layout/preference" + android:title="@string/pref_camera2_shutter_sound_title" /> + + <SwitchPreference + android:defaultValue="false" + android:key="pref_camera2_mono_only_key" + android:layout="@layout/preference" + android:title="@string/pref_camera2_mono_only_title" /> + + <SwitchPreference + android:defaultValue="false" + android:key="pref_camera2_mono_preview_key" + android:layout="@layout/preference" + android:title="@string/pref_camera2_mono_preview_title" /> + + <SwitchPreference + android:defaultValue="false" + android:key="pref_camera2_clearsight_key" + android:layout="@layout/preference" + android:title="@string/pref_camera2_clearsight_title" /> + + <ListPreference + android:defaultValue="false" + android:key="pref_camera2_mpo_key" + android:layout="@layout/preference" + android:title="@string/pref_camera2_mpo_title" /> + </PreferenceCategory> + + <PreferenceCategory + android:key="video" + android:layout="@layout/preferences_category" + android:title="VIDEO CAMERA"> + <ListPreference + android:entries="@array/pref_camera2_video_quality_entries" + android:entryValues="@array/pref_camera2_video_quality_entryvalues" + android:icon="@drawable/video_quality" + android:key="pref_camera2_video_quality_key" + android:layout="@layout/preference" + android:summary="%s" + android:title="@string/pref_video_quality_title" /> + + <ListPreference + android:defaultValue="@string/pref_camera_video_duration_default" + android:entries="@array/pref_camera2_video_duration_entries" + android:entryValues="@array/pref_camera2_video_duration_entryvalues" + android:icon="@drawable/video_duration" + android:key="pref_camera2_video_duration_key" + android:layout="@layout/preference" + android:summary="%s" + android:title="@string/pref_camera_video_duration_title" /> + + <SwitchPreference + android:defaultValue="false" + android:icon="@drawable/image_stabilization" + android:key="pref_camera2_dis_key" + android:layout="@layout/preference" + android:title="@string/pref_camera_dis_title" /> + + <SwitchPreference + android:defaultValue="false" + android:icon="@drawable/noise_reduction" + android:key="pref_camera2_noise_reduction_key" + android:layout="@layout/preference" + android:title="@string/pref_camera_noise_reduction_title" /> + + <ListPreference + android:defaultValue="@string/pref_camera_videoencoder_default" + android:entries="@array/pref_camera2_videoencoder_entries" + android:entryValues="@array/pref_camera2_videoencoder_entryvalues" + android:icon="@drawable/video_encoding" + android:key="pref_camera2_videoencoder_key" + android:layout="@layout/preference" + android:summary="%s" + android:title="@string/pref_camera_videoencoder_title" /> + + <ListPreference + android:defaultValue="@string/pref_camera_audioencoder_default" + android:entries="@array/pref_camera2_audioencoder_entries" + android:entryValues="@array/pref_camera2_audioencoder_entryvalues" + android:icon="@drawable/audio_encoding" + android:key="pref_camera2_audioencoder_key" + android:layout="@layout/preference" + android:summary="%s" + android:title="@string/pref_camera_audioencoder_title" /> + + <ListPreference + android:defaultValue="@string/pref_camera_video_rotation_default" + android:entries="@array/pref_camera2_video_rotation_entries" + android:entryValues="@array/pref_camera2_video_rotation_entryvalues" + android:icon="@drawable/video_rotation" + android:key="pref_camera2_video_rotation_key" + android:layout="@layout/preference" + android:summary="%s" + android:title="@string/pref_camera_video_rotation_title" /> + + <ListPreference + android:defaultValue="@string/pref_video_time_lapse_frame_interval_default" + android:entries="@array/pref_camera2_video_time_lapse_frame_interval_entries" + android:entryValues="@array/pref_camera2_video_time_lapse_frame_interval_entryvalues" + android:icon="@drawable/clock" + android:key="pref_camera2_video_time_lapse_frame_interval_key" + android:layout="@layout/preference" + android:summary="%s" + android:title="@string/pref_video_time_lapse_frame_interval_title" /> + + <ListPreference + android:defaultValue="@string/pref_camera2_videosnap_default" + android:entries="@array/pref_camera2_videosnap_entries" + android:entryValues="@array/pref_camera2_videosnap_entryvalues" + android:icon="@drawable/auto_snapshot_size" + android:key="pref_camera2_videosnap_key" + android:layout="@layout/preference" + android:summary="%s" + android:title="@string/pref_camera2_videosnap_title" /> + + <ListPreference + android:defaultValue="@string/pref_camera_hfr_default" + android:entries="@array/pref_camera_hfr_entries" + android:entryValues="@array/pref_camera_hfr_entryvalues" + android:icon="@drawable/ic_settings_fps" + android:key="pref_camera2_hfr_key" + android:layout="@layout/preference" + android:summary="%s" + android:title="@string/pref_camera_hfr_title" /> + + <SwitchPreference + android:defaultValue="false" + android:icon="@drawable/tracking_focus" + android:key="pref_camera2_trackingfocus_key" + android:layout="@layout/preference" + android:title="@string/pref_camera2_trackingfocus_title" /> + </PreferenceCategory> +</PreferenceScreen>
\ No newline at end of file |
