diff options
| author | Michael Bestas <mikeioannina@gmail.com> | 2014-10-24 11:26:25 +0300 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2016-11-02 12:22:26 -0700 |
| commit | 22ca2c39e37e0efd2a20417e25c3e0495ac5432e (patch) | |
| tree | b3095e468450f26b70c665bc75f48ab753dc34b7 /res | |
| parent | 482ad154c89278b963e5eb6c537347129ef6af8b (diff) | |
| download | android_packages_apps_Snap-22ca2c39e37e0efd2a20417e25c3e0495ac5432e.tar.gz android_packages_apps_Snap-22ca2c39e37e0efd2a20417e25c3e0495ac5432e.tar.bz2 android_packages_apps_Snap-22ca2c39e37e0efd2a20417e25c3e0495ac5432e.zip | |
Camera2: Remove CAF video duration code
Change-Id: I583e212f3c43a5ddf80fdb16557b3ddd9e3161c2
Diffstat (limited to 'res')
| -rw-r--r-- | res/values/camera2arrays.xml | 15 | ||||
| -rw-r--r-- | res/values/qcomarrays.xml | 16 | ||||
| -rw-r--r-- | res/values/qcomstrings.xml | 9 | ||||
| -rw-r--r-- | res/xml/video_preferences.xml | 7 |
4 files changed, 0 insertions, 47 deletions
diff --git a/res/values/camera2arrays.xml b/res/values/camera2arrays.xml index 1f590fc32..063ea292d 100644 --- a/res/values/camera2arrays.xml +++ b/res/values/camera2arrays.xml @@ -623,21 +623,6 @@ <item>176x144</item> </string-array> - <string-array name="pref_camera2_video_duration_entries" translatable="false"> - <item>@string/pref_camera_video_duration_entry_mms</item> - <item>@string/pref_camera_video_duration_entry_10</item> - <item>@string/pref_camera_video_duration_entry_30</item> - <item>@string/pref_camera_video_duration_entry_nolimit</item> - </string-array> - - <!-- The numbers are in minutes, except -1 means the duration suitable for mms. --> - <string-array name="pref_camera2_video_duration_entryvalues" translatable="false"> - <item>-1</item> - <item>10</item> - <item>30</item> - <item>0</item> - </string-array> - <string-array name="pref_camera2_videoencoder_entries" translatable="false"> <item>@string/pref_camera_videoencoder_entry_0</item> <item>@string/pref_camera_videoencoder_entry_1</item> diff --git a/res/values/qcomarrays.xml b/res/values/qcomarrays.xml index 57005ba08..1f8ef09d0 100644 --- a/res/values/qcomarrays.xml +++ b/res/values/qcomarrays.xml @@ -563,22 +563,6 @@ <item>aac</item> </string-array> - <!-- Camera Preferences Video Duration dialog box entries --> - <string-array name="pref_camera_video_duration_entries" translatable="false"> - <item>@string/pref_camera_video_duration_entry_mms</item> - <item>@string/pref_camera_video_duration_entry_10</item> - <item>@string/pref_camera_video_duration_entry_30</item> - <item>@string/pref_camera_video_duration_entry_nolimit</item> - </string-array> - - <!-- The numbers are in minutes, except -1 means the duration suitable for mms. --> - <string-array name="pref_camera_video_duration_entryvalues" translatable="false"> - <item>-1</item> - <item>10</item> - <item>30</item> - <item>0</item> - </string-array> - <!-- Camera Preferences Skin Tone Enhancement dialog box entries --> <string-array name="pref_camera_skinToneEnhancement_entries"> <item>@string/pref_camera_skinToneEnhancement_entry_enable</item> diff --git a/res/values/qcomstrings.xml b/res/values/qcomstrings.xml index 6a58be524..00048b0e9 100644 --- a/res/values/qcomstrings.xml +++ b/res/values/qcomstrings.xml @@ -84,15 +84,6 @@ <!-- Default video duration setting. A numerical value.--> <string name="pref_camera_video_duration_default" translatable="false">10</string> - <!-- Settings screen, Video duration title --> - <string name="pref_camera_video_duration_title">Video duration</string> - - <!-- Settings screen, Video duration dialog radio button choices --> - <string name="pref_camera_video_duration_entry_mms">30 seconds(MMS)</string> - <string name="pref_camera_video_duration_entry_10">10 minutes</string> - <string name="pref_camera_video_duration_entry_30">30 minutes</string> - <string name="pref_camera_video_duration_entry_nolimit">no limit</string> - <!-- Default Skin Tone Enhancement setting. Do not translate. --> <string name="pref_camera_skinToneEnhancement_default">disable</string> diff --git a/res/xml/video_preferences.xml b/res/xml/video_preferences.xml index 2d9e2fbc8..0c239d14c 100644 --- a/res/xml/video_preferences.xml +++ b/res/xml/video_preferences.xml @@ -48,13 +48,6 @@ camera:entries="@array/pref_camera_video_tnr_entries" camera:entryValues="@array/pref_camera_video_tnr_entryvalues" /> <IconListPreference - camera:key="pref_camera_video_duration_key" - camera:defaultValue="@string/pref_camera_video_duration_default" - camera:title="@string/pref_camera_video_duration_title" - camera:singleIcon="@drawable/ic_settings_duration" - camera:entries="@array/pref_camera_video_duration_entries" - camera:entryValues="@array/pref_camera_video_duration_entryvalues" /> - <IconListPreference camera:key="pref_video_time_lapse_frame_interval_key" camera:defaultValue="@string/pref_video_time_lapse_frame_interval_default" camera:title="@string/pref_video_time_lapse_frame_interval_title" |