From 99cdf9686d4443d7bff9e44c40fe09883e165728 Mon Sep 17 00:00:00 2001
From: Joe Bowser <bowserj@volti.(none)>
Date: Thu, 12 Nov 2009 10:51:22 -0800
Subject: [PATCH] Fixes to rendering of Webkit on browser

---
 AndroidManifest.xml                | 7 +++++++
 assets/www/index.html              | 8 ++++----
 src/com/phonegap/AudioHandler.java | 2 +-
 src/com/phonegap/DroidGap.java     | 2 ++
 src/com/phonegap/PhoneGap.java     | 4 +---
 5 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 6d974b43..399a6e40 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,6 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
       package="com.phonegap" android:versionName="1.1" android:versionCode="3">
+    <supports-screens
+    	android:largeScreens="true"
+    	android:normalScreens="true"
+    	android:smallScreens="true"
+    	android:resizeable="true"
+    	android:anyDensity="true"
+    	/>
     <uses-permission android:name="android.permission.CAMERA" />
     <uses-permission android:name="android.permission.VIBRATE" />
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
diff --git a/assets/www/index.html b/assets/www/index.html
index 2be58b3c..1303e89f 100644
--- a/assets/www/index.html
+++ b/assets/www/index.html
@@ -9,11 +9,12 @@
 	  <script type="text/javascript" charset="utf-8" src="phonegap.js"></script>	  
 	  <script type="text/javascript" charset="utf-8">
 	  
-    var deviceInfo = function(){
-      console.log('setting the dom nodes');            
+    var deviceInfo = function(){      
       document.getElementById("platform").innerHTML = device.platform;
       document.getElementById("version").innerHTML = device.version;
       document.getElementById("uuid").innerHTML = device.uuid;
+      console.log("Height:" + window.innerHeight);
+	  console.log("Width:" + window.innerWidth);
     }
     
     var getLocation = function() {
@@ -103,8 +104,7 @@
 
 	function init(){
 		document.addEventListener("touchmove", preventBehavior, false);
-		document.addEventListener("deviceReady", deviceInfo, true);
-		console.log('we are in init');
+		document.addEventListener("deviceReady", deviceInfo, true);		
 	}
 
 	
diff --git a/src/com/phonegap/AudioHandler.java b/src/com/phonegap/AudioHandler.java
index 576c6b7e..b971873a 100644
--- a/src/com/phonegap/AudioHandler.java
+++ b/src/com/phonegap/AudioHandler.java
@@ -25,7 +25,7 @@ public class AudioHandler implements OnCompletionListener, OnPreparedListener, O
 	public AudioHandler(String file, Context ctx) {
 		this.recording = file;
 		this.mCtx = ctx;
-	}
+	}	
 	
 	protected void startRecording(String file){
 		if (!isRecording){
diff --git a/src/com/phonegap/DroidGap.java b/src/com/phonegap/DroidGap.java
index c0ecb65f..62d5da1b 100644
--- a/src/com/phonegap/DroidGap.java
+++ b/src/com/phonegap/DroidGap.java
@@ -37,6 +37,7 @@ import android.webkit.JsResult;
 import android.webkit.WebChromeClient;
 import android.webkit.WebSettings;
 import android.webkit.WebView;
+import android.webkit.WebSettings.LayoutAlgorithm;
 
 public class DroidGap extends Activity {
 	
@@ -68,6 +69,7 @@ public class DroidGap extends Activity {
         WebSettings settings = appView.getSettings();
         settings.setJavaScriptEnabled(true);
         settings.setJavaScriptCanOpenWindowsAutomatically(true);
+        settings.setLayoutAlgorithm(LayoutAlgorithm.NORMAL);
 
         
         /* Bind the appView object to the gap class methods */
diff --git a/src/com/phonegap/PhoneGap.java b/src/com/phonegap/PhoneGap.java
index a3e99b13..edc1cdd5 100644
--- a/src/com/phonegap/PhoneGap.java
+++ b/src/com/phonegap/PhoneGap.java
@@ -47,15 +47,13 @@ public class PhoneGap{
 	private Context mCtx;
     private WebView mAppView;
     SmsListener mSmsListener;
-    DirectoryManager fileManager;
     AudioHandler audio; 
     
 	public PhoneGap(Context ctx, WebView appView) {
         this.mCtx = ctx;
         this.mAppView = appView;
 
-        mSmsListener = new SmsListener(ctx,mAppView);
-        fileManager = new DirectoryManager();
+        mSmsListener = new SmsListener(ctx,mAppView);        
         audio = new AudioHandler("/sdcard/tmprecording.mp3", ctx);
         uuid = getUuid();
     }