From b56326aec8af63e1d0b2941a1ede025ef53ad8e1 Mon Sep 17 00:00:00 2001 From: Dominik Date: Mon, 19 Nov 2012 22:42:55 +0100 Subject: [PATCH] update readme --- .../android/apg/provider/ApgProvider.java | 1 - .../apg/provider/ApgProviderInternal.java | 2 +- README.md | 17 ++++++++--------- 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/APG/src/org/thialfihar/android/apg/provider/ApgProvider.java b/APG/src/org/thialfihar/android/apg/provider/ApgProvider.java index 6b1c9fdb7..1f792bae2 100644 --- a/APG/src/org/thialfihar/android/apg/provider/ApgProvider.java +++ b/APG/src/org/thialfihar/android/apg/provider/ApgProvider.java @@ -206,7 +206,6 @@ public class ApgProvider extends ContentProvider { @Override public boolean onCreate() { mUriMatcher = buildUriMatcher(mInternalProvider); - mApgDatabase = new ApgDatabase(getContext()); return true; } diff --git a/APG/src/org/thialfihar/android/apg/provider/ApgProviderInternal.java b/APG/src/org/thialfihar/android/apg/provider/ApgProviderInternal.java index 4c7b4d453..b8b98f2c7 100644 --- a/APG/src/org/thialfihar/android/apg/provider/ApgProviderInternal.java +++ b/APG/src/org/thialfihar/android/apg/provider/ApgProviderInternal.java @@ -26,4 +26,4 @@ public class ApgProviderInternal extends ApgProvider { mInternalProvider = true; } -} +} \ No newline at end of file diff --git a/README.md b/README.md index b70f68536..ec38a7e09 100644 --- a/README.md +++ b/README.md @@ -12,15 +12,14 @@ Fork APG and do a merge request. I will merge your changes back into the main pr ## Build with Ant -1. Add a file called local.properties in org_apg folder with the following lines, altered to your locations of the SDK: ``sdk.dir=/opt/android-sdk`` -2. execute "ant release" +1. Add a file called ``local.properties`` in APG folder with the following lines, altered to your locations of the SDK: ``sdk.dir=/opt/android-sdk`` +2. execute ``ant release`` ## Build with Eclipse -1. File -> Import -> Android -> Existing Android Code Into Workspace, choose com_actionbarsherlock -2. File -> Import -> Android -> Existing Android Code Into Workspace, choose org_apg -3. Add com_actionbarsherlock as Android Lib (Properties of org_apg -> Android -> Library -> add) -5. APG can now be build +1. File -> Import -> Android -> Existing Android Code Into Workspace, choose ``APG/android-libs/ActionBarSherlock`` +2. File -> Import -> Android -> Existing Android Code Into Workspace, choose ``APG`` +3. APG can now be build # Libraries @@ -34,10 +33,10 @@ The Libraries are provided in the git repository. ## Build Barcode Scanner Integration 1. Checkout their SVN (see http://code.google.com/p/zxing/source/checkout) -2. Change android-home variable in "build.properties" in the main directory to point to your Android SDK +2. Change android-home variable in ``build.properties`` in the main directory to point to your Android SDK 3. Change directory to android-integration -4. Build using "ant build" -5. We use "android-integration-supportv4.jar" +4. Build using ``ant build`` +5. We use ``android-integration-supportv4.jar`` On error see: http://code.google.com/p/zxing/issues/detail?id=1207