mudhorn/zxing
1
0
Fork 0
mirror of https://github.com/zxing/zxing.git synced 2025-02-02 05:41:08 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Default to allow focusing in continuous-picture mode (#1186)

Browse source 
* This is supported on almost all devices now, and they handle this pretty
   well. Additionally, this workarounds a bug in some devices which auto mode
   will hang forever for unknown reason.
This commit is contained in:
Wang Han 2019-07-05 03:55:58 +08:00 committed by Sean Owen
parent ae6d7e55af
commit 4199e41fb8
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
android/res/xml/preferences.xml
View file

@ -116,7 +116,7 @@
<PreferenceCategory android:title="@string/preferences_device_bug_workarounds_title"> <PreferenceCategory android:title="@string/preferences_device_bug_workarounds_title">
<CheckBoxPreference <CheckBoxPreference
android:key="preferences_disable_continuous_focus" android:key="preferences_disable_continuous_focus"
android:defaultValue="true" android:defaultValue="false"
android:title="@string/preferences_disable_continuous_focus_title" android:title="@string/preferences_disable_continuous_focus_title"
android:summary="@string/preferences_disable_continuous_focus_summary"/> android:summary="@string/preferences_disable_continuous_focus_summary"/>
<CheckBoxPreference <CheckBoxPreference

2
android/src/com/google/zxing/client/android/camera/CameraConfigurationManager.java
View file

@ -161,7 +161,7 @@ final class CameraConfigurationManager {
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) {