Merge conflicts in AndroidManifest.xml

gameplay/android/AndroidManifest.xml

@@ -1,14 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
+<<<<<<< HEAD
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
         package="org.gameplay3d.gameplay"
         android:versionCode="1"
         android:versionName="1.0">
 
     <uses-sdk android:minSdkVersion="15" />
+=======
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" 
+	package="org.gameplay3d.gameplay" 
+	android:versionCode="1" 
+	android:versionName="1.0">
 
-    <application
-        android:icon="@drawable/ic_launcher"
-        android:label="@string/app_name" >
-    </application>
+    <uses-sdk android:minSdkVersion="15”/>
+>>>>>>> 442f995770ee3a2089b71c2d54cc0732f0ec70cf
+
+    <application android:icon="@drawable/ic_launcher" android:label="@string/app_name" />
 
 </manifest>

gameplay/src/PlatformLinux.cpp

@@ -1036,11 +1036,14 @@ void handleConnectedGamepad(dev_t devId, const char* devPath, const char* sysFSI
     unsigned int numJS = gpInfo.numberOfJS;
     unsigned int numTR = gpInfo.numberOfTriggers;
 
+    // Ignore accelerometer devices that register themselves as joysticks. Ensure they have at least 2 buttons.s
+    if (btnsNum < 2)
+        return;
 
     Platform::gamepadEventConnectedInternal(handle,btnsNum,numJS,numTR,vendorId,productId,"",name);
-
     ConnectedGamepadDevInfo info = {devId,handle,gpInfo}; 
     __connectedGamepads.push_back(info);
+    
 }
 
 static float normalizeJoystickAxis(int axisValue, int deadZone, bool zeroToOne)

samples/browser/android/AndroidManifest.xml

@@ -4,16 +4,16 @@
         android:versionCode="1"
         android:versionName="1.0">
 
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-sdk android:minSdkVersion="15" />
 	<uses-feature android:glEsVersion="0x00020000"/>
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 
     <application android:icon="@drawable/icon" android:label="@string/app_name" android:hasCode="true">
         <activity android:name="android.app.NativeActivity"
-                android:label="@string/app_name"
-                android:configChanges="orientation|keyboardHidden"
-				android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
-				android:screenOrientation="landscape">
+                  android:label="@string/app_name"
+                  android:configChanges="orientation|keyboardHidden"
+				  android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
+				  sandroid:screenOrientation="landscape">
             <meta-data android:name="android.app.lib_name" android:value="sample-browser" />
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />

samples/character/android/AndroidManifest.xml

@@ -4,9 +4,9 @@
         android:versionCode="1"
         android:versionName="1.0">
 
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-    <uses-sdk android:minSdkVersion="15" />
+    <uses-sdk android:minSdkVersion="15"/>
 	<uses-feature android:glEsVersion="0x00020000"/>
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 
     <application android:icon="@drawable/icon" android:label="@string/app_name" android:hasCode="true">
         <activity android:name="android.app.NativeActivity"

samples/lua/android/AndroidManifest.xml

@@ -4,9 +4,9 @@
         android:versionCode="1"
         android:versionName="1.0">
 
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-sdk android:minSdkVersion="15" />
 	<uses-feature android:glEsVersion="0x00020000"/>
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 
     <application android:icon="@drawable/icon" android:label="@string/app_name" android:hasCode="true">
         <activity android:name="android.app.NativeActivity"

samples/mesh/android/AndroidManifest.xml

@@ -4,9 +4,9 @@
         android:versionCode="1"
         android:versionName="1.0">
 
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-sdk android:minSdkVersion="15" />
 	<uses-feature android:glEsVersion="0x00020000"/>
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 
     <application android:icon="@drawable/icon" android:label="@string/app_name" android:hasCode="true">
         <activity android:name="android.app.NativeActivity"

samples/particles/android/AndroidManifest.xml

@@ -4,9 +4,9 @@
         android:versionCode="1"
         android:versionName="1.0">
 
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-sdk android:minSdkVersion="15" />
 	<uses-feature android:glEsVersion="0x00020000"/>
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 
     <application android:icon="@drawable/icon" android:label="@string/app_name" android:hasCode="true">
         <activity android:name="android.app.NativeActivity"

samples/racer/android/AndroidManifest.xml

@@ -4,16 +4,16 @@
         android:versionCode="1"
         android:versionName="1.0">
 
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-sdk android:minSdkVersion="15" />
 	<uses-feature android:glEsVersion="0x00020000"/>
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 
     <application android:icon="@drawable/icon" android:label="@string/app_name" android:hasCode="true">
         <activity android:name="android.app.NativeActivity"
-                android:label="@string/app_name"
-                android:configChanges="orientation|keyboardHidden"
-				android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
-				android:screenOrientation="landscape">
+                  android:label="@string/app_name"
+                  android:configChanges="orientation|keyboardHidden"
+				  android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
+				  android:screenOrientation="landscape">
             <meta-data android:name="android.app.lib_name"
                     android:value="sample-racer" />
             <intent-filter>

samples/racer/android/build.xml

@@ -30,9 +30,6 @@
             <fileset dir="../../../gameplay/res/ui"/>
         </copy>
     </target>
-    
-    <target name="-post-compile">
-    </target>
 
     <!-- version-tag: 1 -->
     <import file="${sdk.dir}/tools/ant/build.xml" />

samples/spaceship/android/AndroidManifest.xml

@@ -4,10 +4,10 @@
         android:versionCode="1"
         android:versionName="1.0">
 
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-sdk android:minSdkVersion="15" />
 	<uses-feature android:glEsVersion="0x00020000"/>
-
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    
     <application android:icon="@drawable/icon" android:label="@string/app_name" android:hasCode="true">
         <activity android:name="android.app.NativeActivity"
                   android:label="@string/app_name"

template/android/template.AndroidManifest.xml

@@ -4,16 +4,16 @@
         android:versionCode="1"
         android:versionName="1.0">
 
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-sdk android:minSdkVersion="15" />
 	<uses-feature android:glEsVersion="0x00020000"/>
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 
     <application android:icon="@drawable/icon" android:label="@string/app_name" android:hasCode="true">
         <activity android:name="android.app.NativeActivity"
-                android:label="@string/app_name"
-                android:configChanges="orientation|keyboardHidden"
-				android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
-				android:screenOrientation="landscape">
+                  android:label="@string/app_name"
+                  android:configChanges="orientation|keyboardHidden"
+				  android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
+				  android:screenOrientation="landscape">
             <meta-data android:name="android.app.lib_name"
                     android:value="TEMPLATE_PROJECT" />
             <intent-filter>