ZXing/zxing-android-embedded.git/src/com/google/zxing/client/android/PreferencesActivity.java, branch 1.1.x Barcode scanner library for Android, based on the ZXing decoder (mirror) https://git.radix-linux.su/ZXing/zxing-android-embedded.git/atom?h=1.1.x 2013-07-09T13:40:10+00:00 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 Add invert scan option 2013-02-08T23:39:44+00:00 srowen@gmail.com srowen@gmail.com@59b500cc-1b3d-0410-9834-0bbf25fbcc57 2013-02-08T23:39:44+00:00 urn:sha1:d9b8c77c151b8fd6204cf3c609dbc669dd46f48c git-svn-id: http://zxing.googlecode.com/svn/trunk/android@2571 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. Possibly final changes for automatic torch settings 2012-11-08T22:59:44+00:00 srowen srowen@59b500cc-1b3d-0410-9834-0bbf25fbcc57 2012-11-08T22:59:44+00:00 urn:sha1:42f3e5ff857d71c46b992cfcc4fa99180ce342bc git-svn-id: http://zxing.googlecode.com/svn/trunk/android@2506 59b500cc-1b3d-0410-9834-0bbf25fbcc57 On second though, exposure is just too subtly problematic. Comment it out. 2012-09-28T21:09:23+00:00 srowen srowen@59b500cc-1b3d-0410-9834-0bbf25fbcc57 2012-09-28T21:09:23+00:00 urn:sha1:4f54b7f524983b6a417af223be283f23106c5540 git-svn-id: http://zxing.googlecode.com/svn/trunk/android@2431 59b500cc-1b3d-0410-9834-0bbf25fbcc57 More safe mode, and, add a setting to disable exposure to work around bad devices 2012-09-28T15:18:19+00:00 srowen srowen@59b500cc-1b3d-0410-9834-0bbf25fbcc57 2012-09-28T15:18:19+00:00 urn:sha1:f8fe2332807823031bcbbfe6394262d6f9388a94 git-svn-id: http://zxing.googlecode.com/svn/trunk/android@2430 59b500cc-1b3d-0410-9834-0bbf25fbcc57 Add optional workaround for devices that support continuous focus but badly, and enable it to be conservative 2012-08-06T22:58:10+00:00 srowen srowen@59b500cc-1b3d-0410-9834-0bbf25fbcc57 2012-08-06T22:58:10+00:00 urn:sha1:438368d364256959ae4ae475f499460efeefeba3 git-svn-id: http://zxing.googlecode.com/svn/trunk/android@2380 59b500cc-1b3d-0410-9834-0bbf25fbcc57 Back-port rewritten auto-focus cycle; allow disabling of auto focus 2012-05-10T10:40:55+00:00 srowen srowen@59b500cc-1b3d-0410-9834-0bbf25fbcc57 2012-05-10T10:40:55+00:00 urn:sha1:0a7ab5413e2677013a27ae1aa2c931c50eee8e6c git-svn-id: http://zxing.googlecode.com/svn/trunk/android@2285 59b500cc-1b3d-0410-9834-0bbf25fbcc57 Remove 'reverse image' pref. It was only ever relevant for front cameras and the app doesn't support front camera. It's not even supposed to be needed for front cameras. Reports of some (carrier?) enabling it by default which disables QR code scanning. 2012-02-16T11:58:33+00:00 srowen srowen@59b500cc-1b3d-0410-9834-0bbf25fbcc57 2012-02-16T11:58:33+00:00 urn:sha1:1ea75a71731712839ed74fed4bf222ea86355639 git-svn-id: http://zxing.googlecode.com/svn/trunk/android@2189 59b500cc-1b3d-0410-9834-0bbf25fbcc57 Use screen-sized preview if available, if it's not too big/small, for all devices 2012-02-07T20:03:22+00:00 srowen srowen@59b500cc-1b3d-0410-9834-0bbf25fbcc57 2012-02-07T20:03:22+00:00 urn:sha1:f7afa2f6b8d2976fae17771415dc7ef88516646e git-svn-id: http://zxing.googlecode.com/svn/trunk/android@2170 59b500cc-1b3d-0410-9834-0bbf25fbcc57