From 543fe1f43f8a0079958cf0f9563a1ff61ed5dbd3 Mon Sep 17 00:00:00 2001
From: Joe Bowser <joe.bowser@nitobi.com>
Date: Thu, 20 Oct 2011 11:13:44 -0700
Subject: [PATCH 1/2] Upgrading to Ice Cream Sandwich

---
 framework/build.xml | 90 +++++++++++++++++++--------------------------
 1 file changed, 38 insertions(+), 52 deletions(-)

diff --git a/framework/build.xml b/framework/build.xml
index 9c9a52b8..bedf4b60 100755
--- a/framework/build.xml
+++ b/framework/build.xml
@@ -9,70 +9,54 @@
     </loadfile>
 
     <!-- The local.properties file is created and updated by the 'android' tool.
-         It contains the path to the SDK. It should *NOT* be checked in in Version
-         Control Systems. -->
-    <property file="local.properties" />
+         It contains the path to the SDK. It should *NOT* be checked into
+         Version Control Systems. -->
+    <loadproperties srcFile="local.properties" />
 
-    <!-- The build.properties file can be created by you and is never touched
-         by the 'android' tool. This is the place to change some of the default property values
-         used by the Ant rules.
+    <!-- The ant.properties file can be created by you. It is only edited by the
+         'android' tool to add properties to it.
+         This is the place to change some Ant specific build properties.
          Here are some properties you may want to change/update:
 
-         application.package
-             the name of your application package as defined in the manifest. Used by the
-             'uninstall' rule.
          source.dir
-             the name of the source directory. Default is 'src'.
+             The name of the source directory. Default is 'src'.
          out.dir
-             the name of the output directory. Default is 'bin'.
+             The name of the output directory. Default is 'bin'.
 
-         Properties related to the SDK location or the project target should be updated
-          using the 'android' tool with the 'update' action.
+         For other overridable properties, look at the beginning of the rules
+         files in the SDK, at tools/ant/build.xml
 
-         This file is an integral part of the build system for your application and
-         should be checked in in Version Control Systems.
+         Properties related to the SDK location or the project target should
+         be updated using the 'android' tool with the 'update' action.
+
+         This file is an integral part of the build system for your
+         application and should be checked into Version Control Systems.
 
          -->
-    <property file="build.properties" />
+    <property file="ant.properties" />
+
+    <!-- The project.properties file is created and updated by the 'android'
+         tool, as well as ADT.
+
+         This contains project specific properties such as project target, and library
+         dependencies. Lower level build properties are stored in ant.properties
+         (or in .classpath for Eclipse projects).
+
+         This file is an integral part of the build system for your
+         application and should be checked into Version Control Systems. -->
+    <loadproperties srcFile="project.properties" />
 
-    <!-- The default.properties file is created and updated by the 'android' tool, as well
-         as ADT.
-         This file is an integral part of the build system for your application and
-         should be checked in in Version Control Systems. -->
-    <property file="default.properties" />
-    
-    <!-- We need to setup the double quote. -->
     <property name="dblQuote">"</property>
 
-    <!-- Custom Android task to deal with the project target, and import the proper rules.
-         This requires ant 1.6.0 or above. -->
-    <path id="android.antlibs">
-        <pathelement path="${sdk.dir}/tools/lib/anttasks.jar" />
-        <pathelement path="${sdk.dir}/tools/lib/sdklib.jar" />
-        <pathelement path="${sdk.dir}/tools/lib/androidprefs.jar" />
-        <pathelement path="${sdk.dir}/tools/lib/apkbuilder.jar" />
-        <pathelement path="${sdk.dir}/tools/lib/jarutils.jar" />
-    </path>
+    <!-- quick check on sdk.dir -->
+    <fail
+            message="sdk.dir is missing. Make sure to generate local.properties using 'android update project'"
+            unless="sdk.dir"
+    />
 
-    <taskdef name="setup"
-        classname="com.android.ant.SetupTask"
-        classpathref="android.antlibs" />
+    <!-- version-tag: custom -->
+    <import file="${sdk.dir}/tools/ant/build.xml" />
 
-    <!-- Execute the Android Setup task that will setup some properties specific to the target,
-         and import the build rules files.
-
-         The rules file is imported from
-            <SDK>/platforms/<target_platform>/templates/android_rules.xml
-
-         To customize some build steps for your project:
-         - copy the content of the main node <project> from android_rules.xml
-         - paste it in this build.xml below the <setup /> task.
-         - disable the import by changing the setup task below to <setup import="false" />
-
-         This will ensure that the properties are setup correctly but that your customized
-         build steps are used.
-    -->
-    <setup />
 
     <target name="check-javascript" depends="build-javascript">
         <delete dir="assets/lib"/>
@@ -122,7 +106,8 @@
          <fileset file="assets/www/index.html" /> 
          <!-- <fileset file="../bin/templates/project/assets/www/index.html" /> -->
       </replaceregexp>
-      <replaceregexp match="phonegapVersion = [\u0022].*[\u0022];" replace="phonegapVersion = ${dblQuote}${version}${dblQuote};" byline="true">
+      <!-- This is sketchy, but it works, ${dblQuote} does not -->
+      <replaceregexp match="phonegapVersion = [\u0022].*[\u0022];" replace='phonegapVersion = ${dblQuote}${version}${dblQuote};' byline="true">
         <fileset file="src/com/phonegap/Device.java" />
       </replaceregexp>
         
@@ -133,7 +118,7 @@
     <!-- Build PhoneGap jar file that includes all native code, and PhoneGap JS file
          that includes all JavaScript code.
     -->
-    <target name="jar" depends="build-javascript, compile">
+    <target name="jar" depends="build-javascript, -compile">
       <jar jarfile="phonegap-${version}.jar" basedir="bin/classes" excludes="com/phonegap/R.class,com/phonegap/R$*.class"/>
     </target>
 
@@ -144,4 +129,5 @@
     </target>
 
 
+
 </project>

From 3e25953d33c1fc3774f49a083fe86f1b97b27017 Mon Sep 17 00:00:00 2001
From: Joe Bowser <joe.bowser@nitobi.com>
Date: Fri, 21 Oct 2011 10:34:59 -0700
Subject: [PATCH 2/2] HTC Fix

---
 framework/src/com/phonegap/DroidGap.java | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/framework/src/com/phonegap/DroidGap.java b/framework/src/com/phonegap/DroidGap.java
index 3f79ec7f..180265eb 100755
--- a/framework/src/com/phonegap/DroidGap.java
+++ b/framework/src/com/phonegap/DroidGap.java
@@ -42,6 +42,7 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.view.Window;
 import android.view.WindowManager;
+import android.webkit.ConsoleMessage;
 import android.webkit.GeolocationPermissions.Callback;
 import android.webkit.JsPromptResult;
 import android.webkit.JsResult;
@@ -277,6 +278,9 @@ public class DroidGap extends PhonegapActivity {
         settings.setJavaScriptEnabled(true);
         settings.setJavaScriptCanOpenWindowsAutomatically(true);
         settings.setLayoutAlgorithm(LayoutAlgorithm.NORMAL);
+        
+        //Set the nav dump for HTC
+        settings.setNavDump(true);
 
         // Enable database
         settings.setDatabaseEnabled(true);
@@ -1102,9 +1106,15 @@ public class DroidGap extends PhonegapActivity {
         @Override
         public void onConsoleMessage(String message, int lineNumber, String sourceID)
         {       
-            // This is a kludgy hack!!!!
             LOG.d(TAG, "%s: Line %d : %s", sourceID, lineNumber, message);              
         }
+        
+        @Override
+        public boolean onConsoleMessage(ConsoleMessage consoleMessage)
+        {       
+            LOG.d(TAG, consoleMessage.message());
+            return true;
+        }
 
         @Override
         /**