();
- // Description always has a Terms of Service link.
- spans.add(buildTermsOfServiceLink());
+ spans.add(buildPrivacyPolicyLink("1", R.string.adblock_wiki_url));
- // Additional terms of service link.
- if (!umaDialogMayBeShown) {
- spans.add(buildAdditionalTermsOfServiceLink());
- }
+ spans.add(buildPrivacyPolicyLink("2", R.string.adblock_updater_privacy_policy_url));
- // Privacy policy link.
- if (hasChildAccount) {
- spans.add(buildPrivacyPolicyLink());
- }
+ spans.add(buildPrivacyPolicyLink("3", R.string.auto_updates_wiki_url));
- // Metrics and crash reporting link.
- if (umaDialogMayBeShown && !isMetricsReportingDisabledByPolicy) {
- spans.add(buildMetricsAndCrashReportingLink());
- }
+ spans.add(buildPrivacyPolicyLink("4", R.string.bromite_updater_privacy_policy_url));
- String tosString;
- if (umaDialogMayBeShown) {
- tosString =
- getString(hasChildAccount ? R.string.signin_fre_footer_tos_with_supervised_user
- : R.string.signin_fre_footer_tos);
-
- if (!isMetricsReportingDisabledByPolicy) {
- tosString += "\n" + getString(R.string.signin_fre_footer_metrics_reporting);
- }
- } else {
- tosString = getString(hasChildAccount ? R.string.fre_tos_and_privacy_child_account
- : R.string.fre_tos);
- }
+ String tosString = getString(R.string.bromite_fre_footer_privacy_policy);
mTosAndPrivacy.setText(SpanApplier.applySpans(tosString, spans.toArray(new SpanInfo[0])));
}
- private void updateReportCheckbox(
- boolean umaDialogMayBeShown, boolean isMetricsReportingDisabledByPolicy) {
- // The user can only interact with the UMA checkbox after it's visible on the screen, in
- // which case a previous call to this method has already checked the checkbox expected
- // initial state.
- if (!mUserInteractedWithUmaCheckbox) {
- mAllowCrashUpload = getUmaCheckBoxInitialState();
- mSendReportCheckBox.setChecked(mAllowCrashUpload);
- }
-
- if (!canShowUmaCheckBox()) {
- if (!umaDialogMayBeShown) {
- mAllowCrashUpload = (sShowUmaCheckBoxForTesting || VersionInfo.isOfficialBuild())
- && !isMetricsReportingDisabledByPolicy;
- }
- mSendReportCheckBox.setVisibility(View.GONE);
- }
- }
-
- private void openUmaDialog() {
- new FreUMADialogCoordinator(requireContext(),
- ((ModalDialogManagerHolder) getActivity()).getModalDialogManager(), this,
- mAllowCrashUpload);
+ private void updateReportCheckbox() {
+ mAutoUpdaterCheckBox.setChecked(true);
}
private void onPolicyServiceInitialized(boolean onDevicePolicyFound) {
@@ -316,6 +240,12 @@ public class ToSAndUMAFirstRunFragment
private void onTosButtonClicked() {
mTosButtonClicked = true;
mTosAcceptedTime = SystemClock.elapsedRealtime();
+
+ // save updater configuration only on button click
+ SharedPreferences.Editor sharedPreferenceEditor = OmahaBase.getSharedPreferences().edit();
+ sharedPreferenceEditor.putBoolean(OmahaBase.PREF_ALLOW_INLINE_UPDATE, mAutoUpdaterChecked);
+ sharedPreferenceEditor.apply();
+
tryMarkTermsAccepted(true);
}
@@ -326,7 +256,8 @@ public class ToSAndUMAFirstRunFragment
* @param fromButtonClicked Whether called from {@link #onTosButtonClicked()}.
*/
private void tryMarkTermsAccepted(boolean fromButtonClicked) {
- if (!mTosButtonClicked || isWaitingForNativeAndPolicyInit()) {
+ boolean isW = isWaitingForNativeAndPolicyInit();
+ if (!mTosButtonClicked || isW) {
if (fromButtonClicked) setSpinnerVisible(true);
return;
}
@@ -337,7 +268,7 @@ public class ToSAndUMAFirstRunFragment
RecordHistogram.recordTimesHistogram("MobileFre.TosFragment.SpinnerVisibleDuration",
SystemClock.elapsedRealtime() - mTosAcceptedTime);
}
- getPageDelegate().acceptTermsOfService(mAllowCrashUpload);
+ getPageDelegate().acceptTermsOfService(false);
getPageDelegate().advanceToNextPage();
}
@@ -380,10 +311,7 @@ public class ToSAndUMAFirstRunFragment
mAcceptButton.setVisibility(visibility);
mTosAndPrivacy.setVisibility(visibility);
- // Avoid updating visibility if the UMA check box can't be shown right now.
- if (canShowUmaCheckBox()) {
- mSendReportCheckBox.setVisibility(visibility);
- }
+ mAutoUpdaterCheckBox.setVisibility(visibility);
}
protected View getToSAndPrivacyText() {
@@ -396,18 +324,6 @@ public class ToSAndUMAFirstRunFragment
}
}
- /**
- * @return Whether the check box for Uma metrics can be shown. It should be used in conjunction
- * with whether other non-spinner elements can generally be shown.
- */
- protected boolean canShowUmaCheckBox() {
- return !FREMobileIdentityConsistencyFieldTrial.shouldShowOldFreWithUmaDialog()
- && (sShowUmaCheckBoxForTesting || VersionInfo.isOfficialBuild())
- && (isWaitingForNativeAndPolicyInit()
- || PrivacyPreferencesManagerImpl.getInstance()
- .isUsageAndCrashReportingPermittedByPolicy());
- }
-
@VisibleForTesting
public static void setShowUmaCheckBoxForTesting(boolean showForTesting) {
sShowUmaCheckBoxForTesting = showForTesting;
diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
--- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
+++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
@@ -2926,11 +2926,30 @@ To change this setting, <resetlink>reset sync
%1$sGoogle Maps will open in Chrome. By continuing, you agree to the <LINK1>Google Terms of Service</LINK1>, and the <LINK2>Google Chrome and ChromeOS Additional Terms of Service</LINK2>. The <LINK3>Privacy Policy</LINK3> also applies.
-
- Help make Chrome better by sending usage statistics and crash reports to Google.
-
- Accept & continue
+ Continue
+
+
+ https://docs.github.com/en/github/site-policy/github-privacy-statement#github-pages
+
+
+ https://docs.github.com/en/github/site-policy/github-privacy-statement#github-pages
+
+
+ <PRIVACY_LINK1>Automatic ad block filters updates</PRIVACY_LINK1> are subject to the <PRIVACY_LINK2>GitHub Privacy statement</PRIVACY_LINK2>; they cannot be disabled.
+ The following checkbox controls instead <PRIVACY_LINK3>automatic app updates</PRIVACY_LINK3> which are also subject to the <PRIVACY_LINK4>GitHub Privacy statement</PRIVACY_LINK4>.
+
+
+ Automatic checks for Bromite app updates
+
+
+ https://docs.github.com/en/github/site-policy/github-privacy-statement#github-pages
+
+
+ https://github.com/bromite/bromite/wiki/AdBlocking
+
+
+ https://github.com/bromite/bromite/wiki/AutomaticUpdates
Welcome to Chrome
--
2.25.1