Merge change 3487 into donut
* changes:
Update browser icons - possibly not final.
diff --git a/Android.mk b/Android.mk
index 02ba333..33cd6ab 100644
--- a/Android.mk
+++ b/Android.mk
@@ -3,10 +3,6 @@
LOCAL_MODULE_TAGS := user
-# TODO: Remove dependency of application on the test runner (android.test.runner)
-# library.
-LOCAL_JAVA_LIBRARIES := android.test.runner
-
LOCAL_STATIC_JAVA_LIBRARIES := google-framework
LOCAL_SRC_FILES := $(call all-subdir-java-files)
@@ -14,3 +10,6 @@
LOCAL_PACKAGE_NAME := Browser
include $(BUILD_PACKAGE)
+
+# additionally, build tests in sub-folders in a separate .apk
+include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index e9aff63..0cc9538 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -49,9 +49,6 @@
android:label="@string/application_name"
android:icon="@drawable/ic_launcher_browser"
android:taskAffinity="android.task.browser" >
- <!-- TODO: Remove dependency of application on the test runner
- (android.test) library. -->
- <uses-library android:name="android.test.runner" />
<provider android:name="BrowserProvider"
android:authorities="browser"
@@ -212,23 +209,5 @@
</application>
- <!-- Browser tests. Invoke with: -->
- <!-- adb shell am instrument -w com.android.browser/.BrowserTestRunner -->
- <instrumentation android:name="BrowserTestRunner"
- android:targetPackage="com.android.browser"
- android:label="@string/activity_instrumentation_test_runner"
- />
- <!-- Browser tests. Invoke with: -->
- <!-- adb shell am instrument -w com.android.browser/.BrowserFunctionalTestRunner -->
- <instrumentation android:name="BrowserFunctionalTestRunner"
- android:targetPackage="com.android.browser"
- android:label="@string/activity_instrumentation_functional_test_runner"
- />
-
- <instrumentation android:name="BrowserLaunchPerformance"
- android:targetPackage="com.android.browser"
- android:label="Browser Launch Performance"
- />
-
</manifest>
diff --git a/src/com/android/browser/BrowserActivity.java b/src/com/android/browser/BrowserActivity.java
index 53814f2..3252da3 100644
--- a/src/com/android/browser/BrowserActivity.java
+++ b/src/com/android/browser/BrowserActivity.java
@@ -1387,6 +1387,9 @@
mCanChord = true;
int id = item.getItemId();
final WebView webView = getTopWindow();
+ if (null == webView) {
+ return false;
+ }
final HashMap hrefMap = new HashMap();
hrefMap.put("webview", webView);
final Message msg = mHandler.obtainMessage(
@@ -1442,6 +1445,9 @@
// menu key.
return false;
}
+ if (null == mTabOverview && null == getTopWindow()) {
+ return false;
+ }
switch (item.getItemId()) {
// -- Main menu
case R.id.goto_menu_id: {