Merge pull request #5 from codenameone/patch-1

Workaround for an Android build regression
littlemonkeyltd · Apr 25, 2017 · fb63173 · fb63173
2 parents 658bc45 + 4d9dbc6
commit fb63173
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/codenameone_library_appended.properties b/codenameone_library_appended.properties
@@ -3,6 +3,6 @@
 #is an appended type property.
 #
 #Wed Jan 09 17:59:31 IST 2013
-codename1.arg.android.xapplication=<activity android\:name\="com.dm.zbar.android.scanner.ZBarScannerActivity" android\:screenOrientation\="landscape"/>
+codename1.arg.android.xapplication=<activity android\:name\="com.dm.zbar.android.scanner.ZBarScannerActivity" android\:screenOrientation\="landscape" android\:label\="@string/app_name" tools\:replace\="android\:label" />
 codename1.arg.android.xpermissions=<uses-permission android\:name\="android.permission.CAMERA"/><uses-feature android\:name\="android.hardware.camera" android\:required\="false"/>
-codename1.arg.android.proguardKeep=\  -keep class net.sourceforge.zbar.** {*;} 
+codename1.arg.android.proguardKeep=\  -keep class net.sourceforge.zbar.** {*;}