0ct0pu5/bromite
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

kill-TOS-and-metrics-opt-out.patch

Browse source
This commit is contained in:
none 2021-03-01 12:35:46 +01:00
parent 91da1c8600
commit 7f0ce41edc
1 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
build/patches/kill-TOS-and-metrics-opt-out.patch
View file

@ -13,7 +13,7 @@ diff --git a/chrome/android/java/res/layout/fre_tosanduma.xml b/chrome/android/j
--- 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_marginTop="@dimen/fre_vertical_spacing"
android:layout_marginBottom="@dimen/fre_tos_bottom_margin"
android:lineSpacingMultiplier="1.4"
- android:textAppearance="@style/TextAppearance.TextMedium.Primary" />
@ -27,11 +27,11 @@ diff --git a/chrome/android/java/res/layout/fre_tosanduma.xml b/chrome/android/j
- 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 @@
@@ -143,7 +143,6 @@
<dimen name="fre_image_bottom_margin">36dp</dimen>
<dimen name="fre_image_height">120dp</dimen>
<dimen name="fre_tos_image_height">110dp</dimen>
@ -42,7 +42,7 @@ diff --git a/chrome/android/java/res/values/dimens.xml b/chrome/android/java/res
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 {
@@ -44,7 +44,7 @@ public abstract class FirstRunActivityBase extends AsyncInitializationActivity {
static final String SHOW_SEARCH_ENGINE_PAGE = "ShowSearchEnginePage";
static final String SHOW_SIGNIN_PAGE = "ShowSignIn";
@ -54,23 +54,23 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstR
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;
@@ -54,7 +54,6 @@ public class ToSAndUMAFirstRunFragment extends Fragment implements FirstRunFragm
private boolean mTosButtonClicked;
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
@@ -82,7 +81,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
mAcceptButton.setOnClickListener((v) -> onTosButtonClicked());
@@ -152,11 +150,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);
@ -82,17 +82,17 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/ToSAnd
}
}
@@ -169,8 +162,7 @@ public class ToSAndUMAFirstRunFragment extends Fragment implements FirstRunFragm
@@ -192,8 +185,7 @@ public class ToSAndUMAFirstRunFragment extends Fragment implements FirstRunFragm
RecordHistogram.recordTimesHistogram("MobileFre.TosFragment.SpinnerVisibleDuration",
SystemClock.elapsedRealtime() - mTosAcceptedTime);
}
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
@@ -217,10 +209,6 @@ public class ToSAndUMAFirstRunFragment extends Fragment implements FirstRunFragm
mAcceptButton.setVisibility(visibility);
mTosAndPrivacy.setVisibility(visibility);