diff options
Diffstat (limited to 'res')
65 files changed, 535 insertions, 52 deletions
diff --git a/res/drawable-hdpi/bar_beautify_rectangle_blue.png b/res/drawable-hdpi/bar_beautify_rectangle_blue.png Binary files differnew file mode 100755 index 000000000..37b6cdafb --- /dev/null +++ b/res/drawable-hdpi/bar_beautify_rectangle_blue.png diff --git a/res/drawable-hdpi/bar_beautify_rectangle_white.png b/res/drawable-hdpi/bar_beautify_rectangle_white.png Binary files differnew file mode 100755 index 000000000..06bc65042 --- /dev/null +++ b/res/drawable-hdpi/bar_beautify_rectangle_white.png diff --git a/res/drawable-hdpi/ic_beautify_oval.png b/res/drawable-hdpi/ic_beautify_oval.png Binary files differnew file mode 100755 index 000000000..be86fdc03 --- /dev/null +++ b/res/drawable-hdpi/ic_beautify_oval.png diff --git a/res/drawable-hdpi/ic_scene_mode_black_auto.png b/res/drawable-hdpi/ic_scene_mode_black_auto.png Binary files differnew file mode 100644 index 000000000..3f68e8e47 --- /dev/null +++ b/res/drawable-hdpi/ic_scene_mode_black_auto.png diff --git a/res/drawable-hdpi/ic_scene_mode_black_backlight.png b/res/drawable-hdpi/ic_scene_mode_black_backlight.png Binary files differnew file mode 100644 index 000000000..a70502f79 --- /dev/null +++ b/res/drawable-hdpi/ic_scene_mode_black_backlight.png diff --git a/res/drawable-hdpi/ic_scene_mode_black_beach.png b/res/drawable-hdpi/ic_scene_mode_black_beach.png Binary files differnew file mode 100644 index 000000000..d66a5ff23 --- /dev/null +++ b/res/drawable-hdpi/ic_scene_mode_black_beach.png diff --git a/res/drawable-hdpi/ic_scene_mode_black_best_photo.png b/res/drawable-hdpi/ic_scene_mode_black_best_photo.png Binary files differnew file mode 100644 index 000000000..5ddd1aac2 --- /dev/null +++ b/res/drawable-hdpi/ic_scene_mode_black_best_photo.png diff --git a/res/drawable-hdpi/ic_scene_mode_black_blur_buster.png b/res/drawable-hdpi/ic_scene_mode_black_blur_buster.png Binary files differnew file mode 100644 index 000000000..a5b930f5e --- /dev/null +++ b/res/drawable-hdpi/ic_scene_mode_black_blur_buster.png diff --git a/res/drawable-hdpi/ic_scene_mode_black_candlelight.png b/res/drawable-hdpi/ic_scene_mode_black_candlelight.png Binary files differnew file mode 100644 index 000000000..cc8606e09 --- /dev/null +++ b/res/drawable-hdpi/ic_scene_mode_black_candlelight.png diff --git a/res/drawable-hdpi/ic_scene_mode_black_chroma_flash.png b/res/drawable-hdpi/ic_scene_mode_black_chroma_flash.png Binary files differnew file mode 100644 index 000000000..9c8c1108e --- /dev/null +++ b/res/drawable-hdpi/ic_scene_mode_black_chroma_flash.png diff --git a/res/drawable-hdpi/ic_scene_mode_black_dual_camera.png b/res/drawable-hdpi/ic_scene_mode_black_dual_camera.png Binary files differnew file mode 100644 index 000000000..16b803601 --- /dev/null +++ b/res/drawable-hdpi/ic_scene_mode_black_dual_camera.png diff --git a/res/drawable-hdpi/ic_scene_mode_black_flowers.png b/res/drawable-hdpi/ic_scene_mode_black_flowers.png Binary files differnew file mode 100644 index 000000000..527329e75 --- /dev/null +++ b/res/drawable-hdpi/ic_scene_mode_black_flowers.png diff --git a/res/drawable-hdpi/ic_scene_mode_black_hdr.png b/res/drawable-hdpi/ic_scene_mode_black_hdr.png Binary files differnew file mode 100644 index 000000000..3baa45485 --- /dev/null +++ b/res/drawable-hdpi/ic_scene_mode_black_hdr.png diff --git a/res/drawable-hdpi/ic_scene_mode_black_landscape.png b/res/drawable-hdpi/ic_scene_mode_black_landscape.png Binary files differnew file mode 100644 index 000000000..45a247e8d --- /dev/null +++ b/res/drawable-hdpi/ic_scene_mode_black_landscape.png diff --git a/res/drawable-hdpi/ic_scene_mode_black_night.png b/res/drawable-hdpi/ic_scene_mode_black_night.png Binary files differnew file mode 100644 index 000000000..6cf2ce8eb --- /dev/null +++ b/res/drawable-hdpi/ic_scene_mode_black_night.png diff --git a/res/drawable-hdpi/ic_scene_mode_black_optizoom.png b/res/drawable-hdpi/ic_scene_mode_black_optizoom.png Binary files differnew file mode 100644 index 000000000..331705738 --- /dev/null +++ b/res/drawable-hdpi/ic_scene_mode_black_optizoom.png diff --git a/res/drawable-hdpi/ic_scene_mode_black_panorama.png b/res/drawable-hdpi/ic_scene_mode_black_panorama.png Binary files differnew file mode 100644 index 000000000..38c4a1b39 --- /dev/null +++ b/res/drawable-hdpi/ic_scene_mode_black_panorama.png diff --git a/res/drawable-hdpi/ic_scene_mode_black_portrait.png b/res/drawable-hdpi/ic_scene_mode_black_portrait.png Binary files differnew file mode 100644 index 000000000..564e3da51 --- /dev/null +++ b/res/drawable-hdpi/ic_scene_mode_black_portrait.png diff --git a/res/drawable-hdpi/ic_scene_mode_black_pro_mode.png b/res/drawable-hdpi/ic_scene_mode_black_pro_mode.png Binary files differnew file mode 100644 index 000000000..bb9cd76ac --- /dev/null +++ b/res/drawable-hdpi/ic_scene_mode_black_pro_mode.png diff --git a/res/drawable-hdpi/ic_scene_mode_black_sharp_photo.png b/res/drawable-hdpi/ic_scene_mode_black_sharp_photo.png Binary files differnew file mode 100644 index 000000000..a475cc724 --- /dev/null +++ b/res/drawable-hdpi/ic_scene_mode_black_sharp_photo.png diff --git a/res/drawable-hdpi/ic_scene_mode_black_snow.png b/res/drawable-hdpi/ic_scene_mode_black_snow.png Binary files differnew file mode 100644 index 000000000..2ac492c08 --- /dev/null +++ b/res/drawable-hdpi/ic_scene_mode_black_snow.png diff --git a/res/drawable-hdpi/ic_scene_mode_black_sports.png b/res/drawable-hdpi/ic_scene_mode_black_sports.png Binary files differnew file mode 100644 index 000000000..932be9821 --- /dev/null +++ b/res/drawable-hdpi/ic_scene_mode_black_sports.png diff --git a/res/drawable-hdpi/ic_scene_mode_black_sunset.png b/res/drawable-hdpi/ic_scene_mode_black_sunset.png Binary files differnew file mode 100644 index 000000000..68b653527 --- /dev/null +++ b/res/drawable-hdpi/ic_scene_mode_black_sunset.png diff --git a/res/drawable-hdpi/ic_scene_mode_black_time_lapse.png b/res/drawable-hdpi/ic_scene_mode_black_time_lapse.png Binary files differnew file mode 100644 index 000000000..868e51d3d --- /dev/null +++ b/res/drawable-hdpi/ic_scene_mode_black_time_lapse.png diff --git a/res/drawable-hdpi/ic_scene_mode_black_tracking_focus.png b/res/drawable-hdpi/ic_scene_mode_black_tracking_focus.png Binary files differnew file mode 100644 index 000000000..e86a330c2 --- /dev/null +++ b/res/drawable-hdpi/ic_scene_mode_black_tracking_focus.png diff --git a/res/drawable-hdpi/ic_scene_mode_black_ubifocus.png b/res/drawable-hdpi/ic_scene_mode_black_ubifocus.png Binary files differnew file mode 100644 index 000000000..eb174e728 --- /dev/null +++ b/res/drawable-hdpi/ic_scene_mode_black_ubifocus.png diff --git a/res/drawable-mdpi/bar_beautify_rectangle_blue.png b/res/drawable-mdpi/bar_beautify_rectangle_blue.png Binary files differnew file mode 100755 index 000000000..454787c9c --- /dev/null +++ b/res/drawable-mdpi/bar_beautify_rectangle_blue.png diff --git a/res/drawable-mdpi/bar_beautify_rectangle_white.png b/res/drawable-mdpi/bar_beautify_rectangle_white.png Binary files differnew file mode 100755 index 000000000..70b4c951f --- /dev/null +++ b/res/drawable-mdpi/bar_beautify_rectangle_white.png diff --git a/res/drawable-mdpi/ic_beautify_oval.png b/res/drawable-mdpi/ic_beautify_oval.png Binary files differnew file mode 100755 index 000000000..373a99a28 --- /dev/null +++ b/res/drawable-mdpi/ic_beautify_oval.png diff --git a/res/drawable/auto_blue.png b/res/drawable/auto_blue.png Binary files differnew file mode 100644 index 000000000..acf632e16 --- /dev/null +++ b/res/drawable/auto_blue.png diff --git a/res/drawable/beautify_progressbar_style.xml b/res/drawable/beautify_progressbar_style.xml new file mode 100755 index 000000000..962d8dedb --- /dev/null +++ b/res/drawable/beautify_progressbar_style.xml @@ -0,0 +1,35 @@ +<?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. +--> +<layer-list xmlns:android="http://schemas.android.com/apk/res/android"> + <item android:id="@android:id/background" + android:drawable="@drawable/bar_beautify_rectangle_white" /> + <item android:id="@android:id/progress"> + <clip android:drawable="@drawable/bar_beautify_rectangle_blue" /> + </item> +</layer-list>
\ No newline at end of file diff --git a/res/drawable/cloudy.png b/res/drawable/cloudy.png Binary files differnew file mode 100644 index 000000000..b29ab9e5d --- /dev/null +++ b/res/drawable/cloudy.png diff --git a/res/drawable/cloudy_blue.png b/res/drawable/cloudy_blue.png Binary files differnew file mode 100644 index 000000000..303a2703e --- /dev/null +++ b/res/drawable/cloudy_blue.png diff --git a/res/drawable/fluorescent.png b/res/drawable/fluorescent.png Binary files differnew file mode 100644 index 000000000..d25f7473e --- /dev/null +++ b/res/drawable/fluorescent.png diff --git a/res/drawable/fluorescent_blue.png b/res/drawable/fluorescent_blue.png Binary files differnew file mode 100644 index 000000000..7fb7836dd --- /dev/null +++ b/res/drawable/fluorescent_blue.png diff --git a/res/drawable/icon_exposure.png b/res/drawable/icon_exposure.png Binary files differnew file mode 100644 index 000000000..ff5397251 --- /dev/null +++ b/res/drawable/icon_exposure.png diff --git a/res/drawable/icon_exposure_blue.png b/res/drawable/icon_exposure_blue.png Binary files differnew file mode 100644 index 000000000..544b98ab4 --- /dev/null +++ b/res/drawable/icon_exposure_blue.png diff --git a/res/drawable/icon_iso.png b/res/drawable/icon_iso.png Binary files differnew file mode 100644 index 000000000..85662af5e --- /dev/null +++ b/res/drawable/icon_iso.png diff --git a/res/drawable/icon_iso_blue.png b/res/drawable/icon_iso_blue.png Binary files differnew file mode 100644 index 000000000..001d8c9f5 --- /dev/null +++ b/res/drawable/icon_iso_blue.png diff --git a/res/drawable/icon_manual.png b/res/drawable/icon_manual.png Binary files differnew file mode 100644 index 000000000..53e2ff5ec --- /dev/null +++ b/res/drawable/icon_manual.png diff --git a/res/drawable/icon_manual_blue.png b/res/drawable/icon_manual_blue.png Binary files differnew file mode 100644 index 000000000..52b2daa19 --- /dev/null +++ b/res/drawable/icon_manual_blue.png diff --git a/res/drawable/icon_white_balance.png b/res/drawable/icon_white_balance.png Binary files differnew file mode 100644 index 000000000..1fbd36fd3 --- /dev/null +++ b/res/drawable/icon_white_balance.png diff --git a/res/drawable/icon_white_balance_blue.png b/res/drawable/icon_white_balance_blue.png Binary files differnew file mode 100644 index 000000000..ca84b89d8 --- /dev/null +++ b/res/drawable/icon_white_balance_blue.png diff --git a/res/drawable/icon_x.png b/res/drawable/icon_x.png Binary files differnew file mode 100644 index 000000000..a807409c8 --- /dev/null +++ b/res/drawable/icon_x.png diff --git a/res/drawable/incandecent.png b/res/drawable/incandecent.png Binary files differnew file mode 100644 index 000000000..d601e4b5c --- /dev/null +++ b/res/drawable/incandecent.png diff --git a/res/drawable/incandecent_blue.png b/res/drawable/incandecent_blue.png Binary files differnew file mode 100644 index 000000000..0c3eabf13 --- /dev/null +++ b/res/drawable/incandecent_blue.png diff --git a/res/drawable/promode.png b/res/drawable/promode.png Binary files differnew file mode 100644 index 000000000..53e2ff5ec --- /dev/null +++ b/res/drawable/promode.png diff --git a/res/drawable/radial_menu.png b/res/drawable/radial_menu.png Binary files differnew file mode 100644 index 000000000..a5757f1a0 --- /dev/null +++ b/res/drawable/radial_menu.png diff --git a/res/drawable/selected_dot.png b/res/drawable/selected_dot.png Binary files differnew file mode 100644 index 000000000..9114f6ce6 --- /dev/null +++ b/res/drawable/selected_dot.png diff --git a/res/drawable/sunlight.png b/res/drawable/sunlight.png Binary files differnew file mode 100644 index 000000000..cc33dcc3d --- /dev/null +++ b/res/drawable/sunlight.png diff --git a/res/drawable/sunlight_blue.png b/res/drawable/sunlight_blue.png Binary files differnew file mode 100644 index 000000000..c390ec653 --- /dev/null +++ b/res/drawable/sunlight_blue.png diff --git a/res/drawable/white_dot.png b/res/drawable/white_dot.png Binary files differnew file mode 100644 index 000000000..847fd84fe --- /dev/null +++ b/res/drawable/white_dot.png diff --git a/res/layout/bestpicture_page.xml b/res/layout/bestpicture_page.xml index d6b6022c8..5a1b604f0 100644..100755 --- a/res/layout/bestpicture_page.xml +++ b/res/layout/bestpicture_page.xml @@ -34,9 +34,9 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. <ImageView android:id="@+id/image_view" android:adjustViewBounds="true" - android:scaleType="fitXY" - android:layout_width="wrap_content" - android:layout_height="wrap_content" + android:scaleType="fitCenter" + android:layout_width="match_parent" + android:layout_height="match_parent" android:layout_gravity="center" /> <RelativeLayout android:layout_width="match_parent" diff --git a/res/layout/capture_module.xml b/res/layout/capture_module.xml index fc05fd0ca..44d5c59c6 100644..100755 --- a/res/layout/capture_module.xml +++ b/res/layout/capture_module.xml @@ -67,30 +67,27 @@ android:layout_width="match_parent" android:layout_height="match_parent" /> - <com.android.camera.ui.RotateLayout - android:id="@+id/recording_time_rect" + + <FrameLayout android:layout_width="match_parent" android:layout_height="match_parent"> - - <LinearLayout - xmlns:android="http://schemas.android.com/apk/res/android" + <com.android.camera.ui.RotateLayout + android:id="@+id/recording_time_rect" android:layout_width="match_parent" android:layout_height="match_parent" - android:orientation="horizontal"> - - <com.android.camera.PauseButton - android:id="@+id/video_pause" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginLeft="70dp" - android:padding="23dp" - android:src="@drawable/btn_pause_recording"/> - + android:layout_alignParentTop="true" + android:layout_alignParentLeft="true" + android:visibility="gone" + android:layout_marginLeft="24dp" + android:layout_marginTop="80dp"> <include android:id="@+id/labels" layout="@layout/viewfinder_labels_video"/> - </LinearLayout> - </com.android.camera.ui.RotateLayout> + </com.android.camera.ui.RotateLayout> + </FrameLayout> + + <include + layout="@layout/scene_mode_label"/> <include style="@style/CameraControls" diff --git a/res/layout/one_ui_layout.xml b/res/layout/one_ui_layout.xml index 2a87b6cd2..53174698c 100644..100755 --- a/res/layout/one_ui_layout.xml +++ b/res/layout/one_ui_layout.xml @@ -21,6 +21,11 @@ android:layout_width="match_parent" android:layout_height="match_parent"> + <com.android.camera.ui.ProMode + android:id="@+id/promode_slider" + android:layout_height="wrap_content" + android:layout_width="wrap_content" /> + <com.android.camera.ui.FlashToggleButton android:id="@+id/flash_button" style="@style/OneUIMenuButton" @@ -35,8 +40,8 @@ <com.android.camera.ShutterButton android:id="@+id/shutter_button" - android:layout_width="70dp" - android:layout_height="70dp" + android:layout_width="@dimen/one_ui_bottom_large" + android:layout_height="@dimen/one_ui_bottom_large" android:clickable="true" android:contentDescription="@string/accessibility_shutter_button" android:focusable="true" @@ -45,14 +50,24 @@ <com.android.camera.ui.RotateImageView android:id="@+id/video_button" - android:layout_width="55dp" - android:layout_height="55dp" + android:layout_width="@dimen/one_ui_bottom_small" + android:layout_height="@dimen/one_ui_bottom_small" android:clickable="true" android:contentDescription="@string/accessibility_shutter_button" android:focusable="true" android:scaleType="fitCenter" android:src="@drawable/video_capture" /> + <com.android.camera.PauseButton + android:id="@+id/video_pause" + android:layout_width="@dimen/one_ui_bottom_small" + android:layout_height="@dimen/one_ui_bottom_small" + android:focusable="true" + android:clickable="true" + android:scaleType="fitCenter" + android:visibility="gone" + android:src="@drawable/btn_pause_recording"/> + <com.android.camera.ui.RotateImageView android:id="@+id/preview_thumb" android:layout_width="@dimen/capture_size" @@ -91,42 +106,53 @@ android:id="@+id/makeup_seekbar_layout" android:visibility="gone"> <ImageView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:paddingLeft="5dp" - android:paddingRight="5dp" + android:layout_width="12dp" + android:layout_height="20dp" + android:layout_marginLeft="23dp" + android:layout_marginRight="23dp" android:id="@+id/seekbar_toggle"> </ImageView> <RelativeLayout - android:layout_width="match_parent" + android:layout_width="wrap_content" android:layout_height="wrap_content" android:id="@+id/seekbar_body"> <com.android.camera.ui.RotateLayout - android:layout_width="wrap_content" - android:layout_height="wrap_content" + android:layout_width="24dp" + android:layout_height="24dp" android:layout_alignParentLeft="true" android:id="@+id/makeup_low_text"> <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/makeup_seekbar_low"> + android:layout_width="match_parent" + android:layout_height="match_parent" + android:textSize="12sp" + android:gravity="center" + android:text="@string/makeup_seekbar_low" + android:textColor="@android:color/white"> </TextView> </com.android.camera.ui.RotateLayout> <SeekBar - android:layout_width="match_parent" + android:layout_width="220dp" android:layout_height="wrap_content" - android:paddingLeft="100dp" - android:paddingRight="100dp" + android:maxHeight="3dip" + android:minHeight="1dip" + android:layout_marginLeft="10dp" + android:layout_toRightOf="@+id/makeup_low_text" + android:progressDrawable="@drawable/beautify_progressbar_style" + android:thumb="@drawable/ic_beautify_oval" android:id="@+id/makeup_seekbar"/> <com.android.camera.ui.RotateLayout - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentRight="true" + android:layout_width="24dp" + android:layout_height="24dp" + android:layout_toRightOf="@+id/makeup_seekbar" + android:layout_marginLeft="10dp" android:id="@+id/makeup_high_text"> <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/makeup_seekbar_high"> + android:layout_width="match_parent" + android:layout_height="match_parent" + android:textSize="12sp" + android:gravity="center" + android:text="@string/makeup_seekbar_high" + android:textColor="@android:color/white"> </TextView> </com.android.camera.ui.RotateLayout> </RelativeLayout> @@ -156,4 +182,11 @@ android:visibility="gone" /> </LinearLayout> + <include layout="@layout/pro_mode_layout" /> + + <ImageView + android:id="@+id/promode_close_button" + android:layout_height="20dp" + android:layout_width="20dp" + android:src="@drawable/icon_x" /> </com.android.camera.ui.OneUICameraControls> diff --git a/res/layout/pano_capture_module.xml b/res/layout/pano_capture_module.xml index e382570ef..c8809af37 100644 --- a/res/layout/pano_capture_module.xml +++ b/res/layout/pano_capture_module.xml @@ -34,6 +34,10 @@ android:id="@+id/preview_process_view" android:layout_width="match_parent" android:layout_height="match_parent"/> + + <include + layout="@layout/scene_mode_label"/> + <include style="@style/CameraControls" layout="@layout/camera_controls" diff --git a/res/layout/pro_mode_layout.xml b/res/layout/pro_mode_layout.xml new file mode 100644 index 000000000..54ccb556c --- /dev/null +++ b/res/layout/pro_mode_layout.xml @@ -0,0 +1,148 @@ +<?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:id="@+id/pro_mode_layout" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="horizontal" + android:visibility="invisible"> + + <com.android.camera.ui.RotateLayout + android:id="@+id/exposure_rotate_layout" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_weight="1"> + + <LinearLayout + android:id="@+id/exposure_layout" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:gravity="center" + android:orientation="vertical"> + + <ImageView + android:id="@+id/exposure" + android:layout_width="30dp" + android:layout_height="30dp" + android:layout_gravity="center" + android:src="@drawable/icon_exposure" /> + + <TextView + android:id="@+id/exposure_value" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center" /> + </LinearLayout> + </com.android.camera.ui.RotateLayout> + + <com.android.camera.ui.RotateLayout + android:id="@+id/manual_rotate_layout" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_weight="1"> + + <LinearLayout + android:id="@+id/manual_layout" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:gravity="center" + android:orientation="vertical"> + + <ImageView + android:id="@+id/manual" + android:layout_width="30dp" + android:layout_height="30dp" + android:layout_gravity="center" + android:src="@drawable/icon_manual" /> + + <TextView + android:id="@+id/manual_value" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center" /> + </LinearLayout> + </com.android.camera.ui.RotateLayout> + + <com.android.camera.ui.RotateLayout + android:id="@+id/white_balance_rotate_layout" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_weight="1"> + + <LinearLayout + android:id="@+id/white_balance_layout" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:gravity="center" + android:orientation="vertical"> + + <ImageView + android:id="@+id/white_balance" + android:layout_width="30dp" + android:layout_height="30dp" + android:layout_gravity="center" + android:src="@drawable/icon_white_balance" /> + + <TextView + android:id="@+id/white_balance_value" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center" /> + </LinearLayout> + </com.android.camera.ui.RotateLayout> + + <com.android.camera.ui.RotateLayout + android:id="@+id/iso_rotate_layout" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_weight="1"> + + <LinearLayout + android:id="@+id/iso_layout" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:gravity="center" + android:orientation="vertical"> + + <ImageView + android:id="@+id/iso" + android:layout_width="30dp" + android:layout_height="30dp" + android:layout_gravity="center" + android:src="@drawable/icon_iso" /> + + <TextView + android:id="@+id/iso_value" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center" /> + </LinearLayout> + </com.android.camera.ui.RotateLayout> + +</LinearLayout> diff --git a/res/layout/scene_mode_instructional.xml b/res/layout/scene_mode_instructional.xml new file mode 100644 index 000000000..588dc3549 --- /dev/null +++ b/res/layout/scene_mode_instructional.xml @@ -0,0 +1,102 @@ +<?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:id="@+id/mode_layout_rect" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:background="@android:color/transparent" + android:gravity="center"> + + <LinearLayout + android:id="@+id/title" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginLeft="30dp" + android:layout_marginTop="15dp" + android:orientation="horizontal" + android:gravity="center"> + <ImageView + android:id="@+id/scene_mode_icon" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:src="@drawable/chroma_flash"/> + <TextView + android:id="@+id/scene_mode_name" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:gravity="center_vertical" + android:layout_toRightOf="@id/scene_mode_icon" + android:text="@string/pref_camera_scenemode_entry_chromaflash" + android:textColor="@android:color/black" + android:textAppearance="?android:attr/textAppearanceMedium" /> + + </LinearLayout> + + <TextView + android:id="@+id/scene_mode_instructional" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginTop="15dp" + android:layout_marginLeft="30dp" + android:layout_marginRight="30dp" + android:text="@string/pref_camera2_scene_mode_chroma_flash_instructional_content" + android:textColor="@android:color/black" + android:layout_below="@id/title" /> + <CheckBox + android:id="@+id/remember_selected" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="15dp" + android:layout_marginLeft="30dp" + android:layout_below="@id/scene_mode_instructional" + android:text="@string/pref_camera2_not_show_again" + android:textColor="@android:color/black"/> + + <View + android:id="@+id/separator" + android:layout_width="wrap_content" + android:layout_height="1dp" + android:layout_marginTop="15dp" + android:layout_marginBottom="15dp" + android:layout_below="@id/remember_selected" + android:background="#c0c0c0" /> + + <Button + android:id="@+id/scene_mode_instructional_ok" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_below="@id/separator" + android:background="@android:color/transparent" + android:layout_marginRight="30dp" + android:layout_alignParentRight="true" + android:text="@string/pref_camera2_scene_mode_instructional_ok" + android:textColor="@android:color/black"/> +</RelativeLayout> + diff --git a/res/layout/scene_mode_label.xml b/res/layout/scene_mode_label.xml new file mode 100644 index 000000000..e0d8d43b8 --- /dev/null +++ b/res/layout/scene_mode_label.xml @@ -0,0 +1,56 @@ +<?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. +--> + +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_marginTop="90dp" + android:layout_marginRight="20dp" + android:gravity="right"> + <com.android.camera.ui.RotateLayout + android:id="@+id/scene_mode_label_rect" + android:layout_width="wrap_content" + android:layout_height="wrap_content"> + <LinearLayout + android:id="@+id/scene_mode_label_view" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginRight="20dp" + android:background="#90000000" + android:orientation="horizontal" + android:gravity="center_vertical"> + <TextView + android:id="@+id/scene_mode_label" + android:singleLine="true" + android:text="@string/pref_camera_scenemode_entry_chromaflash" + android:textColor="@android:color/white" + android:textSize="16dp" + style="@style/OnViewfinderSceneLabel" /> + <ImageView + android:id="@+id/scene_mode_label_close" + android:layout_width="15dp" + android:layout_height="15dp" + android:layout_marginLeft="10dp" + android:layout_marginRight="10dp" + android:layout_marginTop="5dp" + android:layout_marginBottom="5dp" + android:src="@drawable/x" /> + </LinearLayout> + </com.android.camera.ui.RotateLayout> +</LinearLayout>
\ No newline at end of file diff --git a/res/values/camera2arrays.xml b/res/values/camera2arrays.xml index 80c695d58..fbb70b984 100644 --- a/res/values/camera2arrays.xml +++ b/res/values/camera2arrays.xml @@ -157,6 +157,7 @@ <item>107</item> <item>108</item> <item>104</item> + <item>109</item> </string-array> <!-- Camera Preferences Scene Mode dialog box entries --> @@ -183,6 +184,7 @@ <item>@string/pref_camera_scenemode_entry_sharpshooter</item> <item>@string/pref_camera_scenemode_entry_trackingfocus</item> <item>@string/pref_camera_scenemode_entry_panorama</item> + <item>@string/pref_camera_scenemode_entry_promode</item> </string-array> <array name="pref_camera2_scenemode_thumbnails" translatable="false"> @@ -208,8 +210,62 @@ <item>@drawable/sharp_photo</item> <item>@drawable/tracking_focus</item> <item>@drawable/scene_panorama</item> + <item>@drawable/promode</item> </array> + <array name="pref_camera2_scenemode_black_thumbnails" translatable="false"> + <item>@drawable/ic_scene_mode_black_auto</item> + <item>@drawable/ic_scene_mode_black_dual_camera</item> + <item>@drawable/ic_scene_mode_black_hdr</item> + <item>@drawable/ic_scene_mode_black_ubifocus</item> + <item>@drawable/ic_scene_mode_black_optizoom</item> + <item>@drawable/ic_scene_mode_black_portrait</item> + <item>@drawable/ic_scene_mode_black_landscape</item> + <item>@drawable/ic_scene_mode_black_sports</item> + <item>@drawable/ic_scene_mode_black_flowers</item> + <item>@drawable/ic_scene_mode_black_backlight</item> + <item>@drawable/ic_scene_mode_black_candlelight</item> + <item>@drawable/ic_scene_mode_black_sunset</item> + <item>@drawable/ic_scene_mode_black_night</item> + <item>@drawable/ic_scene_mode_black_beach</item> + <item>@drawable/ic_scene_mode_black_snow</item> + <item>@drawable/ic_scene_mode_smartauto</item> + <item>@drawable/ic_scene_mode_black_best_photo</item> + <item>@drawable/ic_scene_mode_black_chroma_flash</item> + <item>@drawable/ic_scene_mode_black_blur_buster</item> + <item>@drawable/ic_scene_mode_black_sharp_photo</item> + <item>@drawable/ic_scene_mode_black_tracking_focus</item> + <item>@drawable/ic_scene_mode_black_panorama</item> + <item>@drawable/ic_scene_mode_black_dual_camera</item> + </array> + + <!-- Camera Preferences Scene Mode dialog box entries --> + <string-array name="pref_camera2_scenemode_instructional_entries" translatable="false"> + <item>@string/pref_camera_scenemode_entry_auto</item> + <item>@string/pref_camera2_scene_mode_dual_camera_instructional_content</item> + <item>@string/pref_camera2_scene_mode_hdr_instructional_content</item> + <item>@string/pref_camera2_scene_mode_ubi_focus_instructional_content</item> + <item>@string/pref_camera2_scene_mode_opti_zoom_instructional_content</item> + <item>""</item> + <item>""</item> + <item>@string/pref_camera2_scene_mode_sports_instructional_content</item> + <item>""</item> + <item>""</item> + <item>""</item> + <item>""</item> + <item>""</item> + <item>""</item> + <item>""</item> + <item>""</item> + <item>@string/pref_camera2_scene_mode_best_photo_instructional_content</item> + <item>@string/pref_camera2_scene_mode_chroma_flash_instructional_content</item> + <item>@string/pref_camera2_scene_mode_blur_buster_instructional_content</item> + <item>@string/pref_camera2_scene_mode_sharp_photo_instructional_content</item> + <item>@string/pref_camera2_scene_mode_tracking_focus_instructional_content</item> + <item>@string/pref_camera2_scene_mode_panorama_instructional_content</item> + <item>@string/pref_camera2_scene_mode_pro_instructional_content</item> + </string-array> + <string-array name="pref_camera2_whitebalance_entryvalues" translatable="false"> <item>1</item> <item>2</item> diff --git a/res/values/dimens.xml b/res/values/dimens.xml index 2a58a33e2..d89d0a990 100644..100755 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -180,4 +180,7 @@ <dimen name="refocus_circle_diameter_3">95dp</dimen> <dimen name="refocus_cross_length">19dp</dimen> <dimen name="refocus_stroke_width">2dp</dimen> + + <dimen name="one_ui_bottom_large">75dp</dimen> + <dimen name="one_ui_bottom_small">55dp</dimen> </resources> diff --git a/res/values/qcomstrings.xml b/res/values/qcomstrings.xml index 34c9b32cf..509fae318 100644 --- a/res/values/qcomstrings.xml +++ b/res/values/qcomstrings.xml @@ -1029,6 +1029,7 @@ <string name="pref_camera_scenemode_entry_sharpshooter" translatable="true">SharpPhoto</string> <string name="pref_camera_scenemode_entry_trackingfocus" translatable="true">TrackingFocus</string> <string name="pref_camera_scenemode_entry_panorama" translatable="true">Panorama</string> + <string name="pref_camera_scenemode_entry_promode" translatable="true">ProMode</string> <string name="bestpicture_done" translatable="true">DONE</string> <string name="bestpicture_at_least_one_picture" translatable="true">At least, one picture has to be chosen.</string> @@ -1040,10 +1041,10 @@ <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_entry_off" translatable="true">Off</string> + <string name="pref_camera2_timer_entry_2sec" translatable="true">2 seconds</string> + <string name="pref_camera2_timer_entry_5sec" translatable="true">5 seconds</string> + <string name="pref_camera2_timer_entry_10sec" translatable="true">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> @@ -1056,5 +1057,28 @@ <string name="makeup_ui_ok_button" translatable="true">OK</string> <string name="makeup_seekbar_low" translatable="true">low</string> <string name="makeup_seekbar_high" translatable="true">high</string> + + <string name="perf_camera2_version_info" translatable="true">Version Info</string> + <string name="perf_camera2_preferences_category_general" translatable="true">General</string> + <string name="perf_camera2_preferences_category_photo" translatable="true">Still camera</string> + <string name="perf_camera2_preferences_category_video" translatable="true">Video camera</string> + <string name="perf_camera2_preferences_category_system" translatable="true">System</string> + + <string name="pref_camera2_scene_mode_dual_camera_instructional_content" translatable="true">In dual camera mode, your pictures will be clearer. You can also apply background effects, by editing your dual camera pictures in the Gallery.</string> + <string name="pref_camera2_scene_mode_ubi_focus_instructional_content" translatable="true">With UbiFocus, your camera will take five pictures and combine them into one picture,where everything is in focus. You can choose to re-focus, after you take the picture.</string> + <string name="pref_camera2_scene_mode_opti_zoom_instructional_content" translatable="true">Use Optizoom when you want to zoom in for a clear picture.You can zoom before, or after taking the picture.</string> + <string name="pref_camera2_scene_mode_sports_instructional_content" translatable="true">Sports mode helps you take better sports or action shots.\n\nImporves your photos, but has no effect on video recording.</string> + <string name="pref_camera2_scene_mode_hdr_instructional_content" translatable="true">When you are in mixed lighting conditions such as low light and backlit scenes select "HDR" for best possible pictures.</string> + <string name="pref_camera2_scene_mode_best_photo_instructional_content" translatable="true">Allows you to take a burst of 10 photos, and you can choose the best one(s).</string> + <string name="pref_camera2_scene_mode_chroma_flash_instructional_content" translatable="true">With ChromaFlash, the lighting in your flash photos will be optimized for all of the people and objects in your pictures.This feature applies only to the back camera.</string> + <string name="pref_camera2_scene_mode_sharp_photo_instructional_content" translatable="true">Sharp Phot reduces blur that is due to motion in the scene, or due to hand motion.</string> + <string name="pref_camera2_scene_mode_tracking_focus_instructional_content" translatable="true">Allows you to track and focus a selected person or object while taking pictures or videos. To start, position the focus rectangle on a person or object you want to track.</string> + <string name="pref_camera2_scene_mode_time_lapse_instructional_content" translatable="true">With Time Lapse, you can transform a long video recording into a few seconds of video.This effect applies to videos, but not photos.</string> + <string name="pref_camera2_scene_mode_panorama_instructional_content" translatable="true">Allows you to pan left or right to take a wide landscape photo. You can alse pan up or down to take tall photos.</string> + <string name="pref_camera2_scene_mode_blur_buster_instructional_content" translatable="true">BlurBuster reduces blur from shaky hands.It can be helpful when taking photos in difficult places.</string> + <string name="pref_camera2_scene_mode_pro_instructional_content" translatable="true">With Pro Mode, you can manually control settings for ISO,Exposure, White Balance, and Focus. You will have easy access to all of these advanced settings</string> + + <string name="pref_camera2_not_show_again">Do not show again</string> + <string name="pref_camera2_scene_mode_instructional_ok" translatable="true">OK</string> </resources> diff --git a/res/values/styles.xml b/res/values/styles.xml index 082c5ed8a..8432c11e9 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -316,4 +316,18 @@ <style name="PanoViewHorizontalBar"> <item name="android:background">@android:color/transparent</item> </style> + + <style name="OnViewfinderSceneLabel"> + <item name="android:gravity">center</item> + <item name="android:layout_width">wrap_content</item> + <item name="android:layout_height">wrap_content</item> + <item name="android:layout_marginLeft">10dp</item> + <item name="android:layout_marginRight">10dp</item> + <item name="android:layout_marginTop">5dp</item> + <item name="android:layout_marginBottom">5dp</item> + <item name="android:singleLine">true</item> + <item name="android:textColor">@android:color/white</item> + <item name="android:textSize">16dp</item> + <item name="android:background">@android:color/transparent</item> + </style> </resources> diff --git a/res/xml/capture_preferences.xml b/res/xml/capture_preferences.xml index f3603c443..8ad300fe7 100644 --- a/res/xml/capture_preferences.xml +++ b/res/xml/capture_preferences.xml @@ -124,6 +124,14 @@ camera:title="@string/pref_camera_scenemode_title"/> <IconListPreference + camera:defaultValue="@string/pref_camera2_scenemode_default" + camera:entries="@array/pref_camera2_scenemode_instructional_entries" + camera:entryValues="@array/pref_camera2_scenemode_entryvalues" + camera:key="pref_camera2_scenemode_instructional" + camera:thumbnails="@array/pref_camera2_scenemode_black_thumbnails" + camera:title="@string/pref_camera_scenemode_title"/> + + <IconListPreference camera:defaultValue="@string/setting_off_value" camera:entries="@array/pref_camera2_redeyereduction_entries" camera:entryValues="@array/pref_camera2_redeyereduction_entryvalues" diff --git a/res/xml/setting_menu_preferences.xml b/res/xml/setting_menu_preferences.xml index 87660713a..80097f497 100644 --- a/res/xml/setting_menu_preferences.xml +++ b/res/xml/setting_menu_preferences.xml @@ -31,7 +31,7 @@ <PreferenceCategory android:key="general" android:layout="@layout/preferences_category" - android:title="GENERAL"> + android:title="@string/perf_camera2_preferences_category_general"> <SwitchPreference android:defaultValue="false" android:icon="@drawable/gps_location" @@ -60,7 +60,7 @@ <PreferenceCategory android:key="photo" android:layout="@layout/preferences_category" - android:title="STILL CAMERA"> + android:title="@string/perf_camera2_preferences_category_photo"> <ListPreference android:defaultValue="@string/pref_camera2_timer_value_off" android:entries="@array/pref_camera2_timer_entries" @@ -169,7 +169,7 @@ <PreferenceCategory android:key="video" android:layout="@layout/preferences_category" - android:title="VIDEO CAMERA"> + android:title="@string/perf_camera2_preferences_category_video"> <ListPreference android:entries="@array/pref_camera2_video_quality_entries" android:entryValues="@array/pref_camera2_video_quality_entryvalues" @@ -196,11 +196,14 @@ android:layout="@layout/preference" android:title="@string/pref_camera_dis_title" /> - <SwitchPreference - android:defaultValue="false" + <ListPreference + android:defaultValue="@string/pref_camera_noise_reduction_default" + android:entries="@array/pref_camera2_noise_reduction_entries" + android:entryValues="@array/pref_camera2_noise_reduction_entryvalues" android:icon="@drawable/noise_reduction" android:key="pref_camera2_noise_reduction_key" android:layout="@layout/preference" + android:summary="%s" android:title="@string/pref_camera_noise_reduction_title" /> <ListPreference |
