Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incu…

…bator-cordova-android
apache · Apr 5, 2012 · aa00e07 · aa00e07
2 parents cb473df + 8b05ce4
commit aa00e07
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/bin/templates/project/cordova/templates/project/AndroidManifest.xml b/bin/templates/project/cordova/templates/project/AndroidManifest.xml
@@ -39,11 +39,6 @@
 				<category android:name="android.intent.category.LAUNCHER" />
 			</intent-filter>
         </activity>
-        <activity android:name="org.apache.cordova.DroidGap" android:label="@string/app_name" 
-            	  android:configChanges="orientation|keyboardHidden">
-        	<intent-filter>
-        	</intent-filter>
-        </activity>
     </application>
 
 	<uses-sdk android:minSdkVersion="5" />

diff --git a/bin/templates/project/cordova/templates/project/assets/www/index.html b/bin/templates/project/cordova/templates/project/assets/www/index.html
@@ -5,12 +5,12 @@
     <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.5.0.js"></script>
+	  <script type="text/javascript" charset="utf-8" src="cordova-1.6.0rc1.js"></script>
 	  <script type="text/javascript" charset="utf-8" src="main.js"></script>
 
   </head>
   <body onload="init();" id="stage" class="theme">
-    <h1>Welcome to PhoneGap!</h1>
+    <h1>Welcome to Cordova!</h1>
     <h2>this file is located at assets/www/index.html</h2>
     <div id="info">
         <h4>Platform: <span id="platform"> &nbsp;</span>,   Version: <span id="version">&nbsp;</span></h4>