Bug 860326 - Don't update BrowserToolbar after editing a top site on about:home. r=wesj, a=lsblakk
--- a/mobile/android/base/BrowserApp.java
+++ b/mobile/android/base/BrowserApp.java
@@ -696,18 +696,28 @@ abstract public class BrowserApp extends
if (mAboutHomeContent != null)
mAboutHomeContent.refresh();
}
@Override
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
super.onActivityResult(requestCode, resultCode, data);
- String url = resultCode == Activity.RESULT_OK ? data.getStringExtra(AwesomeBar.URL_KEY) : null;
- mBrowserToolbar.fromAwesomeBarSearch(url);
+
+ // Don't update the url in the toolbar if the activity was cancelled, or if it was launched to pick
+ // a site. The order of these checks matters because data will be null if the activity was cancelled.
+ if (resultCode != Activity.RESULT_OK ||
+ data.getStringExtra(AwesomeBar.TARGET_KEY).equals(AwesomeBar.Target.PICK_SITE.toString())) {
+ // We still need to call fromAwesomeBarSearch to perform the toolbar animation.
+ mBrowserToolbar.fromAwesomeBarSearch(null);
+ return;
+ }
+
+ // Otherwise, update the toolbar with the url that was just entered.
+ mBrowserToolbar.fromAwesomeBarSearch(data.getStringExtra(AwesomeBar.URL_KEY));
}
public View getActionBarLayout() {
int actionBarRes;
if (!hasPermanentMenuKey() || isTablet())
actionBarRes = R.layout.browser_toolbar_menu;
else