diff options
| author | Ralf Kistner <ralf@journeyapps.com> | 2015-12-29 16:56:46 +0300 |
|---|---|---|
| committer | Ralf Kistner <ralf@journeyapps.com> | 2015-12-29 16:56:46 +0300 |
| commit | 77d0cdfe85cf76f3655a35e5edbd06d005192696 (patch) | |
| tree | 944c43295afb6ea5605db4b9209cbc142c897f94 /sample | |
| parent | 5035f3c45375c5ec9723b52b14b1a91a6bcc0e9a (diff) | |
| parent | 002c8e676e8cf633510ade9a437294cb51908f71 (diff) | |
| download | zxing-android-embedded-77d0cdfe85cf76f3655a35e5edbd06d005192696.tar.xz | |
Merge branch 'upgrade/build-tools'
Diffstat (limited to 'sample')
| -rw-r--r-- | sample/build.gradle | 2 | ||||
| -rw-r--r-- | sample/src/main/res/layout/activity_main.xml | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/sample/build.gradle b/sample/build.gradle index 0e63405d..87a34771 100644 --- a/sample/build.gradle +++ b/sample/build.gradle @@ -23,7 +23,7 @@ dependencies { // compile 'com.journeyapps:zxing-android-embedded:<version>@aar' // compile 'com.google.zxing:core:3.2.0' compile(project(':zxing-android-embedded')) { transitive = true } - compile 'com.android.support:appcompat-v7:22.0.0' + compile 'com.android.support:appcompat-v7:23.1.0' // For development purposes only diff --git a/sample/src/main/res/layout/activity_main.xml b/sample/src/main/res/layout/activity_main.xml index c3ed408c..2312466f 100644 --- a/sample/src/main/res/layout/activity_main.xml +++ b/sample/src/main/res/layout/activity_main.xml @@ -32,6 +32,7 @@ android:onClick="scanBarcodeFrontCamera"/> <fragment + android:id="@+id/fragment_scan" android:layout_width="match_parent" android:layout_height="wrap_content" |