diff options
| author | Sean Owen <srowen@gmail.com> | 2014-02-04 01:27:00 +0400 |
|---|---|---|
| committer | Sean Owen <srowen@gmail.com> | 2014-02-04 01:27:00 +0400 |
| commit | 4411eb5517106cdf7db809087be57f83f5cd1407 (patch) | |
| tree | d32bc94556c9e302cd513008267126bf52fa4bac /android/src/com/google | |
| parent | ac9b79953f0a2cba9fa3173364bcd100666a2d7b (diff) | |
| download | zxing-BS-4.6.1.tar.xz | |
Drastic measures: make *all* optional camera params disabled by default to appease some bad devices. And even make the default disabled in the code, not just XML.BS-4.6.1
Diffstat (limited to 'android/src/com/google')
| -rw-r--r-- | android/src/com/google/zxing/client/android/camera/CameraConfigurationManager.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/android/src/com/google/zxing/client/android/camera/CameraConfigurationManager.java b/android/src/com/google/zxing/client/android/camera/CameraConfigurationManager.java index 5c47a9c35..2e2995361 100644 --- a/android/src/com/google/zxing/client/android/camera/CameraConfigurationManager.java +++ b/android/src/com/google/zxing/client/android/camera/CameraConfigurationManager.java @@ -98,7 +98,7 @@ final class CameraConfigurationManager { String focusMode = null; if (prefs.getBoolean(PreferencesActivity.KEY_AUTO_FOCUS, true)) { - if (safeMode || prefs.getBoolean(PreferencesActivity.KEY_DISABLE_CONTINUOUS_FOCUS, false)) { + if (safeMode || prefs.getBoolean(PreferencesActivity.KEY_DISABLE_CONTINUOUS_FOCUS, true)) { focusMode = findSettableValue(parameters.getSupportedFocusModes(), Camera.Parameters.FOCUS_MODE_AUTO); } else { @@ -127,7 +127,7 @@ final class CameraConfigurationManager { } } - if (!prefs.getBoolean(PreferencesActivity.KEY_DISABLE_BARCODE_SCENE_MODE, false)) { + if (!prefs.getBoolean(PreferencesActivity.KEY_DISABLE_BARCODE_SCENE_MODE, true)) { String sceneMode = findSettableValue(parameters.getSupportedSceneModes(), Camera.Parameters.SCENE_MODE_BARCODE); if (sceneMode != null) { @@ -135,7 +135,7 @@ final class CameraConfigurationManager { } } - if (!prefs.getBoolean(PreferencesActivity.KEY_DISABLE_METERING, false)) { + if (!prefs.getBoolean(PreferencesActivity.KEY_DISABLE_METERING, true)) { if (parameters.isVideoStabilizationSupported()) { Log.i(TAG, "Enabling video stabilization..."); parameters.setVideoStabilization(true); @@ -209,7 +209,7 @@ final class CameraConfigurationManager { } SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context); - if (!prefs.getBoolean(PreferencesActivity.KEY_DISABLE_EXPOSURE, false)) { + if (!prefs.getBoolean(PreferencesActivity.KEY_DISABLE_EXPOSURE, true)) { if (!safeMode) { int minExposure = parameters.getMinExposureCompensation(); int maxExposure = parameters.getMaxExposureCompensation(); |