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

On second though, exposure is just too subtly problematic. Comment it out.

Browse source 
git-svn-id: https://zxing.googlecode.com/svn/trunk@2431 59b500cc-1b3d-0410-9834-0bbf25fbcc57
This commit is contained in:
srowen 2012-09-28 21:09:23 +00:00
parent 55098463f2
commit e807ea80a1
5 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
android/AndroidManifest.xml
View file

@ -16,8 +16,8 @@
--> -->
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.google.zxing.client.android" package="com.google.zxing.client.android"
android:versionName="4.3" android:versionName="4.3.1 beta1"
android:versionCode="86" android:versionCode="87"
android:installLocation="auto"> android:installLocation="auto">
<uses-permission android:name="android.permission.CAMERA"/> <uses-permission android:name="android.permission.CAMERA"/>

2
android/proguard-android-optimize.txt
View file

@ -29,7 +29,7 @@
# ADDED # ADDED
-keep class com.google.zxing.client.android.camera.open.** -keep class com.google.zxing.client.android.camera.open.**
-keep class com.google.zxing.client.android.camera.exposure.** #-keep class com.google.zxing.client.android.camera.exposure.**
-keep class com.google.zxing.client.android.common.executor.** -keep class com.google.zxing.client.android.common.executor.**
# For native methods, see http://proguard.sourceforge.net/manual/examples.html#native # For native methods, see http://proguard.sourceforge.net/manual/examples.html#native

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

@ -87,10 +87,12 @@
android:defaultValue="true" android:defaultValue="true"
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
android:key="preferences_disable_exposure" android:key="preferences_disable_exposure"
android:defaultValue="false" android:defaultValue="false"
android:title="@string/preferences_disable_exposure_title"/> android:title="@string/preferences_disable_exposure_title"/>
-->
</PreferenceCategory> </PreferenceCategory>
<PreferenceCategory android:title="@string/preferences_try_bsplus"> <PreferenceCategory android:title="@string/preferences_try_bsplus">
<com.google.zxing.client.android.pref.BSPlusPreference <com.google.zxing.client.android.pref.BSPlusPreference

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

@ -50,7 +50,7 @@ public final class PreferencesActivity extends PreferenceActivity
public static final String KEY_SEARCH_COUNTRY = "preferences_search_country"; public static final String KEY_SEARCH_COUNTRY = "preferences_search_country";
public static final String KEY_DISABLE_CONTINUOUS_FOCUS = "preferences_disable_continuous_focus"; public static final String KEY_DISABLE_CONTINUOUS_FOCUS = "preferences_disable_continuous_focus";
public static final String KEY_DISABLE_EXPOSURE = "preferences_disable_exposure"; //public static final String KEY_DISABLE_EXPOSURE = "preferences_disable_exposure";
public static final String KEY_HELP_VERSION_SHOWN = "preferences_help_version_shown"; public static final String KEY_HELP_VERSION_SHOWN = "preferences_help_version_shown";

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

@ -26,8 +26,6 @@ import android.view.Display;
import android.view.WindowManager; import android.view.WindowManager;
import com.google.zxing.client.android.PreferencesActivity; import com.google.zxing.client.android.PreferencesActivity;
import com.google.zxing.client.android.camera.exposure.ExposureInterface;
import com.google.zxing.client.android.camera.exposure.ExposureManager;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
@ -164,6 +162,7 @@ final class CameraConfigurationManager {
parameters.setFlashMode(flashMode); parameters.setFlashMode(flashMode);
} }
/*
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context); SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
if (!prefs.getBoolean(PreferencesActivity.KEY_DISABLE_EXPOSURE, false)) { if (!prefs.getBoolean(PreferencesActivity.KEY_DISABLE_EXPOSURE, false)) {
if (!safeMode) { if (!safeMode) {
@ -171,6 +170,7 @@ final class CameraConfigurationManager {
exposure.setExposure(parameters, newSetting); exposure.setExposure(parameters, newSetting);
} }
} }
*/
} }
private Point findBestPreviewSizeValue(Camera.Parameters parameters, Point screenResolution) { private Point findBestPreviewSizeValue(Camera.Parameters parameters, Point screenResolution) {