Bug 1240549 - Put re-enter search mode functionality behind a switchboard flag. r=margaret
--- a/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java
+++ b/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java
@@ -172,16 +172,18 @@ public class BrowserApp extends GeckoApp
private static final String ADD_SHORTCUT_TOAST = "add_shortcut_toast";
public static final String GUEST_BROWSING_ARG = "--guest";
private static final String STATE_ABOUT_HOME_TOP_PADDING = "abouthome_top_padding";
private static final String BROWSER_SEARCH_TAG = "browser_search";
+ public static final String EXPERIMENT_SEARCH_TERM = "search-term";
+
// Request ID for startActivityForResult.
private static final int ACTIVITY_REQUEST_PREFERENCES = 1001;
private static final int ACTIVITY_REQUEST_TAB_QUEUE = 2001;
@RobocopTarget
public static final String EXTRA_SKIP_STARTPANE = "skipstartpane";
private static final String HONEYCOMB_EOL_NOTIFIED = "honeycomb_eol_notified";
@@ -2220,17 +2222,17 @@ public class BrowserApp extends GeckoApp
final PropertyAnimator animator = new PropertyAnimator(250);
animator.setUseHardwareLayer(false);
TransitionsTracker.track(animator);
mBrowserToolbar.startEditing(url, animator);
final boolean isUserSearchTerm = !TextUtils.isEmpty(selectedTab.getUserRequested());
- if (isUserSearchTerm && AppConstants.NIGHTLY_BUILD) {
+ if (isUserSearchTerm && SwitchBoard.isInExperiment(getContext(), EXPERIMENT_SEARCH_TERM)) {
showBrowserSearchAfterAnimation(animator);
} else {
showHomePagerWithAnimator(panelId, animator);
}
animator.start();
Telemetry.startUISession(TelemetryContract.Session.AWESOMESCREEN);
}