70 lines
3.4 KiB
Diff
70 lines
3.4 KiB
Diff
From: csagan5 <32685696+csagan5@users.noreply.github.com>
|
|
Date: Sun, 26 Nov 2017 22:51:43 +0100
|
|
Subject: Skip the first run and metrics
|
|
|
|
---
|
|
.../chrome/browser/firstrun/FirstRunStatus.java | 11 +++++------
|
|
.../chrome/browser/firstrun/FirstRunUtils.java | 3 ---
|
|
.../browser/firstrun/ToSAndUMAFirstRunFragment.java | 7 -------
|
|
3 files changed, 5 insertions(+), 16 deletions(-)
|
|
|
|
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunStatus.java b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunStatus.java
|
|
--- a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunStatus.java
|
|
+++ b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunStatus.java
|
|
@@ -61,12 +61,11 @@ public class FirstRunStatus {
|
|
* includes ToS and Sign In pages if necessary.
|
|
*/
|
|
public static boolean getFirstRunFlowComplete() {
|
|
- if (SharedPreferencesManager.getInstance().readBoolean(
|
|
- ChromePreferenceKeys.FIRST_RUN_FLOW_COMPLETE, false)) {
|
|
- return true;
|
|
- }
|
|
- return CommandLine.getInstance().hasSwitch(
|
|
- ChromeSwitches.FORCE_FIRST_RUN_FLOW_COMPLETE_FOR_TESTING);
|
|
+ boolean complete = SharedPreferencesManager.getInstance().readBoolean(
|
|
+ ChromePreferenceKeys.FIRST_RUN_FLOW_COMPLETE, false);
|
|
+ if (!complete)
|
|
+ setFirstRunFlowComplete(true);
|
|
+ return true;
|
|
}
|
|
|
|
/**
|
|
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunUtils.java b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunUtils.java
|
|
--- a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunUtils.java
|
|
+++ b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunUtils.java
|
|
@@ -37,15 +37,12 @@ public class FirstRunUtils {
|
|
boolean javaPrefValue =
|
|
javaPrefs.readBoolean(ChromePreferenceKeys.FIRST_RUN_CACHED_TOS_ACCEPTED, false);
|
|
boolean nativePrefValue = isFirstRunEulaAccepted();
|
|
- boolean isFirstRunComplete = FirstRunStatus.getFirstRunFlowComplete();
|
|
- if (javaPrefValue || nativePrefValue || isFirstRunComplete) {
|
|
if (!javaPrefValue) {
|
|
javaPrefs.writeBoolean(ChromePreferenceKeys.FIRST_RUN_CACHED_TOS_ACCEPTED, true);
|
|
}
|
|
if (!nativePrefValue) {
|
|
setEulaAccepted();
|
|
}
|
|
- }
|
|
}
|
|
|
|
/**
|
|
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/ToSAndUMAFirstRunFragment.java b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/ToSAndUMAFirstRunFragment.java
|
|
--- a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/ToSAndUMAFirstRunFragment.java
|
|
+++ b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/ToSAndUMAFirstRunFragment.java
|
|
@@ -80,13 +80,6 @@ public class ToSAndUMAFirstRunFragment extends Fragment implements FirstRunFragm
|
|
}
|
|
});
|
|
|
|
- mSendReportCheckBox.setChecked(FirstRunActivity.DEFAULT_METRICS_AND_CRASH_REPORTING);
|
|
- if (!canShowUmaCheckBox()) {
|
|
- mSendReportCheckBox.setVisibility(View.GONE);
|
|
- }
|
|
-
|
|
- mTosAndPrivacy.setMovementMethod(LinkMovementMethod.getInstance());
|
|
-
|
|
Resources resources = getResources();
|
|
NoUnderlineClickableSpan clickableGoogleTermsSpan =
|
|
new NoUnderlineClickableSpan(resources, (view1) -> {
|
|
--
|
|
2.17.1
|
|
|