From fb4957c0017b1aa47fa643c1c6fa9179fe8ebd29 Mon Sep 17 00:00:00 2001
From: Michael Bestas <mikeioannina@gmail.com>
Date: Fri, 24 Oct 2014 11:26:25 +0300
Subject: Camera2: Remove CAF video duration code

Change-Id: I583e212f3c43a5ddf80fdb16557b3ddd9e3161c2
---
 res/values/qcomarrays.xml     | 16 ----------------
 res/values/qcomstrings.xml    |  9 ---------
 res/xml/video_preferences.xml |  7 -------
 3 files changed, 32 deletions(-)

(limited to 'res')

diff --git a/res/values/qcomarrays.xml b/res/values/qcomarrays.xml
index 3af2153e1..a746ba172 100644
--- a/res/values/qcomarrays.xml
+++ b/res/values/qcomarrays.xml
@@ -553,22 +553,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 367a226fa..c7fff0fbd 100644
--- a/res/values/qcomstrings.xml
+++ b/res/values/qcomstrings.xml
@@ -92,15 +92,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 31b2d4c31..259ad81e7 100644
--- a/res/xml/video_preferences.xml
+++ b/res/xml/video_preferences.xml
@@ -47,13 +47,6 @@
             camera:title="@string/pref_camera_video_tnr_title"
             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"
-- 
cgit v1.2.3