Merge change 27436 into eclair
* changes:
append '&source=android-home' to the homepage_base string
diff --git a/src/com/android/browser/AddBookmarkPage.java b/src/com/android/browser/AddBookmarkPage.java
index 7878762..71bf481 100644
--- a/src/com/android/browser/AddBookmarkPage.java
+++ b/src/com/android/browser/AddBookmarkPage.java
@@ -161,7 +161,7 @@
// Only use mThumbnail if url and mOriginalUrl are matches.
// Otherwise the user edited the url and the thumbnail no longer applies.
- if (mOriginalUrl.equals(url)) {
+ if (url.equals(mOriginalUrl)) {
Bookmarks.addBookmark(null, cr, url, title, mThumbnail, true);
} else {
Bookmarks.addBookmark(null, cr, url, title, null, true);
diff --git a/src/com/android/browser/BrowserActivity.java b/src/com/android/browser/BrowserActivity.java
index 91d4fd1..fd06d90 100644
--- a/src/com/android/browser/BrowserActivity.java
+++ b/src/com/android/browser/BrowserActivity.java
@@ -2276,6 +2276,7 @@
}
/* package */ void stopLoading() {
+ mDidStopLoad = true;
resetTitleAndRevertLockIcon();
WebView w = getTopWindow();
w.stopLoading();
@@ -2557,6 +2558,7 @@
CookieSyncManager.getInstance().resetSync();
mInLoad = true;
+ mDidStopLoad = false;
showFakeTitleBar();
updateInLoadMenuItems();
if (!mIsNetworkUp) {
@@ -2572,7 +2574,12 @@
// Reset the title and icon in case we stopped a provisional
// load.
resetTitleAndIcon(view);
- updateScreenshot(view);
+
+ if (!mDidStopLoad) {
+ // Only update the bookmark screenshot if the user did not
+ // cancel the load early.
+ updateScreenshot(view);
+ }
// Update the lock icon image only once we are done loading
updateLockIconToLatest();
@@ -4394,6 +4401,7 @@
private boolean mInLoad;
private boolean mIsNetworkUp;
+ private boolean mDidStopLoad;
private boolean mPageStarted;
private boolean mActivityInPause = true;