mudhorn/zxing
1
0
Fork 0
mirror of https://github.com/zxing/zxing.git synced 2024-09-20 13:37:34 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity

Set a camera parameter to force the flash off. Also fixed the uninstall build targets.

Browse source 
git-svn-id: https://zxing.googlecode.com/svn/trunk@1024 59b500cc-1b3d-0410-9834-0bbf25fbcc57
This commit is contained in:
dswitkin 2009-07-21 21:36:33 +00:00
parent d71c099313
commit 9dc583f556
4 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
android/AndroidManifest.xml
View file

@ -20,8 +20,8 @@ version to be published. The next versionCode will be 7, regardless of whether t
versionName is 2.31, 2.4, or 3.0. --> versionName is 2.31, 2.4, or 3.0. -->
<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="2.9" android:versionName="3.0 alpha1"
android:versionCode="23"> android:versionCode="24">
<uses-sdk android:minSdkVersion="3"/> <uses-sdk android:minSdkVersion="3"/>
<application android:icon="@drawable/launcher_icon" <application android:icon="@drawable/launcher_icon"
android:label="@string/app_name"> android:label="@string/app_name">

4
android/build.xml
View file

@ -42,7 +42,7 @@ limitations under the License.
should be checked in in Version Control Systems. should be checked in in Version Control Systems.
--> -->
<!--<property file="build.properties"/>--> <property file="build.properties"/>
<!-- The default.properties file is created and updated by the 'android' tool, as well as ADT. <!-- The default.properties file is created and updated by the 'android' tool, as well as ADT.
This file is an integral part of the build system for your application and This file is an integral part of the build system for your application and
@ -267,7 +267,7 @@ limitations under the License.
<echo>Uninstalling ${application-package} from the default emulator...</echo> <echo>Uninstalling ${application-package} from the default emulator...</echo>
<exec executable="${adb}" failonerror="true"> <exec executable="${adb}" failonerror="true">
<arg value="uninstall" /> <arg value="uninstall" />
<arg path="${application-package}" /> <arg value="${application-package}" />
</exec> </exec>
</target> </target>

3
android/src/com/google/zxing/client/android/CameraManager.java
View file

@ -204,6 +204,9 @@ final class CameraManager {
private void setCameraParameters() { private void setCameraParameters() {
Camera.Parameters parameters = mCamera.getParameters(); Camera.Parameters parameters = mCamera.getParameters();
parameters.setPreviewSize(mScreenResolution.x, mScreenResolution.y); parameters.setPreviewSize(mScreenResolution.x, mScreenResolution.y);
// Disables the built-in flash if present. Hopefully devices will honor this setting.
parameters.set("flash-mode", "off");
mCamera.setParameters(parameters); mCamera.setParameters(parameters);
Log.v(TAG, "Setting params for preview: width " + mScreenResolution.x + " height " + Log.v(TAG, "Setting params for preview: width " + mScreenResolution.x + " height " +
mScreenResolution.y); mScreenResolution.y);

4
androidtest/build.xml
View file

@ -42,7 +42,7 @@ limitations under the License.
should be checked in in Version Control Systems. should be checked in in Version Control Systems.
--> -->
<!--<property file="build.properties"/>--> <property file="build.properties"/>
<!-- The default.properties file is created and updated by the 'android' tool, as well as ADT. <!-- The default.properties file is created and updated by the 'android' tool, as well as ADT.
This file is an integral part of the build system for your application and This file is an integral part of the build system for your application and
@ -267,7 +267,7 @@ limitations under the License.
<echo>Uninstalling ${application-package} from the default emulator...</echo> <echo>Uninstalling ${application-package} from the default emulator...</echo>
<exec executable="${adb}" failonerror="true"> <exec executable="${adb}" failonerror="true">
<arg value="uninstall" /> <arg value="uninstall" />
<arg path="${application-package}" /> <arg value="${application-package}" />
</exec> </exec>
</target> </target>