Merge pull request #5 from codenameone/patch-1

NickoftheSouth · web-flow · commit fb6317397e13 · 2017-04-26T10:59:53.000+12:00
Workaround for an Android build regression
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.** {*;} 

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,6 @@`
`3`	`3`	`#is an appended type property.`
`4`	`4`	`#`
`5`	`5`	`#Wed Jan 09 17:59:31 IST 2013`
`6`		`-codename1.arg.android.xapplication=<activity android\:name\="com.dm.zbar.android.scanner.ZBarScannerActivity" android\:screenOrientation\="landscape"/>`
	`6`	`+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" />`
`7`	`7`	`codename1.arg.android.xpermissions=<uses-permission android\:name\="android.permission.CAMERA"/><uses-feature android\:name\="android.hardware.camera" android\:required\="false"/>`
`8`		`-codename1.arg.android.proguardKeep=\ -keep class net.sourceforge.zbar.** {*;}`
	`8`	`+codename1.arg.android.proguardKeep=\ -keep class net.sourceforge.zbar.** {*;}`