108 lines
5.6 KiB
Diff
108 lines
5.6 KiB
Diff
From: thermatk <thermatk@thermatk.com>
|
|
Date: Fri, 22 Jun 2018 17:16:07 +0200
|
|
Subject: kill TOS and metrics opt-out
|
|
|
|
---
|
|
chrome/android/java/res/layout/fre_tosanduma.xml | 9 ---------
|
|
chrome/android/java/res/values/dimens.xml | 1 -
|
|
.../browser/firstrun/FirstRunActivityBase.java | 2 +-
|
|
.../firstrun/ToSAndUMAFirstRunFragment.java | 14 +-------------
|
|
4 files changed, 2 insertions(+), 24 deletions(-)
|
|
|
|
diff --git a/chrome/android/java/res/layout/fre_tosanduma.xml b/chrome/android/java/res/layout/fre_tosanduma.xml
|
|
--- a/chrome/android/java/res/layout/fre_tosanduma.xml
|
|
+++ b/chrome/android/java/res/layout/fre_tosanduma.xml
|
|
@@ -83,15 +83,6 @@
|
|
android:layout_height="wrap_content"
|
|
android:layout_marginBottom="@dimen/fre_tos_bottom_margin"
|
|
android:lineSpacingMultiplier="1.4"
|
|
- android:textAppearance="@style/TextAppearance.TextMedium.Primary" />
|
|
-
|
|
- <CheckBox
|
|
- android:id="@+id/send_report_checkbox"
|
|
- android:layout_width="wrap_content"
|
|
- android:layout_height="wrap_content"
|
|
- android:lineSpacingMultiplier="1.4"
|
|
- android:text="@string/fre_send_report_check"
|
|
- android:paddingStart="@dimen/fre_tos_checkbox_padding"
|
|
android:textAppearance="@style/TextAppearance.TextMedium.Primary" android:visibility="gone" />
|
|
</LinearLayout>
|
|
</LinearLayout>
|
|
diff --git a/chrome/android/java/res/values/dimens.xml b/chrome/android/java/res/values/dimens.xml
|
|
--- a/chrome/android/java/res/values/dimens.xml
|
|
+++ b/chrome/android/java/res/values/dimens.xml
|
|
@@ -152,7 +152,6 @@
|
|
<dimen name="fre_image_bottom_margin">36dp</dimen>
|
|
<dimen name="fre_image_height">120dp</dimen>
|
|
<dimen name="fre_tos_image_height">110dp</dimen>
|
|
- <dimen name="fre_tos_checkbox_padding">12dp</dimen>
|
|
<dimen name="fre_tos_bottom_margin">16dp</dimen>
|
|
<dimen name="fre_loading_spinner_size">48dp</dimen>
|
|
<dimen name="fre_button_padding">12dp</dimen>
|
|
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivityBase.java b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivityBase.java
|
|
--- a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivityBase.java
|
|
+++ b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivityBase.java
|
|
@@ -38,7 +38,7 @@ public abstract class FirstRunActivityBase extends AsyncInitializationActivity {
|
|
static final String SHOW_SEARCH_ENGINE_PAGE = "ShowSearchEnginePage";
|
|
static final String SHOW_SIGNIN_PAGE = "ShowSignIn";
|
|
|
|
- public static final boolean DEFAULT_METRICS_AND_CRASH_REPORTING = true;
|
|
+ public static final boolean DEFAULT_METRICS_AND_CRASH_REPORTING = false;
|
|
|
|
private boolean mNativeInitialized;
|
|
|
|
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
|
|
@@ -50,7 +50,6 @@ public class ToSAndUMAFirstRunFragment extends Fragment implements FirstRunFragm
|
|
protected boolean mNativeInitialized;
|
|
|
|
private Button mAcceptButton;
|
|
- private CheckBox mSendReportCheckBox;
|
|
private TextView mTosAndPrivacy;
|
|
private View mTitle;
|
|
private View mProgressSpinner;
|
|
@@ -70,7 +69,6 @@ public class ToSAndUMAFirstRunFragment extends Fragment implements FirstRunFragm
|
|
mProgressSpinner = view.findViewById(R.id.progress_spinner);
|
|
mProgressSpinner.setVisibility(View.GONE);
|
|
mAcceptButton = (Button) view.findViewById(R.id.terms_accept);
|
|
- mSendReportCheckBox = (CheckBox) view.findViewById(R.id.send_report_checkbox);
|
|
mTosAndPrivacy = (TextView) view.findViewById(R.id.tos_and_privacy);
|
|
|
|
mAcceptButton.setOnClickListener(new OnClickListener() {
|
|
@@ -145,11 +143,6 @@ public class ToSAndUMAFirstRunFragment extends Fragment implements FirstRunFragm
|
|
if (!isVisibleToUser) {
|
|
// Restore original enabled & visibility states, in case the user returns to the page.
|
|
setSpinnerVisible(false);
|
|
- } else {
|
|
- // On certain versions of Android, the checkbox will appear unchecked upon revisiting
|
|
- // the page. Force it to the end state of the drawable animation as a work around.
|
|
- // crbug.com/666258
|
|
- mSendReportCheckBox.jumpDrawablesToCurrentState();
|
|
}
|
|
}
|
|
|
|
@@ -169,8 +162,7 @@ public class ToSAndUMAFirstRunFragment extends Fragment implements FirstRunFragm
|
|
}
|
|
|
|
mTriggerAcceptAfterNativeInit = false;
|
|
- boolean allowCrashUpload = canShowUmaCheckBox() && mSendReportCheckBox.isChecked();
|
|
- getPageDelegate().acceptTermsOfService(allowCrashUpload);
|
|
+ getPageDelegate().acceptTermsOfService(false);
|
|
}
|
|
|
|
private void setSpinnerVisible(boolean spinnerVisible) {
|
|
@@ -190,10 +182,6 @@ public class ToSAndUMAFirstRunFragment extends Fragment implements FirstRunFragm
|
|
|
|
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);
|
|
- }
|
|
}
|
|
|
|
protected View getToSAndPrivacyText() {
|
|
--
|
|
2.17.1
|
|
|