Merge change 3315 into donut
* changes:
Remove test library and instrumentation defs from Browser.
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: {
diff --git a/src/com/android/browser/BrowserSettings.java b/src/com/android/browser/BrowserSettings.java
index 6074055..68438b3 100644
--- a/src/com/android/browser/BrowserSettings.java
+++ b/src/com/android/browser/BrowserSettings.java
@@ -447,7 +447,7 @@
String url = context.getResources().getString(R.string.homepage_base);
if (url.indexOf("{CID}") != -1) {
url = url.replace("{CID}", Partner.getString(context
- .getContentResolver(), Partner.CLIENT_ID, "unknown"));
+ .getContentResolver(), Partner.CLIENT_ID, "android-google"));
}
return url;
}