diff options
author | Michael Bestas <mikeioannina@gmail.com> | 2014-10-24 11:26:25 +0300 |
---|---|---|
committer | Chippa-a <vusal1372@gmail.com> | 2019-10-25 15:55:25 +0300 |
commit | 6ab4abaeba483e1badd41c92034f868578016fdc (patch) | |
tree | 2ccdcc5e3fa7788fd1e33dbdd66ea1b4ec75abec /res | |
parent | a54fd8a26cde86b0be36c423ec1d1d0ab2d4bd92 (diff) | |
download | android_packages_apps_Snap-6ab4abaeba483e1badd41c92034f868578016fdc.tar.gz android_packages_apps_Snap-6ab4abaeba483e1badd41c92034f868578016fdc.tar.bz2 android_packages_apps_Snap-6ab4abaeba483e1badd41c92034f868578016fdc.zip |
Camera2: Remove CAF video duration code
Change-Id: I583e212f3c43a5ddf80fdb16557b3ddd9e3161c2
Signed-off-by: Chippa-a <vusal1372@gmail.com>
Diffstat (limited to 'res')
-rw-r--r--[-rwxr-xr-x] | res/values-zh-rCN/strings.xml | 2 | ||||
-rwxr-xr-x | res/values/camera2arrays.xml | 19 | ||||
-rwxr-xr-x | res/values/qcomarrays.xml | 16 | ||||
-rwxr-xr-x | res/values/qcomstrings.xml | 13 | ||||
-rwxr-xr-x | res/xml/capture_preferences.xml | 8 | ||||
-rwxr-xr-x | res/xml/setting_menu_preferences.xml | 10 | ||||
-rwxr-xr-x | res/xml/video_preferences.xml | 7 |
7 files changed, 0 insertions, 75 deletions
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml index e7b67847a..e7872f5fe 100755..100644 --- a/res/values-zh-rCN/strings.xml +++ b/res/values-zh-rCN/strings.xml @@ -414,8 +414,6 @@ <string name="pref_camera_video_duration_entry_mms">"30 秒(MMS)"</string> <string name="pref_camera_video_duration_entry_10">"10 分钟"</string> <string name="pref_camera_video_duration_entry_30">"30 分钟"</string> - <string name="pref_camera_video_duration_entry_48">"48 分钟"</string> - <string name="pref_camera_video_duration_entry_144">"144 分钟"</string> <string name="pref_camera_video_duration_entry_nolimit">"无限制"</string> <!-- Settings screen, Select hfr title --> diff --git a/res/values/camera2arrays.xml b/res/values/camera2arrays.xml index 921303120..f28b2d682 100755 --- a/res/values/camera2arrays.xml +++ b/res/values/camera2arrays.xml @@ -746,25 +746,6 @@ <item>320x240</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_48</item> - <item>@string/pref_camera_video_duration_entry_144</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>48</item> - <item>144</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 53b2ba7d1..83d52b57c 100755 --- a/res/values/qcomarrays.xml +++ b/res/values/qcomarrays.xml @@ -574,22 +574,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 f097e4739..744281ea0 100755 --- a/res/values/qcomstrings.xml +++ b/res/values/qcomstrings.xml @@ -81,19 +81,6 @@ <!-- Settings screen, Audio encoder dialog radio button choices --> <string name="pref_camera_audioencoder_entry_0">AMRNB</string> <string name="pref_camera_audioencoder_entry_1">AAC</string> - <!-- 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_48">48 minutes</string> - <string name="pref_camera_video_duration_entry_144">144 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/capture_preferences.xml b/res/xml/capture_preferences.xml index 51002729e..782a8001d 100755 --- a/res/xml/capture_preferences.xml +++ b/res/xml/capture_preferences.xml @@ -220,14 +220,6 @@ camera:singleIcon="@drawable/ic_settings_quality" camera:title="@string/pref_video_quality_title"/> - <IconListPreference - camera:defaultValue="@string/pref_camera_video_duration_default" - camera:entries="@array/pref_camera2_video_duration_entries" - camera:entryValues="@array/pref_camera2_video_duration_entryvalues" - camera:key="pref_camera2_video_duration_key" - camera:singleIcon="@drawable/ic_settings_duration" - camera:title="@string/pref_camera_video_duration_title"/> - <ListPreference camera:defaultValue="@string/pref_camera_videoencoder_default" camera:entries="@array/pref_camera2_videoencoder_entries" diff --git a/res/xml/setting_menu_preferences.xml b/res/xml/setting_menu_preferences.xml index da0a21154..51b858947 100755 --- a/res/xml/setting_menu_preferences.xml +++ b/res/xml/setting_menu_preferences.xml @@ -189,16 +189,6 @@ android:summary="%s" android:title="@string/pref_video_quality_title" /> - <ListPreference - android:defaultValue="@string/pref_camera_video_duration_default" - android:entries="@array/pref_camera2_video_duration_entries" - android:entryValues="@array/pref_camera2_video_duration_entryvalues" - android:icon="@drawable/video_duration" - android:key="pref_camera2_video_duration_key" - android:layout="@layout/preference" - android:summary="%s" - android:title="@string/pref_camera_video_duration_title" /> - <SwitchPreference android:defaultValue="false" android:icon="@drawable/image_stabilization" diff --git a/res/xml/video_preferences.xml b/res/xml/video_preferences.xml index 66e2e0524..1d2917360 100755 --- 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" |