Bug 917805 - Remove unused animateHideHomePager(), simplify hideHomePager() (r=margaret)
authorLucas Rocha <lucasr@mozilla.com>
Tue, 01 Oct 2013 17:15:30 +0100
changeset 149467 961a0bc211ea5e76c40f4de391a6b98e0c441166
parent 149466 cc6d9eb30c0c962ae1ddee7f77df2536a2a98eb3
child 149468 94709aa5280322b50d6e0d6f766e6074e52fc7c5
push id25390
push userryanvm@gmail.com
push dateTue, 01 Oct 2013 20:43:13 +0000
treeherdermozilla-central@df452c8738ef [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmargaret
bugs917805
milestone27.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 917805 - Remove unused animateHideHomePager(), simplify hideHomePager() (r=margaret)
mobile/android/base/BrowserApp.java
--- a/mobile/android/base/BrowserApp.java
+++ b/mobile/android/base/BrowserApp.java
@@ -1407,17 +1407,17 @@ abstract public class BrowserApp extends
     }
 
     private void commitEditingMode() {
         if (!mBrowserToolbar.isEditing()) {
             return;
         }
 
         final String url = mBrowserToolbar.commitEdit();
-        animateHideHomePager();
+        hideHomePager();
         hideBrowserSearch();
 
         // Don't do anything if the user entered an empty URL.
         if (TextUtils.isEmpty(url)) {
             return;
         }
 
         // If the URL doesn't look like a search query, just load it.
@@ -1487,17 +1487,17 @@ abstract public class BrowserApp extends
             return false;
         }
 
         mBrowserToolbar.cancelEdit();
 
         // Resetting the visibility of HomePager, which might have been hidden
         // by the filterEditingMode().
         mHomePager.setVisibility(View.VISIBLE);
-        animateHideHomePager();
+        hideHomePager();
         hideBrowserSearch();
 
         return true;
     }
 
     void filterEditingMode(String searchTerm, AutocompleteHandler handler) {
         if (TextUtils.isEmpty(searchTerm)) {
             mHomePager.setVisibility(View.VISIBLE);
@@ -1550,35 +1550,26 @@ abstract public class BrowserApp extends
 
         if (mHomePager == null) {
             final ViewStub homePagerStub = (ViewStub) findViewById(R.id.home_pager_stub);
             mHomePager = (HomePager) homePagerStub.inflate();
         }
         mHomePager.show(getSupportFragmentManager(), page, animator);
     }
 
-    private void animateHideHomePager() {
-        hideHomePagerWithAnimation(true);
-    }
-
     private void hideHomePager() {
-        hideHomePagerWithAnimation(false);
-    }
-
-    private void hideHomePagerWithAnimation(boolean animate) {
         if (!isHomePagerVisible()) {
             return;
         }
 
         final Tab tab = Tabs.getInstance().getSelectedTab();
         if (tab != null && isAboutHome(tab)) {
             return;
         }
 
-        // FIXME: do animation if animate is true
         if (mHomePager != null) {
             mHomePager.hide();
         }
 
         mBrowserToolbar.setNextFocusDownId(R.id.layer_view);
 
         // Refresh toolbar height to possibly restore the toolbar padding
         refreshToolbarHeight();