Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cordova-android into CordovaWebView

VERSION

@@ -1 +1 @@
-1.6.0
+1.6.1

bin/templates/project/cordova/templates/project/assets/www/index.html

@@ -5,7 +5,7 @@
     <meta http-equiv="Content-type" content="text/html; charset=utf-8">
     <title>PhoneGap</title>
       <link rel="stylesheet" href="master.css" type="text/css" media="screen" title="no title">
-	  <script type="text/javascript" charset="utf-8" src="cordova-1.6.0"></script>
+      <script type="text/javascript" charset="utf-8" src="cordova-1.6.1"></script>
       <script type="text/javascript" charset="utf-8" src="main.js"></script>
 
   </head>

bin/templates/project/cordova/templates/project/res/xml/cordova.xml

@@ -1,5 +1,37 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!-- 
+       Licensed to the Apache Software Foundation (ASF) under one
+       or more contributor license agreements.  See the NOTICE file
+       distributed with this work for additional information
+       regarding copyright ownership.  The ASF licenses this file
+       to you under the Apache License, Version 2.0 (the
+       "License"); you may not use this file except in compliance
+       with the License.  You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing,
+       software distributed under the License is distributed on an
+       "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+       KIND, either express or implied.  See the License for the
+       specific language governing permissions and limitations
+       under the License.
+-->
 <cordova>
-    <access origin="http://127.0.0.1*"/>
+	<!--  
+	access elements control the Android whitelist.  
+	Domains are assumed blocked unless set otherwise
+	 -->
+
+    <access origin="http://127.0.0.1*"/> <!-- allow local pages -->
+
+	<!-- <access origin="https://example.com" /> allow any secure requests to example.com -->
+	<!-- <access origin="https://example.com" subdomains="true" /> such as above, but including subdomains, such as www -->
+	<!-- <access origin=".*"/> Allow all domains, suggested development use only -->
+
     <log level="DEBUG"/>
+    <preference name="classicRender" value="true" />
 </cordova>
+
+
+

bin/templates/project/cordova/templates/project/res/xml/plugins.xml

@@ -1,4 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!-- 
+       Licensed to the Apache Software Foundation (ASF) under one
+       or more contributor license agreements.  See the NOTICE file
+       distributed with this work for additional information
+       regarding copyright ownership.  The ASF licenses this file
+       to you under the Apache License, Version 2.0 (the
+       "License"); you may not use this file except in compliance
+       with the License.  You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing,
+       software distributed under the License is distributed on an
+       "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+       KIND, either express or implied.  See the License for the
+       specific language governing permissions and limitations
+       under the License.
+-->
 <plugins>
     <plugin name="App" value="org.apache.cordova.App"/>
     <plugin name="Geolocation" value="org.apache.cordova.GeoBroker"/>
@@ -9,7 +27,7 @@
     <plugin name="Camera" value="org.apache.cordova.CameraLauncher"/>
     <plugin name="Contacts" value="org.apache.cordova.ContactManager"/>
     <plugin name="File" value="org.apache.cordova.FileUtils"/>
-    <plugin name="Network Status" value="org.apache.cordova.NetworkManager"/>
+    <plugin name="NetworkStatus" value="org.apache.cordova.NetworkManager"/>
     <plugin name="Notification" value="org.apache.cordova.Notification"/>
     <plugin name="Storage" value="org.apache.cordova.Storage"/>
     <plugin name="Temperature" value="org.apache.cordova.TempListener"/>

framework/assets/js/cordova.android.js

@@ -1,4 +1,6 @@
-// File generated at :: Wed Apr 11 2012 10:34:53 GMT-0400 (EDT)
+// commit 9451ff3c5517ba9ba4a2c062633686bb3a993f52
+
+// File generated at :: Thu Apr 12 2012 16:36:23 GMT-0700 (PDT)
 
 /*
  Licensed to the Apache Software Foundation (ASF) under one

framework/assets/www/index.html

@@ -19,7 +19,7 @@
 <html>
   <head>
     <title></title>
-    <script src="cordova-1.6.0.js"></script>
+    <script src="cordova-1.6.1.js"></script>
   </head>
   <body>
 

framework/src/org/apache/cordova/Device.java

@@ -38,7 +38,7 @@ import android.telephony.TelephonyManager;
 public class Device extends Plugin {
     public static final String TAG = "Device";
 
-    public static String cordovaVersion = "1.6.0";              // Cordova version
+    public static String cordovaVersion = "1.6.1";              // Cordova version
     public static String platform = "Android";                  // Device OS
     public static String uuid;                                  // Device UUID