projects / zxing.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: b72d3a7)
Final changes for Barcode Scanner 2.93.
authordswitkin <dswitkin@59b500cc-1b3d-0410-9834-0bbf25fbcc57>
Thu, 3 Sep 2009 20:37:38 +0000 (20:37 +0000)
committerdswitkin <dswitkin@59b500cc-1b3d-0410-9834-0bbf25fbcc57>
Thu, 3 Sep 2009 20:37:38 +0000 (20:37 +0000)
git-svn-id: http://zxing.googlecode.com/svn/trunk@1046 59b500cc-1b3d-0410-9834-0bbf25fbcc57

android/AndroidManifest.xml patch | blob | history
android/assets/html/whatsnew.html patch | blob | history
android/build.xml patch | blob | history
android/src/com/google/zxing/client/android/CameraManager.java patch | blob | history

diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
index 034aa98..2275f37 100755 (executable)
--- a/android/AndroidManifest.xml
+++ b/android/AndroidManifest.xml
@@ -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. -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="com.google.zxing.client.android"
-          android:versionName="2.92"
-          android:versionCode="28">
+          android:versionName="2.93"
+          android:versionCode="30">
   <uses-sdk android:minSdkVersion="3"/>
   <application android:icon="@drawable/launcher_icon"
                android:label="@string/app_name">
diff --git a/android/assets/html/whatsnew.html b/android/assets/html/whatsnew.html
index 2e79fb2..d1d3938 100644 (file)
--- a/android/assets/html/whatsnew.html
+++ b/android/assets/html/whatsnew.html
@@ -3,6 +3,10 @@
 <body>
 <link rel="StyleSheet" href="style.css" type="text/css">
 <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>
 <ul>
   <li>Made another fix for the Samsung Galaxy.</li>
diff --git a/android/build.xml b/android/build.xml
index 8afd48b..c038b41 100644 (file)
--- a/android/build.xml
+++ b/android/build.xml
@@ -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.SearchBookContents* { public * ; }"/>
       <arg value="-target 5"/>
-      <arg value="-optimizationpasses 9"/>
+      <arg value="-optimizationpasses 7"/>
       <arg value="-dontshrink"/>
       <arg value="-dontobfuscate"/>
       <arg value="-dontskipnonpubliclibraryclasses"/>
diff --git a/android/src/com/google/zxing/client/android/CameraManager.java b/android/src/com/google/zxing/client/android/CameraManager.java
index 7611555..9523ce8 100755 (executable)
--- a/android/src/com/google/zxing/client/android/CameraManager.java
+++ b/android/src/com/google/zxing/client/android/CameraManager.java
@@ -204,6 +204,11 @@ final class CameraManager {
    */
   private void setCameraParameters() {
     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);
 
     // 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");
 
     mCamera.setParameters(parameters);
-    Log.v(TAG, "Setting params for preview: width " + mScreenResolution.x + " height " +
-        mScreenResolution.y);
   }
 
   private Point getScreenResolution() {
Unnamed repository; edit this file to name it for gitweb.