Bug 1366664 - Remove onboarding experiments after phonton 57. r?walkingice
MozReview-Commit-ID: HbyKrw8SfGB
--- a/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java
+++ b/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java
@@ -2828,22 +2828,16 @@ public class BrowserApp extends GeckoApp
delegate.onActivityResult(this, requestCode, resultCode, data);
}
super.onActivityResult(requestCode, resultCode, data);
}
}
private void showFirstrunPager() {
- if (Experiments.isInExperimentLocal(this, Experiments.ONBOARDING3_A)) {
- Telemetry.startUISession(TelemetryContract.Session.EXPERIMENT, Experiments.ONBOARDING3_A);
- GeckoSharedPrefs.forProfile(this).edit().putString(Experiments.PREF_ONBOARDING_VERSION, Experiments.ONBOARDING3_A).apply();
- Telemetry.stopUISession(TelemetryContract.Session.EXPERIMENT, Experiments.ONBOARDING3_A);
- return;
- }
if (mFirstrunAnimationContainer == null) {
final ViewStub firstrunPagerStub = (ViewStub) findViewById(R.id.firstrun_pager_stub);
mFirstrunAnimationContainer = (FirstrunAnimationContainer) firstrunPagerStub.inflate();
mFirstrunAnimationContainer.load(getApplicationContext(), getSupportFragmentManager());
mFirstrunAnimationContainer.registerOnFinishListener(new FirstrunAnimationContainer.OnFinishListener() {
@Override
public void onFinish() {
--- a/mobile/android/base/java/org/mozilla/gecko/Experiments.java
+++ b/mobile/android/base/java/org/mozilla/gecko/Experiments.java
@@ -64,33 +64,16 @@ public class Experiments {
// Enable Leanplum SDK
public static final String LEANPLUM = "leanplum-start";
// Enable processing of background telemetry.
public static final String ENABLE_PROCESSING_BACKGROUND_TELEMETRY = "process-background-telemetry";
/**
- * Returns if a user is in certain local experiment.
- * @param experiment Name of experiment to look up
- * @return returns value for experiment or false if experiment does not exist.
- */
- public static boolean isInExperimentLocal(Context context, String experiment) {
- if (SwitchBoard.isInBucket(context, 0, 20)) {
- return Experiments.ONBOARDING3_A.equals(experiment);
- } else if (SwitchBoard.isInBucket(context, 20, 60)) {
- return Experiments.ONBOARDING3_B.equals(experiment);
- } else if (SwitchBoard.isInBucket(context, 60, 100)) {
- return Experiments.ONBOARDING3_C.equals(experiment);
- } else {
- return false;
- }
- }
-
- /**
* Returns list of all active experiments, remote and local.
* @return List of experiment names Strings
*/
public static List<String> getActiveExperiments(Context c) {
final List<String> experiments = new LinkedList<>();
experiments.addAll(SwitchBoard.getActiveExperiments(c));
// Add onboarding version.
--- a/mobile/android/base/java/org/mozilla/gecko/firstrun/FirstrunPagerConfig.java
+++ b/mobile/android/base/java/org/mozilla/gecko/firstrun/FirstrunPagerConfig.java
@@ -22,34 +22,16 @@ public class FirstrunPagerConfig {
public static final String KEY_IMAGE = "imageRes";
public static final String KEY_TEXT = "textRes";
public static final String KEY_SUBTEXT = "subtextRes";
public static List<FirstrunPanelConfig> getDefault(Context context) {
final List<FirstrunPanelConfig> panels = new LinkedList<>();
- if (Experiments.isInExperimentLocal(context, Experiments.ONBOARDING3_B)) {
- panels.add(SimplePanelConfigs.urlbarPanelConfig);
- panels.add(SimplePanelConfigs.bookmarksPanelConfig);
- panels.add(SimplePanelConfigs.dataPanelConfig);
- panels.add(SimplePanelConfigs.syncPanelConfig);
- panels.add(SimplePanelConfigs.signInPanelConfig);
- Telemetry.startUISession(TelemetryContract.Session.EXPERIMENT, Experiments.ONBOARDING3_B);
- GeckoSharedPrefs.forProfile(context).edit().putString(Experiments.PREF_ONBOARDING_VERSION, Experiments.ONBOARDING3_B).apply();
- } else if (Experiments.isInExperimentLocal(context, Experiments.ONBOARDING3_C)) {
- panels.add(SimplePanelConfigs.tabqueuePanelConfig);
- panels.add(SimplePanelConfigs.readerviewPanelConfig);
- panels.add(SimplePanelConfigs.accountPanelConfig);
- Telemetry.startUISession(TelemetryContract.Session.EXPERIMENT, Experiments.ONBOARDING3_C);
- GeckoSharedPrefs.forProfile(context).edit().putString(Experiments.PREF_ONBOARDING_VERSION, Experiments.ONBOARDING3_C).apply();
- } else {
- Log.e(LOGTAG, "Not in an experiment!");
- panels.add(SimplePanelConfigs.signInPanelConfig);
- }
return panels;
}
public static List<FirstrunPanelConfig> getRestricted() {
final List<FirstrunPanelConfig> panels = new LinkedList<>();
panels.add(new FirstrunPanelConfig(RestrictedWelcomePanel.class.getName(), RestrictedWelcomePanel.TITLE_RES));
return panels;
}