ZXing/zxing-android-embedded.git/src/com/google/zxing/client/android/encode, branch master Barcode scanner library for Android, based on the ZXing decoder (mirror) https://git.radix-linux.su/ZXing/zxing-android-embedded.git/atom?h=master 2014-05-16T15:52:41+00:00 Move library into a subfolder. 2014-05-16T15:52:41+00:00 Ralf Kistner ralf@embarkmobile.com 2014-05-16T15:52:41+00:00 urn:sha1:fbc667aec86e608b3154a052912ce6e4579c2356 Merge branch 'upstream-2.2' 2013-07-09T13:40:10+00:00 Ralf Kistner ralf.kistner@gmail.com 2013-07-09T13:35:11+00:00 urn:sha1:470f89c74683fce963bb973e40a619e10c3eb4eb Conflicts: AndroidManifest.xml assets/html-de/index.html assets/html-de/whatsnew.html assets/html-en/index.html assets/html-es/index.html assets/html-es/whatsnew.html assets/html-fr/index.html assets/html-fr/whatsnew.html assets/html-it/index.html assets/html-it/whatsnew.html assets/html-ja/index.html assets/html-ja/whatsnew.html assets/html-ko/index.html assets/html-ko/whatsnew.html assets/html-nl/index.html assets/html-nl/whatsnew.html assets/html-pt/index.html assets/html-pt/whatsnew.html assets/html-ru/index.html assets/html-ru/whatsnew.html assets/html-zh-rCN/index.html assets/html-zh-rCN/whatsnew.html assets/html-zh-rTW/index.html assets/html-zh-rTW/whatsnew.html res/layout/bookmark_picker_list_item.xml src/com/google/zxing/client/android/CaptureActivity.java src/com/google/zxing/client/android/CaptureActivityHandler.java src/com/google/zxing/client/android/HttpHelper.java src/com/google/zxing/client/android/LocaleManager.java src/com/google/zxing/client/android/book/SearchBookContentsResult.java src/com/google/zxing/client/android/history/HistoryManager.java src/com/google/zxing/client/android/result/AddressBookResultHandler.java src/com/google/zxing/client/android/result/ProductResultHandler.java src/com/google/zxing/client/android/result/ResultHandler.java src/com/google/zxing/client/android/result/SMSResultHandler.java src/com/google/zxing/client/android/result/supplement/BookResultInfoRetriever.java src/com/google/zxing/client/android/result/supplement/SupplementalInfoRetriever.java src/com/google/zxing/client/android/result/supplement/URIResultInfoRetriever.java src/com/google/zxing/client/android/share/AppPickerActivity.java src/com/google/zxing/client/android/share/BookmarkPickerActivity.java src/com/google/zxing/client/android/share/LoadPackagesAsyncTask.java src/com/google/zxing/client/android/share/ShareActivity.java src/com/google/zxing/client/android/wifi/WifiConfigManager.java MECARD TEL should have only digits 2013-05-07T12:05:16+00:00 srowen@gmail.com srowen@gmail.com@59b500cc-1b3d-0410-9834-0bbf25fbcc57 2013-05-07T12:05:16+00:00 urn:sha1:c9f1b9d5c960e2933d66f504fd63ba68a2e8fd05 git-svn-id: http://zxing.googlecode.com/svn/trunk/android@2714 59b500cc-1b3d-0410-9834-0bbf25fbcc57 A few inspection cleanups 2013-04-18T11:26:13+00:00 srowen@gmail.com srowen@gmail.com@59b500cc-1b3d-0410-9834-0bbf25fbcc57 2013-04-18T11:26:13+00:00 urn:sha1:ac8d40abf5c9e464086c92d0f644aa5486bf9cc7 git-svn-id: http://zxing.googlecode.com/svn/trunk/android@2660 59b500cc-1b3d-0410-9834-0bbf25fbcc57 Issue 1638 support for several URLs in contact info, and some incidental test cleanup too 2013-03-03T17:06:00+00:00 srowen@gmail.com srowen@gmail.com@59b500cc-1b3d-0410-9834-0bbf25fbcc57 2013-03-03T17:06:00+00:00 urn:sha1:ecd6a3e87f70074857ad80dc3e527ee7760bc2d9 git-svn-id: http://zxing.googlecode.com/svn/trunk/android@2583 59b500cc-1b3d-0410-9834-0bbf25fbcc57 Various changes from IJ12.1 inspections 2013-03-01T20:01:40+00:00 srowen@gmail.com srowen@gmail.com@59b500cc-1b3d-0410-9834-0bbf25fbcc57 2013-03-01T20:01:40+00:00 urn:sha1:4406ac385b04139b807898a642cfd4bedaba129c git-svn-id: http://zxing.googlecode.com/svn/trunk/android@2581 59b500cc-1b3d-0410-9834-0bbf25fbcc57 Add VERSION:3.0 to vCard encoding 2012-12-28T19:26:38+00:00 srowen srowen@59b500cc-1b3d-0410-9834-0bbf25fbcc57 2012-12-28T19:26:38+00:00 urn:sha1:635ac04c5d36f0a73a70af2166bdfb7c71a9d384 git-svn-id: http://zxing.googlecode.com/svn/trunk/android@2546 59b500cc-1b3d-0410-9834-0bbf25fbcc57 Namespace some resources to prevent conflicts. 2012-12-14T09:07:01+00:00 Ralf Kistner ralf.kistner@gmail.com 2012-12-14T09:07:01+00:00 urn:sha1:0850d50f93a67f557c677cac4daf5bcc151c0378 Also removed some unused resources. Initial preparation for use as a library project. 2012-11-28T13:50:45+00:00 Ralf Kistner ralf.kistner@gmail.com 2012-11-28T13:50:45+00:00 urn:sha1:2c01eb94e67553be366842dd6643afc0cf6dd638 1. Add pom.xml and Readme.md. 2. Change switch statements on resource id's to if/else statements. 3. Use Android API level 16 instead of 17 for now. Fix encoding of certain Intents that don't have EXTRA_TEXT or EXTRA_STREAM 2012-08-13T07:09:02+00:00 srowen srowen@59b500cc-1b3d-0410-9834-0bbf25fbcc57 2012-08-13T07:09:02+00:00 urn:sha1:3996f121da0a37a9afc3d1cdde61a348f6c223d3 git-svn-id: http://zxing.googlecode.com/svn/trunk/android@2388 59b500cc-1b3d-0410-9834-0bbf25fbcc57