From cd1f25e6cb5146dd3a00cd334f6ab4349c84b333 Mon Sep 17 00:00:00 2001
From: Sai Kumar Sanagavarapu <ssanagav@codeaurora.org>
Date: Thu, 26 Feb 2015 12:01:07 +0530
Subject: SnapdragonCamera: Set highest supported video resolution by default.

Instead of defaulting to CIF, set the highest supported video
resolution as the default video profile.

Change-Id: I6cb1eab905d193cbc03f528d0fbc81f5af49ab89
---
 res/values/strings.xml                     |  2 --
 res/xml/video_preferences.xml              |  1 -
 src/com/android/camera/CameraSettings.java |  9 +++------
 src/com/android/camera/VideoModule.java    | 14 +++-----------
 4 files changed, 6 insertions(+), 20 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 33597b74b..538087348 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -238,8 +238,6 @@
 
     <!-- The Video quality settings in preference [CHAR LIMIT=21] -->
     <string name="pref_video_quality_title">Video quality</string>
-    <!-- The default quality value is (CIF) -->
-    <string name="pref_video_quality_default" translatable="false">352x288</string>
     <!-- Video quality setting entry.
     Videos will be recorded in 4k DCI quality. [CHAR LIMIT=24] -->
     <string name="pref_video_quality_entry_4kdci" translatable="false">
diff --git a/res/xml/video_preferences.xml b/res/xml/video_preferences.xml
index 12dfc700f..b82ca1ba3 100644
--- a/res/xml/video_preferences.xml
+++ b/res/xml/video_preferences.xml
@@ -19,7 +19,6 @@
         camera:title="@string/pref_camcorder_settings_category">
     <IconListPreference
             camera:key="pref_video_quality_key"
-            camera:defaultValue="@string/pref_video_quality_default"
             camera:title="@string/pref_video_quality_title"
             camera:entries="@array/pref_video_quality_entries"
             camera:singleIcon="@drawable/ic_settings_quality"
diff --git a/src/com/android/camera/CameraSettings.java b/src/com/android/camera/CameraSettings.java
index 63581b8ba..c057ee01f 100644
--- a/src/com/android/camera/CameraSettings.java
+++ b/src/com/android/camera/CameraSettings.java
@@ -289,15 +289,12 @@ public class CameraSettings {
         return group;
     }
 
-    public static String getSupportedHighestVideoQuality(int cameraId,
-            String defaultQuality,Parameters parameters) {
+    public static String getSupportedHighestVideoQuality(
+            int cameraId, Parameters parameters) {
         // When launching the camera app first time, we will set the video quality
         // to the first one (i.e. highest quality) in the supported list
         List<String> supported = getSupportedVideoQualities(cameraId,parameters);
-        if (supported == null) {
-            Log.e(TAG, "No supported video quality is found");
-            return defaultQuality;
-        }
+        assert (supported != null) : "No supported video quality is found";
         return supported.get(0);
     }
 
diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java
index 7d7120953..26ddb8f04 100644
--- a/src/com/android/camera/VideoModule.java
+++ b/src/com/android/camera/VideoModule.java
@@ -779,17 +779,9 @@ public class VideoModule implements CameraModule,
                         null);
         if (videoQuality == null) {
             mParameters = mCameraDevice.getParameters();
-            String defaultQuality = mActivity.getResources().getString(
-                    R.string.pref_video_quality_default);
-            boolean hasProfile = CamcorderProfile.hasProfile(
-                     CameraSettings.VIDEO_QUALITY_TABLE.get(defaultQuality));
-            if (hasProfile == true){
-                videoQuality = defaultQuality;
-            } else {
-                // check for highest quality if default quality is not supported
-                videoQuality = CameraSettings.getSupportedHighestVideoQuality(mCameraId,
-                        defaultQuality, mParameters);
-            }
+            // check for highest quality supported
+            videoQuality = CameraSettings.getSupportedHighestVideoQuality(
+                    mCameraId, mParameters);
             mPreferences.edit().putString(CameraSettings.KEY_VIDEO_QUALITY, videoQuality);
         }
         int quality = CameraSettings.VIDEO_QUALITY_TABLE.get(videoQuality);
-- 
cgit v1.2.3