From dcadd84ec585c1f9f66e09cca99837d4f7962c16 Mon Sep 17 00:00:00 2001 From: dswitkin Date: Fri, 5 Mar 2010 22:41:02 +0000 Subject: [PATCH] Made upgrades load the What's New page, while new installs load the default help page. Also bumped the version to 3.21 beta 1. git-svn-id: http://zxing.googlecode.com/svn/trunk@1242 59b500cc-1b3d-0410-9834-0bbf25fbcc57 --- android/AndroidManifest.xml | 6 ++-- android/assets/html/whatsnew.html | 6 +++- .../zxing/client/android/CaptureActivity.java | 8 ++++-- .../zxing/client/android/HelpActivity.java | 28 +++++++++++++++---- 4 files changed, 35 insertions(+), 13 deletions(-) diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml index 7d8538d1..e93be788 100755 --- 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. --> + android:versionName="3.21 beta 1" + android:versionCode="46"> @@ -131,5 +131,5 @@ versionName is 2.31, 2.4, or 3.0. --> - + diff --git a/android/assets/html/whatsnew.html b/android/assets/html/whatsnew.html index 1ac9c386..e284fb01 100644 --- a/android/assets/html/whatsnew.html +++ b/android/assets/html/whatsnew.html @@ -3,11 +3,15 @@

What's new in this version

+

New in version 3.21:

+

New in version 3.2: