| Age | Commit message (Collapse) | Author | Files | Lines |
|
|
|
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
|
|
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@2714 59b500cc-1b3d-0410-9834-0bbf25fbcc57
|
|
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@2660 59b500cc-1b3d-0410-9834-0bbf25fbcc57
|
|
test cleanup too
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@2583 59b500cc-1b3d-0410-9834-0bbf25fbcc57
|
|
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@2581 59b500cc-1b3d-0410-9834-0bbf25fbcc57
|
|
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@2546 59b500cc-1b3d-0410-9834-0bbf25fbcc57
|
|
Also removed some unused resources.
|
|
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.
|
|
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@2388 59b500cc-1b3d-0410-9834-0bbf25fbcc57
|
|
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@2385 59b500cc-1b3d-0410-9834-0bbf25fbcc57
|
|
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@2359 59b500cc-1b3d-0410-9834-0bbf25fbcc57
|
|
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@2358 59b500cc-1b3d-0410-9834-0bbf25fbcc57
|
|
behavior case
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@2267 59b500cc-1b3d-0410-9834-0bbf25fbcc57
|
|
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@2266 59b500cc-1b3d-0410-9834-0bbf25fbcc57
|
|
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@2264 59b500cc-1b3d-0410-9834-0bbf25fbcc57
|
|
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@2262 59b500cc-1b3d-0410-9834-0bbf25fbcc57
|
|
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@2247 59b500cc-1b3d-0410-9834-0bbf25fbcc57
|
|
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@2135 59b500cc-1b3d-0410-9834-0bbf25fbcc57
|
|
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@2121 59b500cc-1b3d-0410-9834-0bbf25fbcc57
|
|
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@2120 59b500cc-1b3d-0410-9834-0bbf25fbcc57
|
|
the contact encoding logic
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@2097 59b500cc-1b3d-0410-9834-0bbf25fbcc57
|
|
Now, we're on to Android 2.1 / Eclair / android-7 as a minimum platform level. I called this "4.0" accordingly.
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@2031 59b500cc-1b3d-0410-9834-0bbf25fbcc57
|
|
for now. It can come back after android/ is updated and can be cloned again. Updated android-integration with better API and ability to specify package. Now ZXingTest uses our integration code. It's updated for Android 2.x and reports camera params in a slightly better form. Also fixed a few Android 2.x issues and related intent integration stuff left over from other recent changes.
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@2020 59b500cc-1b3d-0410-9834-0bbf25fbcc57
|
|
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@2002 59b500cc-1b3d-0410-9834-0bbf25fbcc57
|
|
hiding text while encoding QR codes: redact menu bar title, and some javadoc improvements in Intents
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@1989 59b500cc-1b3d-0410-9834-0bbf25fbcc57
|
|
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@1988 59b500cc-1b3d-0410-9834-0bbf25fbcc57
|
|
full annotations.
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@1937 59b500cc-1b3d-0410-9834-0bbf25fbcc57
|
|
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@1882 59b500cc-1b3d-0410-9834-0bbf25fbcc57
|
|
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@1868 59b500cc-1b3d-0410-9834-0bbf25fbcc57
|
|
been supplanted by CommandLineRunner.
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@1778 59b500cc-1b3d-0410-9834-0bbf25fbcc57
|
|
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@1740 59b500cc-1b3d-0410-9834-0bbf25fbcc57
|
|
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@1681 59b500cc-1b3d-0410-9834-0bbf25fbcc57
|
|
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@1676 59b500cc-1b3d-0410-9834-0bbf25fbcc57
|
|
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@1594 59b500cc-1b3d-0410-9834-0bbf25fbcc57
|
|
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@1589 59b500cc-1b3d-0410-9834-0bbf25fbcc57
|
|
key ENCODE_FORMAT
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@1581 59b500cc-1b3d-0410-9834-0bbf25fbcc57
|
|
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@1484 59b500cc-1b3d-0410-9834-0bbf25fbcc57
|
|
after dialog
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@1466 59b500cc-1b3d-0410-9834-0bbf25fbcc57
|
|
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@1420 59b500cc-1b3d-0410-9834-0bbf25fbcc57
|
|
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@1417 59b500cc-1b3d-0410-9834-0bbf25fbcc57
|
|
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@1393 59b500cc-1b3d-0410-9834-0bbf25fbcc57
|
|
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@1392 59b500cc-1b3d-0410-9834-0bbf25fbcc57
|
|
more statements
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@1342 59b500cc-1b3d-0410-9834-0bbf25fbcc57
|
|
bumped the version to 3.3 beta 1.
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@1322 59b500cc-1b3d-0410-9834-0bbf25fbcc57
|
|
avoid spurious error when output dir already exists.
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@1312 59b500cc-1b3d-0410-9834-0bbf25fbcc57
|
|
mounted
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@1306 59b500cc-1b3d-0410-9834-0bbf25fbcc57
|
|
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@1295 59b500cc-1b3d-0410-9834-0bbf25fbcc57
|
|
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@1274 59b500cc-1b3d-0410-9834-0bbf25fbcc57
|
|
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@1270 59b500cc-1b3d-0410-9834-0bbf25fbcc57
|