Drastic measures: make *all* optional camera params disabled by defau…

…lt to appease some bad devices. And even make the default disabled in the code, not just XML.
evrimulgen · Feb 3, 2014 · 4411eb5 · 4411eb5
1 parent ac9b799
commit 4411eb5
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
@@ -16,8 +16,8 @@
  -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="com.google.zxing.client.android"
-          android:versionName="4.6.0"
-          android:versionCode="95"
+          android:versionName="4.6.1"
+          android:versionCode="96"
           android:installLocation="auto">
 
   <uses-permission android:name="android.permission.CAMERA"/>

diff --git a/android/res/xml/preferences.xml b/android/res/xml/preferences.xml
@@ -108,7 +108,7 @@
         android:summary="@string/preferences_disable_continuous_focus_summary"/>
     <CheckBoxPreference
         android:key="preferences_disable_exposure"
-        android:defaultValue="false"
+        android:defaultValue="true"
         android:title="@string/preferences_disable_exposure_title"/>
     <CheckBoxPreference
         android:key="preferences_disable_metering"

diff --git 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 @@ void setDesiredCameraParameters(Camera camera, boolean safeMode) {
 
     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,15 +127,15 @@ void setDesiredCameraParameters(Camera camera, boolean safeMode) {
         }
       }
 
-      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) {
           parameters.setSceneMode(sceneMode);
         }
       }
 
-      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 @@ private void doSetTorch(Camera.Parameters parameters, boolean newSetting, boolea
     }
 
     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();