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

Final changes for Barcode Scanner 2.93.

Browse source 
git-svn-id: https://zxing.googlecode.com/svn/trunk@1046 59b500cc-1b3d-0410-9834-0bbf25fbcc57
This commit is contained in:
dswitkin 2009-09-03 20:37:38 +00:00
parent 5e752acd25
commit e83cb0cef1
4 changed files with 12 additions and 5 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.92" android:versionName="2.93"
android:versionCode="28"> android:versionCode="30">
<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/assets/html/whatsnew.html
View file

@ -3,6 +3,10 @@
<body> <body>
<link rel="StyleSheet" href="style.css" type="text/css"> <link rel="StyleSheet" href="style.css" type="text/css">
<h3><center>What's new in this version</center></h3> <h3><center>What's new in this version</center></h3>
<p>New in version 2.93:</p>
<ul>
<li>Worked around an Android bug which could cause scanning to stop working after a while.</li>
</ul>
<p>New in version 2.92:</p> <p>New in version 2.92:</p>
<ul> <ul>
<li>Made another fix for the Samsung Galaxy.</li> <li>Made another fix for the Samsung Galaxy.</li>

2
android/build.xml
View file

@ -198,7 +198,7 @@ limitations under the License.
<arg value="-keep class com.google.zxing.client.android.ViewfinderView { public * ; }"/> <arg value="-keep class com.google.zxing.client.android.ViewfinderView { public * ; }"/>
<arg value="-keep class com.google.zxing.client.android.SearchBookContents* { public * ; }"/> <arg value="-keep class com.google.zxing.client.android.SearchBookContents* { public * ; }"/>
<arg value="-target 5"/> <arg value="-target 5"/>
<arg value="-optimizationpasses 9"/> <arg value="-optimizationpasses 7"/>
<arg value="-dontshrink"/> <arg value="-dontshrink"/>
<arg value="-dontobfuscate"/> <arg value="-dontobfuscate"/>
<arg value="-dontskipnonpubliclibraryclasses"/> <arg value="-dontskipnonpubliclibraryclasses"/>

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

@ -204,6 +204,11 @@ final class CameraManager {
*/ */
private void setCameraParameters() { private void setCameraParameters() {
Camera.Parameters parameters = mCamera.getParameters(); Camera.Parameters parameters = mCamera.getParameters();
Camera.Size size = parameters.getPreviewSize();
Log.v(TAG, "Default preview size: " + size.width + ", " + size.height);
Log.v(TAG, "Default preview format: " + parameters.getPreviewFormat());
Log.v(TAG, "Setting preview size: " + mScreenResolution.x + ", " + mScreenResolution.y);
parameters.setPreviewSize(mScreenResolution.x, mScreenResolution.y); parameters.setPreviewSize(mScreenResolution.x, mScreenResolution.y);
// FIXME: This is a hack to turn the flash off on the Samsung Galaxy. // FIXME: This is a hack to turn the flash off on the Samsung Galaxy.
@ -213,8 +218,6 @@ final class CameraManager {
parameters.set("flash-mode", "off"); parameters.set("flash-mode", "off");
mCamera.setParameters(parameters); mCamera.setParameters(parameters);
Log.v(TAG, "Setting params for preview: width " + mScreenResolution.x + " height " +
mScreenResolution.y);
} }
private Point getScreenResolution() { private Point getScreenResolution() {