From 48b9c1b568f88ad713b5d6ce76b6241f8b33a5de Mon Sep 17 00:00:00 2001
From: Santhosh Kumar Thimmanna Bhattar <sthim@codeaurora.org>
Date: Wed, 15 Oct 2014 15:07:08 +0530
Subject: Camera2: Add See More feature in the menu

-  User can select See More feature in video mode.

Change-Id: I13636846cce67caeb6eb0b3e073399fdae2be471
---
 res/values/qcomarrays.xml                  | 11 +++++++++++
 res/values/qcomstrings.xml                 | 14 ++++++++++++++
 res/xml/video_preferences.xml              |  6 ++++++
 src/com/android/camera/CameraSettings.java | 17 +++++++++++++++++
 src/com/android/camera/VideoMenu.java      |  1 +
 src/com/android/camera/VideoModule.java    |  9 +++++++++
 6 files changed, 58 insertions(+)

diff --git a/res/values/qcomarrays.xml b/res/values/qcomarrays.xml
index 074e2f9d7..776fae6de 100644
--- a/res/values/qcomarrays.xml
+++ b/res/values/qcomarrays.xml
@@ -420,6 +420,17 @@
           <item>@string/pref_camera_hfr_value_hsr_120</item>
      </string-array>
 
+     <!-- Video Preferences See More dialog box entries -->
+     <string-array name="pref_camera_see_more_entries">
+          <item>@string/pref_camera_see_more_entry_off</item>
+          <item>@string/pref_camera_see_more_entry_on</item>
+     </string-array>
+     <!-- Do not localize entryvalues -->
+     <string-array name="pref_camera_see_more_entryvalues">
+          <item>@string/pref_camera_see_more_value_off</item>
+          <item>@string/pref_camera_see_more_value_on</item>
+     </string-array>
+
      <!-- Do not localize entryvalues -->
      <string-array name="pref_camera_histogram_entryvalues">
           <item>@string/pref_camera_histogram_value_disable</item>
diff --git a/res/values/qcomstrings.xml b/res/values/qcomstrings.xml
index 29c33bf8c..95a151e3d 100644
--- a/res/values/qcomstrings.xml
+++ b/res/values/qcomstrings.xml
@@ -340,6 +340,20 @@
      <string name="pref_camera_hfr_value_hsr_90">hsr90</string>
      <string name="pref_camera_hfr_value_hsr_120">hsr120</string>
 
+     <!-- Default see more setting. Do not translate. -->
+     <string name="pref_camera_see_more_default">off</string>
+
+     <!-- Settings screen, Select See More title -->
+     <string name="pref_camera_see_more_title">See More</string>
+
+     <!-- Settings screen, see more radio button choices -->
+     <string name="pref_camera_see_more_entry_off">Off</string>
+     <string name="pref_camera_see_more_entry_on">On</string>
+
+     <!-- see more entry values. Do not translate. -->
+     <string name="pref_camera_see_more_value_off">off</string>
+     <string name="pref_camera_see_more_value_on">on</string>
+
         <!-- Denoise Settings screen, setting title text -->
     <string name="pref_camera_denoise_title">Wavelet Denoise Mode</string>
     <string name="pref_camera_denoise_default" translatable="false">denoise-on</string>
diff --git a/res/xml/video_preferences.xml b/res/xml/video_preferences.xml
index c9b84d2d2..362607cb3 100644
--- a/res/xml/video_preferences.xml
+++ b/res/xml/video_preferences.xml
@@ -126,6 +126,12 @@
             camera:title="@string/pref_camera_hfr_title"
             camera:entries="@array/pref_camera_hfr_entries"
             camera:entryValues="@array/pref_camera_hfr_entryvalues"/>
+    <ListPreference
+            camera:key="pref_camera_see_more_key"
+            camera:defaultValue="@string/pref_camera_see_more_default"
+            camera:title="@string/pref_camera_see_more_title"
+            camera:entries="@array/pref_camera_see_more_entries"
+            camera:entryValues="@array/pref_camera_see_more_entryvalues"/>
     <ListPreference
             camera:key="pref_camera_video_hdr_key"
             camera:defaultValue="@string/pref_camera_video_hdr_default"
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;
-- 
cgit v1.2.3