CameraConfigurationManager.java (zxing-zxing-3.4.0) | : | CameraConfigurationManager.java (zxing-zxing-3.4.1) | ||
---|---|---|---|---|
skipping to change at line 164 | skipping to change at line 164 | |||
Log.w(TAG, "In camera config safe mode -- most settings will not be honore d"); | Log.w(TAG, "In camera config safe mode -- most settings will not be honore d"); | |||
} | } | |||
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(cont ext); | SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(cont ext); | |||
initializeTorch(parameters, prefs, safeMode); | initializeTorch(parameters, prefs, safeMode); | |||
CameraConfigurationUtils.setFocus( | CameraConfigurationUtils.setFocus( | |||
parameters, | parameters, | |||
prefs.getBoolean(PreferencesActivity.KEY_AUTO_FOCUS, true), | prefs.getBoolean(PreferencesActivity.KEY_AUTO_FOCUS, true), | |||
prefs.getBoolean(PreferencesActivity.KEY_DISABLE_CONTINUOUS_FOCUS, true) , | prefs.getBoolean(PreferencesActivity.KEY_DISABLE_CONTINUOUS_FOCUS, false ), | |||
safeMode); | safeMode); | |||
if (!safeMode) { | if (!safeMode) { | |||
if (prefs.getBoolean(PreferencesActivity.KEY_INVERT_SCAN, false)) { | if (prefs.getBoolean(PreferencesActivity.KEY_INVERT_SCAN, false)) { | |||
CameraConfigurationUtils.setInvertColor(parameters); | CameraConfigurationUtils.setInvertColor(parameters); | |||
} | } | |||
if (!prefs.getBoolean(PreferencesActivity.KEY_DISABLE_BARCODE_SCENE_MODE, true)) { | if (!prefs.getBoolean(PreferencesActivity.KEY_DISABLE_BARCODE_SCENE_MODE, true)) { | |||
CameraConfigurationUtils.setBarcodeSceneMode(parameters); | CameraConfigurationUtils.setBarcodeSceneMode(parameters); | |||
} | } | |||
End of changes. 1 change blocks. | ||||
1 lines changed or deleted | 1 lines changed or added |