commit 1651731cd92cd03c6433685b17fad2232a374156 Author: n8fr8 nathan@freitas.net Date: Tue Jul 18 14:55:02 2017 -0400

show only the "restricted" onboarding first time screens

simplify restricted mode first time string

tune the "First Run" user experience - show the restricted first run - change the link to the Orfox app page

Signed-off-by: Amogh Pradeep amoghbl1@gmail.com --- .../base/java/org/mozilla/gecko/firstrun/FirstrunPagerConfig.java | 5 +++++ .../base/java/org/mozilla/gecko/firstrun/RestrictedWelcomePanel.java | 2 +- mobile/android/base/locales/en-US/android_strings.dtd | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/mobile/android/base/java/org/mozilla/gecko/firstrun/FirstrunPagerConfig.java b/mobile/android/base/java/org/mozilla/gecko/firstrun/FirstrunPagerConfig.java index 3f901d07b0fb..cb7e31fc7dfc 100644 --- a/mobile/android/base/java/org/mozilla/gecko/firstrun/FirstrunPagerConfig.java +++ b/mobile/android/base/java/org/mozilla/gecko/firstrun/FirstrunPagerConfig.java @@ -25,6 +25,10 @@ public class FirstrunPagerConfig { public static final String KEY_SUBTEXT = "subtextRes";

public static List<FirstrunPanelConfig> getDefault(Context context) { + + return getRestricted (); + + /** final List<FirstrunPanelConfig> panels = new LinkedList<>();

if (Experiments.isInExperimentLocal(context, Experiments.ONBOARDING3_B)) { @@ -46,6 +50,7 @@ public class FirstrunPagerConfig { panels.add(SimplePanelConfigs.signInPanelConfig); } return panels; + **/ }

public static List<FirstrunPanelConfig> getRestricted() { diff --git a/mobile/android/base/java/org/mozilla/gecko/firstrun/RestrictedWelcomePanel.java b/mobile/android/base/java/org/mozilla/gecko/firstrun/RestrictedWelcomePanel.java index efc91d20f486..b3b02c91001e 100644 --- a/mobile/android/base/java/org/mozilla/gecko/firstrun/RestrictedWelcomePanel.java +++ b/mobile/android/base/java/org/mozilla/gecko/firstrun/RestrictedWelcomePanel.java @@ -21,7 +21,7 @@ import java.util.EnumSet; public class RestrictedWelcomePanel extends FirstrunPanel { public static final int TITLE_RES = R.string.firstrun_panel_title_welcome;

- private static final String LEARN_MORE_URL = "https://support.mozilla.org/kb/controlledaccess"; + private static final String LEARN_MORE_URL = "https://guardianproject.info/apps/orfox";

private HomePager.OnUrlOpenListener onUrlOpenListener;

diff --git a/mobile/android/base/locales/en-US/android_strings.dtd b/mobile/android/base/locales/en-US/android_strings.dtd index 140e2a21689c..fd51410c8d21 100644 --- a/mobile/android/base/locales/en-US/android_strings.dtd +++ b/mobile/android/base/locales/en-US/android_strings.dtd @@ -38,7 +38,7 @@ <!ENTITY firstrun_account_title "You"> <!ENTITY firstrun_account_message "Have &brandShortName; on another device?">

-<!ENTITY onboard_start_restricted1 "Stay safe and in control with this simplified version of &brandShortName;."> +<!ENTITY onboard_start_restricted1 "Stay safe and in control with &brandShortName;.">

<!-- Localization note: These are used as the titles of different pages on the home screen. They are automatically converted to all caps by the Android platform. -->