49 lines
2.5 KiB
Diff
49 lines
2.5 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 | 2 +-
|
|
chrome/android/java/res/values/dimens.xml | 1 -
|
|
.../chromium/chrome/browser/firstrun/FirstRunActivityBase.java | 2 +-
|
|
3 files changed, 2 insertions(+), 3 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
|
|
@@ -62,7 +62,7 @@
|
|
android:layout_marginBottom="@dimen/fre_vertical_spacing"
|
|
android:gravity="center"
|
|
android:lineSpacingMultiplier="1.4"
|
|
- android:textAppearance="@style/TextAppearance.TextMedium.Primary" />
|
|
+ android:textAppearance="@style/TextAppearance.TextMedium.Primary" android:visibility="gone" />
|
|
|
|
<CheckBox
|
|
android:id="@+id/send_report_checkbox"
|
|
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
|
|
@@ -196,7 +196,6 @@
|
|
<dimen name="fre_button_padding">12dp</dimen>
|
|
<dimen name="fre_margin">24dp</dimen>
|
|
<dimen name="fre_image_height">120dp</dimen>
|
|
- <dimen name="fre_tos_checkbox_padding">12dp</dimen>
|
|
|
|
<!-- Account Signin dimensions -->
|
|
<!-- The Account Signin page appears in the First Run Experience (amongst other places), so uses
|
|
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;
|
|
|
|
--
|
|
2.17.1
|
|
|