From 1139893d6f426a5c29f67fd49d98b25909773a38 Mon Sep 17 00:00:00 2001
From: Michael Comella <michael.l.comella@gmail.com>
Date: Tue, 5 Jan 2016 10:46:59 -0800
Subject: [PATCH] Bug 1022464 - review: Make changes for review comments while
 liuche is out. r=me

There is one review comment questioning a change that, upon testing, seems to
be necessary upon testing - I didn't make any changes for that change but I
still don't entirely understand why it's necessary.

--HG--
extra : commitid : Htc38uQZfMY
extra : rebase_source : 7b2b71aa8548ae88169a4bb39b112755f3f273f9
---
 .../base/java/org/mozilla/gecko/BrowserApp.java        | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java b/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java
index 61282c09b9d9..93f156e8dce2 100644
--- a/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java
+++ b/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java
@@ -2174,16 +2174,16 @@ public class BrowserApp extends GeckoApp
 
             // Check to see if there's a user-entered search term,
             // which we save whenever the user performs a search.
-            String telemetryMsg;
+            final String telemetryMsg;
             if (!TextUtils.isEmpty(userSearchTerm)) {
                 url = userSearchTerm;
-                telemetryMsg = "urlbar-userEntered";
+                telemetryMsg = "urlbar-userentered";
             } else {
                 url = tab.getURL();
                 telemetryMsg = url.isEmpty() ? "urlbar-empty" : "urlbar-url";
             }
 
-            Telemetry.sendUIEvent(TelemetryContract.Event.SEARCH, TelemetryContract.Method.ACTIONBAR, telemetryMsg);
+            Telemetry.sendUIEvent(TelemetryContract.Event.SHOW, TelemetryContract.Method.ACTIONBAR, telemetryMsg);
         }
         enterEditingMode(url);
     }
@@ -2221,7 +2221,6 @@ public class BrowserApp extends GeckoApp
         final boolean isUserSearchTerm = !TextUtils.isEmpty(selectedTab.getUserRequested());
         if (isUserSearchTerm && AppConstants.NIGHTLY_BUILD) {
             showBrowserSearchAfterAnimation(animator);
-            hideWebContentOnPropertyAnimationEnd(animator);
         } else {
             showHomePagerWithAnimator(panelId, animator);
         }
@@ -2706,9 +2705,6 @@ public class BrowserApp extends GeckoApp
         // reverse that.
         showHomePager(Tabs.getInstance().getSelectedTab().getMostRecentHomePanel());
 
-        // Prevent race in hiding web content - see declaration for more info.
-        mHideWebContentOnAnimationEnd = false;
-
         mBrowserSearchContainer.setVisibility(View.INVISIBLE);
 
         getSupportFragmentManager().beginTransaction()