commit 54cd561b6173352eb06a92a2b62d186ddbb4549d
author Michael Kolb <kolby@google.com> Tue Sep 07 12:44:10 2010 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Tue Sep 07 12:44:10 2010 -0700
tree 37cee4268095510e934b280121f42e59b14eda35
parent 344ff8b362aec733d3c73bb86f9819f8f549f891
parent 68775756e20243d73f273e4ce25ff3edeb148e41

Merge "disable zoom buttons"

src/com/android/browser/provider/BrowserProvider2.java

diff --git a/src/com/android/browser/provider/BrowserProvider2.java b/src/com/android/browser/provider/BrowserProvider2.java
index cba585e..28eed79 100644
--- a/src/com/android/browser/provider/BrowserProvider2.java
+++ b/src/com/android/browser/provider/BrowserProvider2.java
@@ -473,7 +473,7 @@
                 qb.setTables(TABLE_BOOKMARKS);
                 qb.setProjectionMap(BOOKMARKS_PROJECTION_MAP);
                 String bookmarksBarQuery = qb.buildQuery(projection,
-                        Bookmarks.PARENT + "=?",
+                        Bookmarks.PARENT + "=? AND " + Bookmarks.IS_DELETED + "=0",
                         null, null, null, null, null);
 
                 qb.setProjectionMap(OTHER_BOOKMARKS_PROJECTION_MAP);

tests/src/com/android/browser/JNIBindingsTestApp.java

diff --git a/tests/src/com/android/browser/JNIBindingsTestApp.java b/tests/src/com/android/browser/JNIBindingsTestApp.java
index 4f083f6..4c8802a 100644
--- a/tests/src/com/android/browser/JNIBindingsTestApp.java
+++ b/tests/src/com/android/browser/JNIBindingsTestApp.java
@@ -37,6 +37,9 @@
 /**
  * Adds a JavaScript interface to the webview and calls functions on it to verify variables
  * are passed from JS to Java correctly.
+ * To run this test, execute:
+ * adb shell am instrument -w -e class com.android.browser.JNIBindingsTestApp#testJNIBindings \
+ *     com.android.browser.tests/android.test.InstrumentationTestRunner
  */
 public class JNIBindingsTestApp extends ActivityInstrumentationTestCase2<BrowserActivity> {
 
@@ -89,7 +92,7 @@
                     }
                 }
             };
-            mWebView.documentAsText(mHandler.obtainMessage(MSG_WEBKIT_DATA_READY));
+            mWebView.documentAsText(mHandler.obtainMessage(MSG_WEBKIT_DATA_READY, 1, 0));
             Looper.loop();
         }
     }