Bug 1201324 - Hide savedsearch feature in a nightly flag.r?
authorAllison Naaktgeboren <ally@mozilla.com>
Tue, 08 Sep 2015 09:54:21 -0700
changeset 293945 de590052e6283a8008dff28de5bca3d01454e8ff
parent 293944 e556ecd514e0c3204cf13ed50f51aeb039f61a8e
child 293946 8df7dd2d23fdfdeda92dab10d5b2e7599435f4ae
push id5245
push userraliiev@mozilla.com
push dateThu, 29 Oct 2015 11:30:51 +0000
treeherdermozilla-beta@dac831dc1bd0 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1201324
milestone43.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 1201324 - Hide savedsearch feature in a nightly flag.r?
mobile/android/base/home/SearchEngineRow.java
--- a/mobile/android/base/home/SearchEngineRow.java
+++ b/mobile/android/base/home/SearchEngineRow.java
@@ -1,15 +1,16 @@
 /* -*- Mode: Java; c-basic-offset: 4; tab-width: 20; indent-tabs-mode: nil; -*-
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 package org.mozilla.gecko.home;
 
+import org.mozilla.gecko.AppConstants;
 import org.mozilla.gecko.db.BrowserContract.SearchHistory;
 import org.mozilla.gecko.R;
 import org.mozilla.gecko.Telemetry;
 import org.mozilla.gecko.TelemetryContract;
 import org.mozilla.gecko.home.BrowserSearch.OnEditSuggestionListener;
 import org.mozilla.gecko.home.BrowserSearch.OnSearchListener;
 import org.mozilla.gecko.home.HomePager.OnUrlOpenListener;
 import org.mozilla.gecko.util.StringUtils;
@@ -269,17 +270,19 @@ class SearchEngineRow extends AnimatedHe
         return suggestionCounter;
     }
 
     public void updateSuggestions(boolean suggestionsEnabled, SearchEngine searchEngine, String searchTerm, boolean animate) {
         // This can be called before the opt-in permission prompt is shown or set. Check first.
         if (suggestionsEnabled) {
             final int recycledSuggestionCount = mSuggestionView.getChildCount();
             final int suggestionViewCount = updateFromSearchEngine(searchEngine, animate, recycledSuggestionCount);
-            updateFromSavedSearches(searchTerm, animate, suggestionViewCount, recycledSuggestionCount);
+            if (AppConstants.NIGHTLY_BUILD) {
+                updateFromSavedSearches(searchTerm, animate, suggestionViewCount, recycledSuggestionCount);
+            }
         }
     }
 
     @Override
     public boolean onKeyDown(int keyCode, android.view.KeyEvent event) {
         final View suggestion = mSuggestionView.getChildAt(mSelectedView);
 
         if (event.getAction() != android.view.KeyEvent.ACTION_DOWN) {