diff options
Diffstat (limited to 'res/xml')
| -rwxr-xr-x[-rw-r--r--] | res/xml/camera_preferences.xml | 7 | ||||
| -rwxr-xr-x[-rw-r--r--] | res/xml/capture_preferences.xml | 8 | ||||
| -rw-r--r--[-rwxr-xr-x] | res/xml/multi_setting_menu_preferences.xml | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | res/xml/setting_menu_preferences.xml | 54 | ||||
| -rwxr-xr-x[-rw-r--r--] | res/xml/video_preferences.xml | 7 |
5 files changed, 54 insertions, 22 deletions
diff --git a/res/xml/camera_preferences.xml b/res/xml/camera_preferences.xml index 56bf033c3..55815ce84 100644..100755 --- a/res/xml/camera_preferences.xml +++ b/res/xml/camera_preferences.xml @@ -330,6 +330,13 @@ camera:entries="@array/pref_camera_zsl_entries" camera:entryValues="@array/pref_camera_zsl_entryvalues" /> <IconListPreference + camera:key="pref_camera_savepath_key" + camera:defaultValue="@string/pref_camera_savepath_default" + camera:title="@string/pref_camera_savepath_title" + camera:entries="@array/pref_camera_savepath_entries" + camera:singleIcon="@drawable/ic_settings_storage" + camera:entryValues="@array/pref_camera_savepath_entryvalues" /> + <IconListPreference camera:key="pref_camera_advanced_features_key" camera:defaultValue="@string/pref_camera_advanced_feature_default" camera:title="@string/pref_camera_advanced_features_title" diff --git a/res/xml/capture_preferences.xml b/res/xml/capture_preferences.xml index 95ba7f1ed..5cb7f0f83 100644..100755 --- a/res/xml/capture_preferences.xml +++ b/res/xml/capture_preferences.xml @@ -68,6 +68,14 @@ camera:singleIcon="@drawable/ic_settings_quality" camera:title="@string/pref_camera_jpegquality_title"/> + <IconListPreference + camera:defaultValue="@string/pref_camera_savepath_default" + camera:entries="@array/pref_camera2_savepath_entries" + camera:entryValues="@array/pref_camera2_savepath_entryvalues" + camera:key="pref_camera2_savepath_key" + camera:singleIcon="@drawable/ic_settings_storage" + camera:title="@string/pref_camera_savepath_title"/> + <ListPreference camera:defaultValue="@string/setting_off_value" camera:entries="@array/pref_camera2_mono_only_entries" diff --git a/res/xml/multi_setting_menu_preferences.xml b/res/xml/multi_setting_menu_preferences.xml index d0cc4f78d..d0cc4f78d 100755..100644 --- a/res/xml/multi_setting_menu_preferences.xml +++ b/res/xml/multi_setting_menu_preferences.xml diff --git a/res/xml/setting_menu_preferences.xml b/res/xml/setting_menu_preferences.xml index 69ea8395e..ebd7f6fad 100644..100755 --- a/res/xml/setting_menu_preferences.xml +++ b/res/xml/setting_menu_preferences.xml @@ -34,23 +34,33 @@ android:title="@string/perf_camera2_preferences_category_general"> <SwitchPreference android:defaultValue="false" - android:icon="@drawable/gps_location" + android:icon="@drawable/ic_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:icon="@drawable/ic_settings_facerec" 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/ic_settings_storage" + android:key="pref_camera2_savepath_key" + android:layout="@layout/preference" + android:summary="%s" + android:title="@string/pref_camera_savepath_title" /> + + <ListPreference android:defaultValue="@string/pref_camera2_picture_format_default" android:entries="@array/pref_camera2_picture_format_entries" android:entryValues="@array/pref_camera2_picture_format_entryvalues" - android:icon="@drawable/ic_settings_storage" + android:icon="@drawable/ic_settings_format" android:key="pref_camera2_picture_format_key" android:layout="@layout/preference" android:summary="%s" @@ -65,7 +75,7 @@ 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:icon="@drawable/ic_timer" android:key="pref_camera2_timer_key" android:layout="@layout/preference" android:summary="%s" @@ -73,7 +83,7 @@ <SwitchPreference android:defaultValue="false" - android:icon="@drawable/continuous_shot" + android:icon="@drawable/ic_settings_continuous" android:key="pref_camera2_longshot_key" android:layout="@layout/preference" android:title="@string/pref_camera_longshot_title" /> @@ -84,7 +94,7 @@ android:layout="@layout/preference" android:title="@string/pref_camera_selfiemirror_title" /> <ListPreference - android:icon="@drawable/picture_size" + android:icon="@drawable/ic_settings_size" android:key="pref_camera2_picturesize_key" android:layout="@layout/preference" android:summary="%s" @@ -94,7 +104,7 @@ 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:icon="@drawable/ic_settings_quality" android:key="pref_camera2_jpegquality_key" android:layout="@layout/preference" android:summary="%s" @@ -109,7 +119,7 @@ <ListPreference android:defaultValue="@string/pref_exposure_default" - android:icon="@drawable/exposure" + android:icon="@drawable/ic_settings_exposure" android:key="pref_camera2_exposure_key" android:layout="@layout/preference" android:summary="%s" @@ -119,7 +129,7 @@ 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:icon="@drawable/ic_settings_wb_api2" android:key="pref_camera2_whitebalance_key" android:layout="@layout/preference" android:summary="%s" @@ -127,21 +137,21 @@ <SwitchPreference android:defaultValue="false" - android:icon="@drawable/selfie_flash" + 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:icon="@drawable/ic_settings_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:icon="@drawable/shutter_sound" + android:icon="@drawable/ic_settings_sound" android:key="pref_camera2_touch_track_focus_key" android:layout="@layout/preference" android:title="@string/pref_camera2_touch_track_focus_title" /> @@ -178,7 +188,7 @@ <ListPreference android:entries="@array/pref_camera2_video_quality_entries" android:entryValues="@array/pref_camera2_video_quality_entryvalues" - android:icon="@drawable/video_quality" + android:icon="@drawable/ic_settings_quality" android:key="pref_camera2_video_quality_key" android:layout="@layout/preference" android:summary="%s" @@ -186,14 +196,14 @@ <SwitchPreference android:defaultValue="false" - android:icon="@drawable/image_stabilization" + android:icon="@drawable/ic_settings_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/shutter_sound" + android:icon="@drawable/ic_settings_sound" android:key="pref_camera2_touch_track_focus_key" android:layout="@layout/preference" android:title="@string/pref_camera2_touch_track_focus_title" /> @@ -212,7 +222,7 @@ 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:icon="@drawable/ic_settings_encoder_video" android:key="pref_camera2_videoencoder_key" android:layout="@layout/preference" android:summary="%s" @@ -222,7 +232,7 @@ android:defaultValue="@string/pref_camera2_videoencoderprofile_default" android:entries="@array/pref_camera2_videoencoderprofile_entry" android:entryValues="@array/pref_camera2_videoencoderprofile_entryvalues" - android:icon="@drawable/video_encoding" + android:icon="@drawable/ic_settings_encoder_video" android:key="pref_camera2_videoencoderprofile_key" android:layout="@layout/preference" android:summary="%s" @@ -232,7 +242,7 @@ 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:icon="@drawable/ic_settings_encoder_audio" android:key="pref_camera2_audioencoder_key" android:layout="@layout/preference" android:summary="%s" @@ -242,7 +252,7 @@ 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:icon="@drawable/ic_settings_rotation" android:key="pref_camera2_video_rotation_key" android:layout="@layout/preference" android:summary="%s" @@ -252,7 +262,7 @@ 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:icon="@drawable/ic_timer" android:key="pref_camera2_video_time_lapse_frame_interval_key" android:layout="@layout/preference" android:summary="%s" @@ -261,7 +271,7 @@ <ListPreference android:entries="@array/pref_camera_hfr_entries" android:entryValues="@array/pref_camera_hfr_entryvalues" - android:icon="@drawable/high_video_frame_rate" + android:icon="@drawable/ic_settings_hfr" android:key="pref_camera2_hfr_key" android:layout="@layout/preference" android:summary="%s" @@ -274,7 +284,7 @@ android:textAllCaps="false"> <Preference android:defaultValue="false" - android:icon="@drawable/restore_defaults" + android:icon="@drawable/ic_settings_reset" android:key="pref_camera2_restore_default_key" android:layout="@layout/preference" android:title="@string/pref_camera2_restore_default" /> diff --git a/res/xml/video_preferences.xml b/res/xml/video_preferences.xml index 70f7f565c..6345f61bf 100644..100755 --- a/res/xml/video_preferences.xml +++ b/res/xml/video_preferences.xml @@ -179,6 +179,13 @@ camera:title="@string/pref_camera_picturesize_title" camera:singleIcon="@drawable/ic_settings_size" /> <IconListPreference + camera:key="pref_camera_savepath_key" + camera:defaultValue="@string/pref_camera_savepath_default" + camera:title="@string/pref_camera_savepath_title" + camera:entries="@array/pref_camera_savepath_entries" + camera:singleIcon="@drawable/ic_settings_storage" + camera:entryValues="@array/pref_camera_savepath_entryvalues" /> + <IconListPreference camera:key="pref_camera_video_rotation_key" camera:defaultValue="@string/pref_camera_video_rotation_default" camera:title="@string/pref_camera_video_rotation_title" |