Update Android platform.

FossilOrigin-Name: edf283836d9b5de88caca8a0b52ab60420cdffbc
jaccarmac · Apr 26, 2015 · 9ba3ca0 · 9ba3ca0
1 parent 21465fb
commit 9ba3ca0
Show file tree

Hide file tree

Showing 141 changed files with 4,439 additions and 17,855 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,4 @@
 /cordova/www/js/draftboys.js
 /cordova/platforms/android/assets/www/
-/cordova/platforms/android/ant-build/
-/cordova/platforms/android/CordovaLib/ant-build/
+/cordova/platforms/android/.gradle/
+/cordova/platforms/android/CordovaLib/build/
diff --git a/cordova/config.xml b/cordova/config.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<widget id="com.jaccarmac.draftboys" version="0.5.1"
+<widget id="com.jaccarmac.draftboys" version="0.5.2"
         xmlns="http://www.w3.org/ns/widgets"
         xmlns:cdv="http://cordova.apache.org/ns/1.0">
   <name>DRAFTBOYS</name>
@@ -10,5 +10,15 @@
     Jacob MacDonald
   </author>
   <content src="index.html" />
+  <plugin name="cordova-plugin-whitelist" version="1" />
   <access origin="*" />
+  <allow-intent href="http://*/*" />
+  <allow-intent href="https://*/*" />
+  <allow-intent href="tel:*" />
+  <allow-intent href="sms:*" />
+  <allow-intent href="mailto:*" />
+  <allow-intent href="geo:*" />
+  <platform name="android">
+    <allow-intent href="market:*" />
+  </platform>
 </widget>
diff --git a/cordova/platforms/android/.gitignore b/cordova/platforms/android/.gitignore
@@ -5,7 +5,7 @@ local.properties
 /gradlew.bat
 /gradle
 # Ant builds
-ant-built
+ant-build
 ant-gen
 # Eclipse builds
 gen

diff --git a/cordova/platforms/android/.project b/cordova/platforms/android/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>D R A F T B O Y S</name>
+	<name>DRAFTBOYS</name>
 	<comment></comment>
 	<projects>
 	</projects>

diff --git a/cordova/platforms/android/AndroidManifest.xml b/cordova/platforms/android/AndroidManifest.xml
@@ -1,14 +1,16 @@
 <?xml version='1.0' encoding='utf-8'?>
-<manifest android:hardwareAccelerated="true" android:versionCode="501" android:versionName="0.5.1" package="com.jaccarmac.draftboys" xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest android:hardwareAccelerated="true" android:versionCode="502" android:versionName="0.5.2" package="com.jaccarmac.draftboys" xmlns:android="http://schemas.android.com/apk/res/android">
     <supports-screens android:anyDensity="true" android:largeScreens="true" android:normalScreens="true" android:resizeable="true" android:smallScreens="true" android:xlargeScreens="true" />
     <uses-permission android:name="android.permission.INTERNET" />
-    <application android:hardwareAccelerated="true" android:icon="@drawable/icon" android:label="@string/app_name">
-        <activity android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale" android:label="@string/activity_name" android:launchMode="singleTop" android:name="CordovaApp" android:theme="@android:style/Theme.Black.NoTitleBar" android:windowSoftInputMode="adjustResize">
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+    <application android:hardwareAccelerated="true" android:icon="@drawable/icon" android:label="@string/app_name" android:supportsRtl="true">
+        <activity android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale" android:label="@string/activity_name" android:launchMode="singleTop" android:name="MainActivity" android:theme="@android:style/Theme.Black.NoTitleBar" android:windowSoftInputMode="adjustResize">
             <intent-filter android:label="@string/launcher_name">
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
     </application>
-    <uses-sdk android:minSdkVersion="10" android:targetSdkVersion="19" />
+    <uses-sdk android:minSdkVersion="10" android:targetSdkVersion="22" />
 </manifest>
diff --git a/cordova/platforms/android/CordovaLib/.project b/cordova/platforms/android/CordovaLib/.project
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?><projectDescription><name>CordovaApp-CordovaLib</name></projectDescription>
+<?xml version="1.0" encoding="UTF-8"?><projectDescription><name>MainActivity-CordovaLib</name></projectDescription>
diff --git a/cordova/platforms/android/CordovaLib/project.properties b/cordova/platforms/android/CordovaLib/project.properties
@@ -10,7 +10,7 @@
 # Indicates whether an apk should be generated for each density.
 split.density=false
 # Project target.
-target=android-21
+target=android-22
 apk-configurations=
 renderscript.opt.level=O0
 android.library=true
diff --git a/cordova/platforms/android/CordovaLib/src/com/squareup/okhttp/Address.java b/cordova/platforms/android/CordovaLib/src/com/squareup/okhttp/Address.java
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<?xml version="1.0" encoding="UTF-8"?><projectDescription><name>CordovaApp-CordovaLib</name></projectDescription>
		<?xml version="1.0" encoding="UTF-8"?><projectDescription><name>MainActivity-CordovaLib</name></projectDescription>