Camera2: Remove CAF video duration code

Change-Id: I583e212f3c43a5ddf80fdb16557b3ddd9e3161c2

5 files changed, 1 insertions, 68 deletions

diff --git a/res/values/qcomarrays.xml b/res/values/qcomarrays.xml
index 9efb08d99..9a70a06b7 100644
--- a/res/values/qcomarrays.xml
+++ b/res/values/qcomarrays.xml
@@ -521,20 +521,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>
-    </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>
-    </string-array>
-
     <!-- Camera Preferences Skin Tone Enhancement dialog box entries -->
     <string-array name="pref_camera_skinToneEnhancement_entries" translatable="false">
         <item>@string/setting_off</item>
diff --git a/res/values/qcomstrings.xml b/res/values/qcomstrings.xml
index d3ab22bfb..fb782b66e 100644
--- a/res/values/qcomstrings.xml
+++ b/res/values/qcomstrings.xml
@@ -69,15 +69,6 @@
     <string name="pref_camera_audioencoder_entry_0" translatable="false">AMR-NB</string>
     <string name="pref_camera_audioencoder_entry_1" translatable="false">AAC</string>
 
-    <!-- Settings screen, Video duration title -->
-    <string name="pref_camera_video_duration_title">Video duration</string>
-    <string name="pref_camera_video_duration_default" translatable="false">10</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>
-
     <!-- Settings screen, Select Skin Tone Enhancement title -->
     <string name="pref_camera_skinToneEnhancement_title">Skin tone enhancement</string>
     <string name="pref_camera_skinToneEnhancement_default" translatable="false">disable</string>
diff --git a/res/xml/video_preferences.xml b/res/xml/video_preferences.xml
index 19e48372b..9270187d9 100644
--- a/res/xml/video_preferences.xml
+++ b/res/xml/video_preferences.xml
@@ -36,12 +36,6 @@
             camera:entries="@array/pref_camera_audioencoder_entries"
             camera:entryValues="@array/pref_camera_audioencoder_entryvalues" />
     <ListPreference
-            camera:key="pref_camera_video_duration_key"
-            camera:defaultValue="@string/pref_camera_video_duration_default"
-            camera:title="@string/pref_camera_video_duration_title"
-            camera:entries="@array/pref_camera_video_duration_entries"
-            camera:entryValues="@array/pref_camera_video_duration_entryvalues" />
-    <ListPreference
             camera:key="pref_camera_storage_key"
             camera:title="@string/pref_camera_storage_title" />
     <IconListPreference
diff --git a/src/com/android/camera/CameraSettings.java b/src/com/android/camera/CameraSettings.java
index 138f0d83b..361fdb006 100644
--- a/src/com/android/camera/CameraSettings.java
+++ b/src/com/android/camera/CameraSettings.java
@@ -86,7 +86,6 @@ public class CameraSettings {
     public static final String KEY_MAX_BRIGHTNESS = "pref_max_brightness";
     public static final String KEY_VIDEO_ENCODER = "pref_camera_videoencoder_key";
     public static final String KEY_AUDIO_ENCODER = "pref_camera_audioencoder_key";
-    public static final String KEY_VIDEO_DURATION = "pref_camera_video_duration_key";
     public static final String KEY_POWER_MODE = "pref_camera_powermode_key";
     public static final String KEY_PICTURE_FORMAT = "pref_camera_pictureformat_key";
     public static final String KEY_COLOR_EFFECT = "pref_camera_coloreffect_key";
@@ -134,9 +133,6 @@ public class CameraSettings {
     public static final String FLIP_MODE_VH = "flip-vh";
 
     private static final String KEY_QC_PICTURE_FORMAT = "picture-format-values";
-    private static final String VIDEO_QUALITY_HIGH = "high";
-    private static final String VIDEO_QUALITY_MMS = "mms";
-    private static final String VIDEO_QUALITY_YOUTUBE = "youtube";
 
     public static final String KEY_BURST_MODE = "pref_camera_burst_key";
     public static final String KEY_BEAUTY_MODE = "pref_camera_beauty_mode";
@@ -150,11 +146,6 @@ public class CameraSettings {
     public static final int CURRENT_VERSION = 7;
     public static final int CURRENT_LOCAL_VERSION = 3;
 
-    public static final int DEFAULT_VIDEO_DURATION = 0; // no limit
-    private static final int MMS_VIDEO_DURATION = (CamcorderProfile.get(CamcorderProfile.QUALITY_LOW) != null) ?
-          CamcorderProfile.get(CamcorderProfile.QUALITY_LOW).duration :30;
-    private static final int YOUTUBE_VIDEO_DURATION = 15 * 60; // 15 mins
-
     private static final String TAG = "CameraSettings";
 
     private final Context mContext;
@@ -735,7 +726,6 @@ public class CameraSettings {
             // Just use video quality to replace it and
             // ignore the current settings.
             editor.remove("pref_camera_videoquality_key");
-            editor.remove("pref_camera_video_duration_key");
             version = 4;
         }
         if (version == 4) {
@@ -937,15 +927,6 @@ public class CameraSettings {
               supported.add(Integer.toString(CamcorderProfile.QUALITY_QCIF));
            }
         }
-
-    }
-    public static int getVideoDurationInMillis(String quality) {
-        if (VIDEO_QUALITY_MMS.equals(quality)) {
-            return MMS_VIDEO_DURATION * 1000;
-        } else if (VIDEO_QUALITY_YOUTUBE.equals(quality)) {
-            return YOUTUBE_VIDEO_DURATION * 1000;
-        }
-        return DEFAULT_VIDEO_DURATION * 1000;
     }
 
     /**
diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java
index 882ffeba3..7398cd540 100644
--- a/src/com/android/camera/VideoModule.java
+++ b/src/com/android/camera/VideoModule.java
@@ -763,32 +763,13 @@ public class VideoModule implements CameraModule,
 
         Log.v(TAG, "Audio Encoder selected = " +mAudioEncoder);
 
-        String minutesStr = mPreferences.getString(
-              CameraSettings.KEY_VIDEO_DURATION,
-              mActivity.getString(R.string.pref_camera_video_duration_default));
-        int minutes = -1;
-        try {
-            minutes = Integer.parseInt(minutesStr);
-        } catch(NumberFormatException npe) {
-            // use default value continue
-            minutes = Integer.parseInt(mActivity.getString(
-                         R.string.pref_camera_video_duration_default));
-        }
-        if (minutes == -1) {
-            // User wants lowest, set 30s */
-            mMaxVideoDurationInMs = 30000;
-        } else {
-            // 1 minute = 60000ms
-            mMaxVideoDurationInMs = 60000 * minutes;
-        }
-
         // Set wavelet denoise mode
         if (mParameters.getSupportedDenoiseModes() != null) {
             String denoise = mPreferences.getString(CameraSettings.KEY_DENOISE,
                     mActivity.getString(R.string.pref_camera_denoise_default));
             mParameters.setDenoise(denoise);
         }
-   }
+    }
 
     private final class AutoFocusCallback
             implements CameraAFCallback {