diff options
-rwxr-xr-x | res/values/camera2arrays.xml | 11 | ||||
-rwxr-xr-x | res/values/qcomstrings.xml | 4 | ||||
-rwxr-xr-x | res/xml/capture_preferences.xml | 7 | ||||
-rwxr-xr-x | res/xml/setting_menu_preferences.xml | 9 | ||||
-rw-r--r-- | src/com/android/camera/CaptureModule.java | 1 | ||||
-rwxr-xr-x | src/com/android/camera/SettingsManager.java | 1 | ||||
-rw-r--r-- | src/com/android/camera/imageprocessor/PostProcessor.java | 1 |
7 files changed, 34 insertions, 0 deletions
diff --git a/res/values/camera2arrays.xml b/res/values/camera2arrays.xml index 8242b9c2e..2740bec9e 100755 --- a/res/values/camera2arrays.xml +++ b/res/values/camera2arrays.xml @@ -1050,4 +1050,15 @@ for time lapse recording --> <item>@string/pref_camera2_bsgc_entry_disable</item> <item>@string/pref_camera2_bsgc_entry_enable</item> </string-array> + + <string-array name="pref_camera2_zsl_entries" translatable="false"> + <item>@string/pref_camera2_saveraw_entry_disable</item> + <item>@string/pref_camera2_saveraw_entry_enable</item> + </string-array> + + <string-array name="pref_camera2_zsl_entryvalues" translatable="false"> + <item>disable</item> + <item>enable</item> + </string-array> + </resources> diff --git a/res/values/qcomstrings.xml b/res/values/qcomstrings.xml index db0edac57..6603701de 100755 --- a/res/values/qcomstrings.xml +++ b/res/values/qcomstrings.xml @@ -1168,5 +1168,9 @@ <string name="pref_camera2_bsgc_entry_disable" translatable="true">Disable</string> <string name="pref_camera2_bsgc_entry_value_enable" translatable="false">enable</string> <string name="pref_camera2_bsgc_entry_value_disable" translatable="false">disable</string> + <string name="pref_camera2_zsl_title" translatable="true">ZSL</string> + <string name="pref_camera2_zsl_default" translatable="false">enable</string> + <string name="pref_camera2_zsl_entry_enable" translatable="true">Enable</string> + <string name="pref_camera2_zsl_entry_disable" translatable="true">Disable</string> </resources> diff --git a/res/xml/capture_preferences.xml b/res/xml/capture_preferences.xml index e1146b55d..b1bb74e7b 100755 --- a/res/xml/capture_preferences.xml +++ b/res/xml/capture_preferences.xml @@ -351,6 +351,13 @@ camera:entryValues="@array/pref_camera2_saveraw_entryvalues" /> <ListPreference + camera:key="pref_camera2_zsl_key" + camera:defaultValue="@string/pref_camera2_zsl_default" + camera:title="@string/pref_camera2_zsl_title" + camera:entries="@array/pref_camera2_zsl_entries" + camera:entryValues="@array/pref_camera2_zsl_entryvalues" /> + + <ListPreference camera:key="pref_camera2_zoom_key" camera:defaultValue="@string/pref_camera_zoom_default" camera:title="@string/pref_camera_zoom_title" diff --git a/res/xml/setting_menu_preferences.xml b/res/xml/setting_menu_preferences.xml index a8361c201..48b6f99d3 100755 --- a/res/xml/setting_menu_preferences.xml +++ b/res/xml/setting_menu_preferences.xml @@ -340,6 +340,15 @@ android:title="@string/pref_camera2_saveraw_title" /> <ListPreference + android:defaultValue="@string/pref_camera2_zsl_default" + android:entries="@array/pref_camera2_zsl_entries" + android:entryValues="@array/pref_camera2_zsl_entryvalues" + android:key="pref_camera2_zsl_key" + android:layout="@layout/preference" + android:summary="%s" + android:title="@string/pref_camera2_zsl_title" /> + + <ListPreference android:key="pref_camera2_zoom_key" android:defaultValue="@string/pref_camera_zoom_default" android:title="@string/pref_camera_zoom_title" diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java index cf26a761b..564ff08d1 100644 --- a/src/com/android/camera/CaptureModule.java +++ b/src/com/android/camera/CaptureModule.java @@ -4404,6 +4404,7 @@ public class CaptureModule implements CameraModule, PhotoController, updateVideoFlash(); return; case SettingsManager.KEY_FLASH_MODE: + case SettingsManager.KEY_ZSL: case SettingsManager.KEY_AUTO_HDR: case SettingsManager.KEY_SAVERAW: case SettingsManager.KEY_HDR: diff --git a/src/com/android/camera/SettingsManager.java b/src/com/android/camera/SettingsManager.java index 1f05e3c6e..7119ed0cb 100755 --- a/src/com/android/camera/SettingsManager.java +++ b/src/com/android/camera/SettingsManager.java @@ -149,6 +149,7 @@ public class SettingsManager implements ListMenu.SettingsListener { public static final HashMap<String, Integer> KEY_ISO_INDEX = new HashMap<String, Integer>(); public static final String KEY_BSGC_DETECTION = "pref_camera2_bsgc_key"; + public static final String KEY_ZSL = "pref_camera2_zsl_key"; private static final String TAG = "SnapCam_SettingsManager"; diff --git a/src/com/android/camera/imageprocessor/PostProcessor.java b/src/com/android/camera/imageprocessor/PostProcessor.java index ec38bb705..de32cb53c 100644 --- a/src/com/android/camera/imageprocessor/PostProcessor.java +++ b/src/com/android/camera/imageprocessor/PostProcessor.java @@ -673,6 +673,7 @@ public class PostProcessor{ mSaveRaw = isSaveRaw; if(setFilter(postFilterId) || isFlashModeOn || isTrackingFocusOn || isMakeupOn || isSelfieMirrorOn || PersistUtil.getCameraZSLDisabled() + || "disable".equals(SettingsManager.getInstance().getValue(SettingsManager.KEY_ZSL)) || "enable".equals( SettingsManager.getInstance().getValue(SettingsManager.KEY_AUTO_HDR)) || SettingsManager.getInstance().isCamera2HDRSupport() |