Preparing for 2.4.0

Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cordova-android
CB-2296 - Adding the screenshot configuration
2026-01-30 00:05:28 +08:00 · 2013-02-04 11:12:52 -08:00 · 2013-01-31 10:45:02 -08:00 · 2013-01-31 10:44:46 -08:00 · 2013-01-30 14:57:49 -08:00 · 2013-01-30 11:31:59 -08:00
8 changed files with 70 additions and 10 deletions
--- a/2
+++ b/2
@@ -1 +1 @@
-2.4.0rc2
+2.4.0
--- a/bin/create.js
+++ b/bin/create.js
@@ -33,12 +33,22 @@ function read(filename) {
    f.Close();
    return s;
 }
+
+function checkTargets(targets) {
+    if(!targets) {
+        WScript.Echo("You do not have any android targets setup. Please create at least one target with the `android` command");
+        WScript.Quit(69);
+    }
+}
+
 function setTarget() {
    var targets = shell.Exec('android.bat list targets').StdOut.ReadAll().match(/id:\s\d+/g);
+    checkTargets(targets);
    return targets[targets.length - 1].replace(/id: /, ""); // TODO: give users the option to set their target 
 }
 function setApiLevel() {
    var targets = shell.Exec('android.bat list targets').StdOut.ReadAll().match(/API level:\s\d+/g);
+    checkTargets(targets);
    return targets[targets.length - 1].replace(/API level: /, "");
 }
 function write(filename, contents) {
--- a/bin/templates/project/assets/www/index.html
+++ b/bin/templates/project/assets/www/index.html
@@ -33,7 +33,7 @@
                <p class="event received">Device is Ready</p>
            </div>
        </div>
-        <script type="text/javascript" src="cordova-2.4.0rc2.js"></script>
+        <script type="text/javascript" src="cordova-2.4.0.js"></script>
        <script type="text/javascript" src="js/index.js"></script>
        <script type="text/javascript">
            app.initialize();
--- a/framework/assets/js/cordova.android.js
+++ b/framework/assets/js/cordova.android.js
@@ -1,8 +1,8 @@
 // Platform: android

-// commit e784eee3ce02dbd475e3c3f70031668f1706f2ec
+// commit ac725f6ae0bd655789771e2a40b8d60cb4c8c221

-// File generated at :: Wed Jan 30 2013 09:20:09 GMT-0500 (EST)
+// File generated at :: Mon Feb 04 2013 10:59:03 GMT-0800 (PST)

 /*
 Licensed to the Apache Software Foundation (ASF) under one
@@ -1665,6 +1665,7 @@ module.exports = {
        CELL_2G: "2g",
        CELL_3G: "3g",
        CELL_4G: "4g",
+        CELL:"cellular",
        NONE: "none"
 };

--- a/framework/assets/www/index.html
+++ b/framework/assets/www/index.html
@@ -19,7 +19,7 @@
 <html>
  <head>
    <title></title>
-    <script src="cordova-2.4.0rc2.js"></script>
+    <script src="cordova-2.4.0.js"></script>
  </head>
  <body>

--- a/framework/src/org/apache/cordova/Config.java
+++ b/framework/src/org/apache/cordova/Config.java
@@ -35,6 +35,7 @@ import org.xmlpull.v1.XmlPullParserException;
 import android.app.Activity;

 import android.content.res.XmlResourceParser;
+import android.graphics.Color;

 import android.util.Log;

@@ -103,12 +104,56 @@ public class Config {
                }
                else if (strNode.equals("preference")) {
                    String name = xml.getAttributeValue(null, "name");
-                    String value = xml.getAttributeValue(null, "value");
-
+                    /* Java 1.6 does not support switch-based strings
+                       Java 7 does, but we're using Dalvik, which is apparently not Java.
+                       Since we're reading XML, this has to be an ugly if/else.
+                       
+                       Also, due to cast issues, each of them has to call their separate putExtra!  
+                       Wheee!!! Isn't Java FUN!?!?!?
+                       
+                       Note: We should probably pass in the classname for the variable splash on splashscreen!
+                       */
+                    if(name.equals("splashscreen")) {
+                        String value = xml.getAttributeValue(null, "value");
+                        int resource = 0;
+                        if (value != null)
+                        {
+                            value = "splash";
+                        }
+                        resource = action.getResources().getIdentifier(value, "drawable", action.getPackageName());
+                        
+                        action.getIntent().putExtra(name, resource);
+                        LOG.i("CordovaLog", "Found preference for %s=%s", name, value);
+                        Log.d("CordovaLog", "Found preference for " + name + "=" + value);
+                    }
+                    else if(name.equals("backgroundColor")) {
+                        int value = xml.getAttributeIntValue(null, "value", Color.BLACK);
+                        action.getIntent().putExtra(name, value);
+                        LOG.i("CordovaLog", "Found preference for %s=%d", name, value);
+                        Log.d("CordovaLog", "Found preference for " + name + "=" + Integer.toString(value));
+                    }
+                    else if(name.equals("loadUrlTimeoutValue")) {
+                        int value = xml.getAttributeIntValue(null, "value", 20000);
+                        action.getIntent().putExtra(name, value);
+                        LOG.i("CordovaLog", "Found preference for %s=%d", name, value);
+                        Log.d("CordovaLog", "Found preference for " + name + "=" + Integer.toString(value));
+                    }
+                    else if(name.equals("keepRunning"))
+                    {
+                        boolean value = xml.getAttributeValue(null, "value").equals("true");
+                        action.getIntent().putExtra(name, value);
+                    }
+                    else
+                    {
+                        String value = xml.getAttributeValue(null, "value");
+                        action.getIntent().putExtra(name, value);
+                        LOG.i("CordovaLog", "Found preference for %s=%s", name, value);
+                        Log.d("CordovaLog", "Found preference for " + name + "=" + value);
+                    }
+                    /*
                    LOG.i("CordovaLog", "Found preference for %s=%s", name, value);
                    Log.d("CordovaLog", "Found preference for " + name + "=" + value);
-
-                    action.getIntent().putExtra(name, value);
+                     */
                }
                else if (strNode.equals("content")) {
                    String src = xml.getAttributeValue(null, "src");
--- a/framework/src/org/apache/cordova/Device.java
+++ b/framework/src/org/apache/cordova/Device.java
@@ -39,7 +39,7 @@ import android.telephony.TelephonyManager;
 public class Device extends CordovaPlugin {
    public static final String TAG = "Device";

-    public static String cordovaVersion = "2.4.0rc2";              // Cordova version
+    public static String cordovaVersion = "2.4.0";              // Cordova version
    public static String platform = "Android";                  // Device OS
    public static String uuid;                                  // Device UUID

--- a/framework/src/org/apache/cordova/DroidGap.java
+++ b/framework/src/org/apache/cordova/DroidGap.java
@@ -591,6 +591,7 @@ public class DroidGap extends Activity implements CordovaInterface {
     * @param value
     */
    public void setBooleanProperty(String name, boolean value) {
+        Log.d(TAG, "Setting boolean properties in DroidGap will be deprecated in 3.0 on July 2013, please use config.xml");
        this.getIntent().putExtra(name, value);
    }

@@ -601,6 +602,7 @@ public class DroidGap extends Activity implements CordovaInterface {
     * @param value
     */
    public void setIntegerProperty(String name, int value) {
+        Log.d(TAG, "Setting integer properties in DroidGap will be deprecated in 3.1 on August 2013, please use config.xml");
        this.getIntent().putExtra(name, value);
    }

@@ -611,6 +613,7 @@ public class DroidGap extends Activity implements CordovaInterface {
     * @param value
     */
    public void setStringProperty(String name, String value) {
+        Log.d(TAG, "Setting string properties in DroidGap will be deprecated in 3.0 on July 2013, please use config.xml");
        this.getIntent().putExtra(name, value);
    }

@@ -621,6 +624,7 @@ public class DroidGap extends Activity implements CordovaInterface {
     * @param value
     */
    public void setDoubleProperty(String name, double value) {
+        Log.d(TAG, "Setting double properties in DroidGap will be deprecated in 3.0 on July 2013, please use config.xml");
        this.getIntent().putExtra(name, value);
    }
Author	SHA1	Message	Date
Joe Bowser	db099e7722	Preparing for 2.4.0	2013-02-04 11:12:52 -08:00
Joe Bowser	fcc01bc37e	Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cordova-android	2013-01-31 10:45:02 -08:00
Joe Bowser	a18dacf5f2	CB-2296 - Adding the screenshot configuration	2013-01-31 10:44:46 -08:00
Anis Kadri	77f9cae50b	CB-1961 update to create script for android/windows	2013-01-30 14:57:49 -08:00
Joe Bowser	3610bbf21b	CB-2296: Adding deprecation notices for removing the setProperties methods	2013-01-30 11:31:59 -08:00
Joe Bowser	d5e3be9a55	Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cordova-android	2013-01-30 11:13:28 -08:00
Joe Bowser	80b369d6d5	CB-2296: Added parsing for Integer and Boolean parameters in config.xml	2013-01-30 11:13:07 -08:00
@@ -1 +1 @@
 .4.0rc2
 .4.0