summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorByunghun Jeon <bjeon@codeaurora.org>2016-09-20 15:30:11 -0700
committerJay Wang <jaywang@codeaurora.org>2016-09-27 15:52:57 -0700
commit5c764e802baa74a1bcb746767034513b4ee79f56 (patch)
treeed3c4840f87fd383ecdf5eae1330fafec479b2cf /res
parent9418554c4fdd299fe8021ef1d3f077965345b075 (diff)
downloadandroid_packages_apps_Snap-5c764e802baa74a1bcb746767034513b4ee79f56.tar.gz
android_packages_apps_Snap-5c764e802baa74a1bcb746767034513b4ee79f56.tar.bz2
android_packages_apps_Snap-5c764e802baa74a1bcb746767034513b4ee79f56.zip
SnapdragonCamera: Change video snapshot picture size logic
Remove auto video snapshot size menu and use picture size setting instead. In case of 4k, use one that is smaller than 4k. Change-Id: Ic8ab193055afa0f571c73a074d346c2a9f8dbacd CRs-Fixed: 1066519
Diffstat (limited to 'res')
-rw-r--r--res/xml/capture_preferences.xml7
-rw-r--r--res/xml/setting_menu_preferences.xml10
2 files changed, 0 insertions, 17 deletions
diff --git a/res/xml/capture_preferences.xml b/res/xml/capture_preferences.xml
index 5ddb60c89..64633c362 100644
--- a/res/xml/capture_preferences.xml
+++ b/res/xml/capture_preferences.xml
@@ -257,13 +257,6 @@
camera:title="@string/pref_camera_facedetection_title"/>
<ListPreference
- 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"
- camera:title="@string/pref_camera2_videosnap_title" />
-
- <ListPreference
camera:defaultValue="off"
camera:key="pref_camera2_trackingfocus_key"
camera:entries="@array/pref_camera2_trackingfocus_entries"
diff --git a/res/xml/setting_menu_preferences.xml b/res/xml/setting_menu_preferences.xml
index 2b4d2bfa4..a0c1ac7dc 100644
--- a/res/xml/setting_menu_preferences.xml
+++ b/res/xml/setting_menu_preferences.xml
@@ -239,16 +239,6 @@
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"