Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-16 14:55:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 860326 - Don't update BrowserToolbar after editing a top site on about:home. r=wesj

Browse Source
This commit is contained in:
Margaret Leibovic 2013-04-16 17:39:47 -07:00
parent cdeed52b22
commit af8c451de1
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
mobile/android/base/BrowserApp.java
View File

@ -792,8 +792,18 @@ abstract public class BrowserApp extends GeckoApp
@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() {