Camera2: Add See More feature in the menu

-  User can select See More feature in video mode.

Change-Id: I13636846cce67caeb6eb0b3e073399fdae2be471

3 files changed, 27 insertions, 0 deletions

diff --git a/src/com/android/camera/CameraSettings.java b/src/com/android/camera/CameraSettings.java
index e1e964bc0..2bce3dd22 100644
--- a/src/com/android/camera/CameraSettings.java
+++ b/src/com/android/camera/CameraSettings.java
@@ -105,6 +105,7 @@ public class CameraSettings {
 
     public static final String KEY_VIDEO_SNAPSHOT_SIZE = "pref_camera_videosnapsize_key";
     public static final String KEY_VIDEO_HIGH_FRAME_RATE = "pref_camera_hfr_key";
+    public static final String KEY_SEE_MORE = "pref_camera_see_more_key";
     public static final String KEY_VIDEO_HDR = "pref_camera_video_hdr_key";
     public static final String DEFAULT_VIDEO_QUALITY_VALUE = "custom";
     public static final String KEY_SKIN_TONE_ENHANCEMENT = "pref_camera_skinToneEnhancement_key";
@@ -123,6 +124,7 @@ public class CameraSettings {
     private static final String KEY_QC_SUPPORTED_TP_MODES = "true-portrait-values";
     private static final String KEY_QC_SUPPORTED_FACE_RECOGNITION_MODES = "face-recognition-values";
     private static final String KEY_QC_SUPPORTED_DIS_MODES = "dis-values";
+    private static final String KEY_QC_SUPPORTED_SEE_MORE_MODES = "see-more-values";
     private static final String KEY_QC_SUPPORTED_CDS_MODES = "cds-mode-values";
     private static final String KEY_QC_SUPPORTED_VIDEO_CDS_MODES = "video-cds-mode-values";
     private static final String KEY_QC_SUPPORTED_TNR_MODES = "tnr-mode-values";
@@ -146,6 +148,7 @@ public class CameraSettings {
     public static final String KEY_SNAPCAM_HDR_MODE = "hdr-mode";
     public static final String KEY_SNAPCAM_HDR_NEED_1X = "hdr-need-1x";
     public static final String KEY_VIDEO_HSR = "video-hsr";
+    public static final String KEY_QC_SEE_MORE_MODE = "see-more";
 
     public static final String KEY_INTERNAL_PREVIEW_RESTART = "internal-restart";
     public static final String KEY_QC_ZSL_HDR_SUPPORTED = "zsl-hdr-supported";
@@ -283,6 +286,14 @@ public class CameraSettings {
         return split(str);
     }
 
+    public static List<String> getSupportedSeeMoreModes(Parameters params) {
+        String str = params.get(KEY_QC_SUPPORTED_SEE_MORE_MODES);
+        if (str == null) {
+            return null;
+        }
+        return split(str);
+    }
+
     public static List<String> getSupportedAEBracketingModes(Parameters params) {
         String str = params.get(KEY_QC_SUPPORTED_AE_BRACKETING_MODES);
         if (str == null) {
@@ -595,9 +606,15 @@ public class CameraSettings {
         ListPreference cameraHdrPlus = group.findPreference(KEY_CAMERA_HDR_PLUS);
         ListPreference videoHfrMode =
                 group.findPreference(KEY_VIDEO_HIGH_FRAME_RATE);
+        ListPreference seeMoreMode = group.findPreference(KEY_SEE_MORE);
 
         // Since the screen could be loaded from different resources, we need
         // to check if the preference is available here
+        if (seeMoreMode != null) {
+            filterUnsupportedOptions(group, seeMoreMode,
+                    getSupportedSeeMoreModes(mParameters));
+        }
+
         if ((videoHfrMode != null) &&
             (mParameters.getSupportedHfrSizes() == null)) {
                 filterUnsupportedOptions(group, videoHfrMode, null);
diff --git a/src/com/android/camera/VideoMenu.java b/src/com/android/camera/VideoMenu.java
index 33fc569bd..08cb3849c 100644
--- a/src/com/android/camera/VideoMenu.java
+++ b/src/com/android/camera/VideoMenu.java
@@ -85,6 +85,7 @@ public class VideoMenu extends PieController
                 CameraSettings.KEY_POWER_MODE,
                 CameraSettings.KEY_WHITE_BALANCE,
                 CameraSettings.KEY_VIDEO_HIGH_FRAME_RATE,
+                CameraSettings.KEY_SEE_MORE,
                 CameraSettings.KEY_VIDEOCAMERA_FLASH_MODE,
                 CameraSettings.KEY_VIDEO_ROTATION,
                 CameraSettings.KEY_VIDEO_CDS_MODE,
diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java
index 651a3e3a6..cff15b22c 100755
--- a/src/com/android/camera/VideoModule.java
+++ b/src/com/android/camera/VideoModule.java
@@ -2023,6 +2023,15 @@ public class VideoModule implements CameraModule,
         }
         Log.d(TAG, "antiBanding value = " + mParameters.getAntibanding());
 
+        String seeMoreMode = mPreferences.getString(
+                CameraSettings.KEY_SEE_MORE,
+                mActivity.getString(R.string.pref_camera_see_more_default));
+        Log.v(TAG, "See More value =" + seeMoreMode);
+        if (isSupported(seeMoreMode,
+                        CameraSettings.getSupportedSeeMoreModes(mParameters))) {
+            mParameters.set(CameraSettings.KEY_QC_SEE_MORE_MODE, seeMoreMode);
+        }
+
         mUnsupportedHFRVideoSize = false;
         mUnsupportedHFRVideoCodec = false;
         mUnsupportedHSRVideoSize = false;