SnapdragonCamera: Add ProMode

Add ProMode. User can change iso, white balance, exposure,
and focus mode using this new scene mode

Change-Id: I58885d3a05d6d9e8264e58cb8c4de2e1f13646b0
CRs-Fixed: 1089100

1 files changed, 30 insertions, 9 deletions

diff --git a/src/com/android/camera/SettingsManager.java b/src/com/android/camera/SettingsManager.java
index 0cacaa594..e0f13c9ea 100644
--- a/src/com/android/camera/SettingsManager.java
+++ b/src/com/android/camera/SettingsManager.java
@@ -85,15 +85,17 @@ public class SettingsManager implements ListMenu.SettingsListener {
     public static final int SCENE_MODE_NIGHT_INT = 5;
 
     // Custom-Scenemodes start from 100
-    public static final int SCENE_MODE_DUAL_INT = 100;
-    public static final int SCENE_MODE_OPTIZOOM_INT = 101;
-    public static final int SCENE_MODE_UBIFOCUS_INT = 102;
-    public static final int SCENE_MODE_BESTPICTURE_INT = 103;
-    public static final int SCENE_MODE_PANORAMA_INT = 104;
-    public static final int SCENE_MODE_CHROMAFLASH_INT = 105;
-    public static final int SCENE_MODE_BLURBUSTER_INT = 106;
-    public static final int SCENE_MODE_SHARPSHOOTER_INT = 107;
-    public static final int SCENE_MODE_TRACKINGFOCUS_INT = 108;
+    public static final int SCENE_MODE_CUSTOM_START = 100;
+    public static final int SCENE_MODE_DUAL_INT = SCENE_MODE_CUSTOM_START;
+    public static final int SCENE_MODE_OPTIZOOM_INT = SCENE_MODE_CUSTOM_START + 1;
+    public static final int SCENE_MODE_UBIFOCUS_INT = SCENE_MODE_CUSTOM_START + 2;
+    public static final int SCENE_MODE_BESTPICTURE_INT = SCENE_MODE_CUSTOM_START + 3;
+    public static final int SCENE_MODE_PANORAMA_INT = SCENE_MODE_CUSTOM_START + 4;
+    public static final int SCENE_MODE_CHROMAFLASH_INT = SCENE_MODE_CUSTOM_START + 5;
+    public static final int SCENE_MODE_BLURBUSTER_INT = SCENE_MODE_CUSTOM_START + 6;
+    public static final int SCENE_MODE_SHARPSHOOTER_INT = SCENE_MODE_CUSTOM_START + 7;
+    public static final int SCENE_MODE_TRACKINGFOCUS_INT = SCENE_MODE_CUSTOM_START + 8;
+    public static final int SCENE_MODE_PROMODE_INT = SCENE_MODE_CUSTOM_START + 9;
     public static final String SCENE_MODE_DUAL_STRING = "100";
     public static final String KEY_CAMERA_SAVEPATH = "pref_camera2_savepath_key";
     public static final String KEY_RECORD_LOCATION = "pref_camera2_recordlocation_key";
@@ -133,6 +135,7 @@ public class SettingsManager implements ListMenu.SettingsListener {
     public static final String KEY_SHUTTER_SOUND = "pref_camera2_shutter_sound_key";
     public static final String KEY_DEVELOPER_MENU = "pref_camera2_developer_menu_key";
     public static final String KEY_RESTORE_DEFAULT = "pref_camera2_restore_default_key";
+    public static final String KEY_FOCUS_DISTANCE = "pref_camera2_focus_distance_key";
     private static final String TAG = "SnapCam_SettingsManager";
 
     private static SettingsManager sInstance;
@@ -424,6 +427,10 @@ public class SettingsManager implements ListMenu.SettingsListener {
         }
     }
 
+    public int getCurrentCameraId() {
+        return mCameraId;
+    }
+
     public String getValue(String key) {
         Values values = mValuesMap.get(key);
         if (values == null) return null;
@@ -466,6 +473,14 @@ public class SettingsManager implements ListMenu.SettingsListener {
         }
     }
 
+    public void setFocusDistance(float value) {
+        List<SettingState> list = new ArrayList<>();
+        Values values = new Values("" + value, null);
+        SettingState ss = new SettingState(KEY_FOCUS_DISTANCE, values);
+        list.add(ss);
+        notifyListeners(list);
+    }
+
     private void updateMapAndNotify(ListPreference pref) {
         String key = pref.getKey();
         List changed = checkDependencyAndUpdate(key);
@@ -995,6 +1010,11 @@ public class SettingsManager implements ListMenu.SettingsListener {
         return modes;
     }
 
+    public float getMinimumFocusDistance(int cameraId) {
+        return mCharacteristics.get(cameraId)
+                .get(CameraCharacteristics.LENS_INFO_MINIMUM_FOCUS_DISTANCE);
+    }
+
     private List<String> getSupportedWhiteBalanceModes(int cameraId) {
         int[] whiteBalanceModes = mCharacteristics.get(cameraId).get(CameraCharacteristics
                 .CONTROL_AWB_AVAILABLE_MODES);
@@ -1019,6 +1039,7 @@ public class SettingsManager implements ListMenu.SettingsListener {
         if (BlurbusterFilter.isSupportedStatic()) modes.add(SCENE_MODE_BLURBUSTER_INT + "");
         if (SharpshooterFilter.isSupportedStatic()) modes.add(SCENE_MODE_SHARPSHOOTER_INT + "");
         if (TrackingFocusFrameListener.isSupportedStatic()) modes.add(SCENE_MODE_TRACKINGFOCUS_INT + "");
+        modes.add("" + SCENE_MODE_PROMODE_INT);
         for (int mode : sceneModes) {
             modes.add("" + mode);
         }