Skip to content

Commit 92ec665

Browse files
erangazebraerangazebra
committed
Barcode Scanner SDK for Android v2.6.0.0 Release.
1 parent fd429f8 commit 92ec665

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+3655
-542
lines changed

‎LICENSE.txt‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
MIT License
2+
3+
Copyright (c) 2020 Zebra Technologies Ltd, Inc
4+
5+
Permission is hereby granted, free of charge, to any person obtaining a copy
6+
of this software and associated documentation files (the "Software"), to deal
7+
in the Software without restriction, including without limitation the rights
8+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9+
copies of the Software, and to permit persons to whom the Software is
10+
furnished to do so, subject to the following conditions:
11+
12+
The above copyright notice and this permission notice shall be included in all
13+
copies or substantial portions of the Software.
14+
15+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21+
SOFTWARE.LICENSE

‎README.md‎

Lines changed: 6 additions & 42 deletions
Large diffs are not rendered by default.

‎android_scanner_sdk_demo_app/BarcodeScannerLibrary/barcode_scanner_library_v2.5.8.0-release.aar‎

-259 KB
Binary file not shown.

‎android_scanner_sdk_demo_app/BarcodeScannerLibrary/barcode_scanner_library_v2.6.2.0-release.aar‎

307 KB
Binary file not shown.

‎android_scanner_sdk_demo_app/BarcodeScannerLibrary/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
configurations.create("default")
2-
artifacts.add("default", file('barcode_scanner_library_v2.5.8.0-release.aar'))
2+
artifacts.add("default", file('barcode_scanner_library_v2.6.2.0-release.aar'))

‎android_scanner_sdk_demo_app/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ buildscript {
99
}
1010

1111
dependencies {
12-
classpath 'com.android.tools.build:gradle:3.4.2'
12+
classpath 'com.android.tools.build:gradle:4.0.1'
1313
}
1414

1515
allprojects {

‎android_scanner_sdk_demo_app/gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Tue May 15 09:56:02 GMT+05:30 2018
1+
#Fri Sep 04 15:58:15 IST 2020
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-bin.zip

‎android_scanner_sdk_demo_app/scannercontrol/build.gradle‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
apply plugin: 'com.android.application'
22

33
android {
4-
compileSdkVersion 29
4+
compileSdkVersion 30
55
defaultConfig {
66
applicationId "com.zebra.scannercontrol.app"
77
minSdkVersion 19
8-
targetSdkVersion 29
9-
versionCode 132
10-
versionName "2.5.8.0"
8+
targetSdkVersion 30
9+
versionCode 146
10+
versionName "2.6.2.0"
1111
if (project.hasProperty('ADD_BUILD_TO_VERSION')) {
1212
versionName = versionName.substring(0,versionName.lastIndexOf(".") + 1) + (System.getenv("BUILD_NUMBER") ?: "0")
1313
}

‎android_scanner_sdk_demo_app/scannercontrol/src/main/AndroidManifest.xml‎

Lines changed: 74 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,50 @@
66
<uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
77
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
88
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
9+
<uses-permission android:name="android.permission.VIBRATE" />
10+
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
11+
<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
12+
<uses-permission android:name="android.permission.USE_FULL_SCREEN_INTENT" />
13+
<uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" />
14+
915
<application
1016
android:name=".application.Application"
1117
android:allowBackup="true"
18+
android:fullBackupContent="@xml/backup_descriptor"
1219
android:icon="@mipmap/app_icon"
1320
android:label="@string/app_name"
21+
android:requestLegacyExternalStorage="true"
1422
android:supportsRtl="true"
15-
android:theme="@style/AppTheme"
16-
android:fullBackupContent="@xml/backup_descriptor"
17-
android:requestLegacyExternalStorage="true"> <!--Allows Android v10 to use legacy storage -->
23+
android:theme="@style/AppTheme">
24+
<service
25+
android:name=".helpers.BackgroundSoundService"
26+
android:enabled="true"
27+
android:exported="true"></service>
28+
29+
<activity
30+
android:name=".activities.VirtualTetherSettings"
31+
android:configChanges="orientation|screenSize"
32+
android:label="@string/title_activity_active_scanner"
33+
android:parentActivityName=".activities.ActiveScannerActivity"
34+
android:theme="@style/AppTheme.NoActionBar">
35+
<meta-data
36+
android:name="android.support.PARENT_ACTIVITY"
37+
android:value="com.zebra.scannercontrol.app.activities.ActiveScannerActivity" />
38+
</activity> <!-- Allows Android v10 to use legacy storage -->
1839
<activity
1940
android:name=".activities.HomeActivity"
2041
android:configChanges="orientation|screenSize"
2142
android:label="@string/app_name"
2243
android:launchMode="singleTask"
23-
android:theme="@style/AppThemeLight.NoActionBar" />
44+
android:theme="@style/AppThemeLight.NoActionBar">
45+
<intent-filter>
46+
<action android:name="android.hardware.usb.action.USB_DEVICE_ATTACHED" />
47+
</intent-filter>
48+
49+
<meta-data
50+
android:name="android.hardware.usb.action.USB_DEVICE_ATTACHED"
51+
android:resource="@xml/device_filter" />
52+
</activity>
2453
<activity
2554
android:name=".activities.SplashScreenActivity"
2655
android:label="@string/title_activity_home"
@@ -41,7 +70,15 @@
4170
android:configChanges="orientation|screenSize"
4271
android:label="@string/title_activity_scanners"
4372
android:launchMode="singleTask"
44-
android:parentActivityName=".activities.HomeActivity" />
73+
android:parentActivityName=".activities.HomeActivity">
74+
<intent-filter>
75+
<action android:name="android.hardware.usb.action.USB_DEVICE_ATTACHED" />
76+
</intent-filter>
77+
78+
<meta-data
79+
android:name="android.hardware.usb.action.USB_DEVICE_ATTACHED"
80+
android:resource="@xml/device_filter" />
81+
</activity>
4582
<activity
4683
android:name=".activities.ConnectionHelpActivity2"
4784
android:configChanges="orientation|screenSize"
@@ -60,7 +97,15 @@
6097
<activity
6198
android:name=".activities.BaseActivity"
6299
android:configChanges="orientation|screenSize"
63-
android:label="@string/title_activity_base" />
100+
android:label="@string/title_activity_base">
101+
<intent-filter>
102+
<action android:name="android.hardware.usb.action.USB_DEVICE_ATTACHED" />
103+
</intent-filter>
104+
105+
<meta-data
106+
android:name="android.hardware.usb.action.USB_DEVICE_ATTACHED"
107+
android:resource="@xml/device_filter" />
108+
</activity>
64109

65110
<receiver
66111
android:name=".receivers.NotificationsReceiver"
@@ -85,11 +130,12 @@
85130
android:label="@string/title_activity_active_scanner"
86131
android:launchMode="singleTask"
87132
android:theme="@style/AppTheme.NoActionBar">
88-
<intent-filter>
89-
<action android:name="activities.ActiveScannerActivity" />
90-
<category android:name="android.intent.category.DEFAULT" />
91-
</intent-filter>
92-
</activity>
133+
<intent-filter>
134+
<action android:name="activities.ActiveScannerActivity" />
135+
136+
<category android:name="android.intent.category.DEFAULT" />
137+
</intent-filter>
138+
</activity>
93139
<activity
94140
android:name=".activities.BeeperActionsActivity"
95141
android:configChanges="orientation|screenSize"
@@ -178,6 +224,16 @@
178224
android:name="android.support.PARENT_ACTIVITY"
179225
android:value="com.zebra.scannercontrol.app.activities.ActiveScannerActivity" />
180226
</activity>
227+
<activity
228+
android:name=".activities.UnPairAndRebootActivity"
229+
android:configChanges="orientation|screenSize|keyboard|keyboardHidden"
230+
android:label="@string/title_activity_active_scanner"
231+
android:parentActivityName=".activities.ActiveScannerActivity"
232+
android:theme="@style/AppTheme.NoActionBar">
233+
<meta-data
234+
android:name="android.support.PARENT_ACTIVITY"
235+
android:value="com.zebra.scannercontrol.app.activities.ActiveScannerActivity" />
236+
</activity>
181237
<activity
182238
android:name=".activities.SupportedScanners"
183239
android:configChanges="orientation|screenSize"
@@ -224,12 +280,13 @@
224280
android:name="android.support.PARENT_ACTIVITY"
225281
android:value="com.zebra.scannercontrol.app.activities.ActiveScannerActivity" />
226282
</activity>
227-
<activity android:name=".activities.SsaSetSymbologyActivity"
228-
android:noHistory="true"
283+
<activity
284+
android:name=".activities.SsaSetSymbologyActivity"
229285
android:configChanges="orientation|screenSize"
230286
android:label="@string/title_activity_active_scanner"
287+
android:noHistory="true"
231288
android:parentActivityName=".activities.ActiveScannerActivity"
232-
android:theme="@style/AppTheme.NoActionBar" >
289+
android:theme="@style/AppTheme.NoActionBar">
233290
<meta-data
234291
android:name="android.support.PARENT_ACTIVITY"
235292
android:value="com.zebra.scannercontrol.app.activities.ActiveScannerActivity" />
@@ -244,7 +301,7 @@
244301
android:name="android.support.PARENT_ACTIVITY"
245302
android:value="com.zebra.scannercontrol.app.activities.ActiveScannerActivity" />
246303
</activity>
247-
<activity
304+
<activity
248305
android:name=".activities.ImageActivity"
249306
android:configChanges="orientation|screenSize"
250307
android:label="@string/title_activity_active_scanner"
@@ -277,9 +334,7 @@
277334
<activity
278335
android:name=".activities.DecodeImageActivity"
279336
android:configChanges="orientation|screenSize"
280-
android:theme="@style/AppTheme.NoActionBar">
281-
</activity>
282-
337+
android:theme="@style/AppTheme.NoActionBar" />
283338
</application>
284339

285-
</manifest>
340+
</manifest>

‎android_scanner_sdk_demo_app/scannercontrol/src/main/java/com/zebra/scannercontrol/app/activities/AboutActivity.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ protected void onCreate(Bundle savedInstanceState) {
4242
version = pInfo.versionName;
4343
((TextView) findViewById(R.id.about)).setText(getResources().getString(R.string.app_name)+" Application v"+version+"\n\n"+
4444
"SDK version "+ Application.sdkHandler.dcssdkGetVersion()+"\n\n"
45-
+"\u00a9 2019 Zebra Technologies Corp. and/or its affiliates. All rights reserved.");
45+
+"\u00a9 2021 Zebra Technologies Corp. and/or its affiliates. All rights reserved.");
4646
}
4747
}
4848

0 commit comments

Comments
 (0)