public/cordova-android
public/cordova-android
9
0
Fork 0
forked from github/cordova-android
Code Pull Requests Activity

Tagging to 1.9.0

Browse Source
This commit is contained in:
macdonst 2012-06-29 15:55:03 -04:00
parent ae7a550a09
commit 2a8b9ab75e
6 changed files with 46 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION
View File

@ -1 +1 @@
1.9.0rc1 1.9.0

2
bin/templates/project/assets/www/index.html
View File

@ -23,7 +23,7 @@
<meta http-equiv="Content-type" content="text/html; charset=utf-8"> <meta http-equiv="Content-type" content="text/html; charset=utf-8">
<title>PhoneGap</title> <title>PhoneGap</title>
<link rel="stylesheet" href="master.css" type="text/css" media="screen" title="no 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.9.0rc1.js"></script> <script type="text/javascript" charset="utf-8" src="cordova-1.9.0.js"></script>
<script type="text/javascript" charset="utf-8" src="main.js"></script> <script type="text/javascript" charset="utf-8" src="main.js"></script>
</head> </head>

4
framework/assets/js/cordova.android.js
View File

@ -1,6 +1,6 @@
// commit 25033fceac7c800623f1f16881b784d19eba69cc // commit 5647225e12e18e15aefc33b151430d9a3804d9ea
// File generated at :: Thu Jun 21 2012 10:45:32 GMT-0700 (PDT) // File generated at :: Fri Jun 29 2012 12:32:24 GMT-0400 (EDT)
/* /*
Licensed to the Apache Software Foundation (ASF) under one Licensed to the Apache Software Foundation (ASF) under one

2
framework/assets/www/index.html
View File

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

3
framework/src/org/apache/cordova/CordovaWebView.java
View File

@ -625,6 +625,7 @@ public class CordovaWebView extends WebView {
String value = xml.getAttributeValue(null, "value"); String value = xml.getAttributeValue(null, "value");
LOG.i("CordovaLog", "Found preference for %s=%s", name, value); LOG.i("CordovaLog", "Found preference for %s=%s", name, value);
Log.d("CordovaLog", "Found preference for " + name + "=" + value);
// Save preferences in Intent // Save preferences in Intent
this.cordova.getActivity().getIntent().putExtra(name, value); this.cordova.getActivity().getIntent().putExtra(name, value);
@ -640,7 +641,7 @@ public class CordovaWebView extends WebView {
} }
// Init preferences // Init preferences
if ("true".equals(this.getProperty("useBrowserHistory", "true"))) { if ("true".equals(this.getProperty("useBrowserHistory", "false"))) {
this.useBrowserHistory = true; this.useBrowserHistory = true;
} }
else { else {

2
framework/src/org/apache/cordova/Device.java
View File

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