Bug 951776 - Part 2: Show web content when switching to the current tab. r=sriram, a=lsblakk
authorMichael Comella <michael.l.comella@gmail.com>
Thu, 19 Dec 2013 15:30:29 -0800
changeset 162121 1445a7e883c56a832d74a9d24fd56bac199bc6de
parent 162120 fea4ff79bb202c5e7211a7f7100f6408b098845c
child 162122 855c01ab6bf06d0203b7e9e006a54fd36609351a
child 162124 37616f6a6c637cf575b3d5d18b781c7877feebea
push id420
push usermichael.l.comella@gmail.com
push dateThu, 19 Dec 2013 23:30:29 +0000
treeherdermozilla-release@1445a7e883c5 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerssriram, lsblakk
bugs951776
milestone26.0.1
Bug 951776 - Part 2: Show web content when switching to the current tab. r=sriram, a=lsblakk
mobile/android/base/BrowserApp.java
--- a/mobile/android/base/BrowserApp.java
+++ b/mobile/android/base/BrowserApp.java
@@ -1277,24 +1277,24 @@ abstract public class BrowserApp extends
         }
 
         final Tabs tabs = Tabs.getInstance();
         final int tabId = tabs.getTabIdForUrl(url);
         if (tabId < 0) {
             return false;
         }
 
-        // If this tab is already selected, just hide the home pager.
-        if (tabs.isSelectedTab(tabs.getTab(tabId))) {
-            hideHomePager();
-        } else {
+        if (!tabs.isSelectedTab(tabs.getTab(tabId))) {
             tabs.selectTab(tabId);
         }
 
+        // We need to hide BrowserSearch first - see dismissEditingMode for an explanation.
         hideBrowserSearch();
+        hideHomePager();
+
         mBrowserToolbar.cancelEdit();
 
         return true;
     }
 
     private void openUrl(String url) {
         openUrl(url, null, false);
     }