diff options
Diffstat (limited to 'res')
34 files changed, 242 insertions, 26 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-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/one_ui_layout.xml b/res/layout/one_ui_layout.xml index 2a87b6cd2..d87040cde 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" @@ -91,42 +96,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 +172,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/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/values/camera2arrays.xml b/res/values/camera2arrays.xml index 80c695d58..31d6b5a62 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,6 +210,7 @@ <item>@drawable/sharp_photo</item> <item>@drawable/tracking_focus</item> <item>@drawable/scene_panorama</item> + <item>@drawable/promode</item> </array> <string-array name="pref_camera2_whitebalance_entryvalues" translatable="false"> diff --git a/res/values/qcomstrings.xml b/res/values/qcomstrings.xml index 34c9b32cf..d53b2c27a 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,11 @@ <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> </resources> diff --git a/res/xml/setting_menu_preferences.xml b/res/xml/setting_menu_preferences.xml index 92b5db8c8..5cf6c0dd1 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" |
