Commit dab72b95 authored by Natalie Chouinard's avatar Natalie Chouinard Committed by Commit Bot

Remove no longer used UsageAndCrashReport fragment

The Usage and Crash report settings screen was replaced with a switch.
Cleaning up no longer used files and resources.

Bug: 868826
Change-Id: Id833a49fba6503d356978bacf6b246e11ae6bf46
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1896123Reviewed-by: default avatarBoris Sazonov <bsazonov@chromium.org>
Commit-Queue: Natalie Chouinard <chouinard@chromium.org>
Cr-Commit-Position: refs/heads/master@{#712244}
parent e710e863
......@@ -85,8 +85,7 @@
'filepath': 'chrome/android/java/src/org/chromium/chrome/browser/Tab'
},
'android_uma_settings': {
'filepath': 'chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/UsageAndCrashReportsPreferenceFragment.java|'\
'chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferencesManager.java|'\
'filepath': 'chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferencesManager.java|'\
'chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferences.java|'\
'chrome/android/java/src/org/chromium/chrome/browser/metrics/UmaSessionStats.java',
},
......
......@@ -1380,7 +1380,6 @@ chrome_java_sources = [
"java/src/org/chromium/chrome/browser/preferences/privacy/OtherFormsOfHistoryDialogFragment.java",
"java/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferences.java",
"java/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferencesManager.java",
"java/src/org/chromium/chrome/browser/preferences/privacy/UsageAndCrashReportsPreferenceFragment.java",
"java/src/org/chromium/chrome/browser/preferences/themes/RadioButtonGroupThemePreference.java",
"java/src/org/chromium/chrome/browser/preferences/themes/ThemePreferences.java",
"java/src/org/chromium/chrome/browser/preferences/website/AddExceptionPreference.java",
......
......@@ -48,7 +48,6 @@
<string name="help_context_protected_content">protected_content</string>
<string name="help_context_data_reduction">reduce_data_usage</string>
<string name="help_context_incognito_learn_more">chrome_incognito</string>
<string name="help_context_usage_reports">send_crash_report</string>
<string name="help_context_sad_tab">mobile_awsnap</string>
<string name="help_context_clear_browsing_data">clear_browsing_data</string>
<string name="help_context_change_sync_passphrase">change_sync_passphrase</string>
......
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright 2015 The Chromium Authors. All rights reserved.
Use of this source code is governed by a BSD-style license that can be
found in the LICENSE file. -->
<PreferenceScreen
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<org.chromium.chrome.browser.preferences.ChromeSwitchPreference
android:key="usage_and_crash_reports_switch"
android:summaryOn="@string/text_on"
android:summaryOff="@string/text_off"
app:drawDivider="true"/>
<org.chromium.chrome.browser.preferences.TextMessagePreference
android:title="@string/usage_and_crash_reports_description_legacy"/>
<org.chromium.chrome.browser.preferences.LearnMorePreference
android:key="usage_and_crash_reports_learn_more"
app:helpContext="@string/help_context_usage_reports"/>
</PreferenceScreen>
\ No newline at end of file
// Copyright 2015 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
package org.chromium.chrome.browser.preferences.privacy;
import android.os.Bundle;
import android.support.v7.preference.PreferenceFragmentCompat;
import org.chromium.chrome.R;
import org.chromium.chrome.browser.metrics.UmaSessionStats;
import org.chromium.chrome.browser.preferences.ChromeSwitchPreference;
import org.chromium.chrome.browser.preferences.PrefServiceBridge;
import org.chromium.chrome.browser.preferences.PreferenceUtils;
/**
* Fragment to manage the Usage and crash reports preference and to explain to
* the user what it does.
*/
public class UsageAndCrashReportsPreferenceFragment extends PreferenceFragmentCompat {
private static final String PREF_USAGE_AND_CRASH_REPORTS_SWITCH =
"usage_and_crash_reports_switch";
@Override
public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
PreferenceUtils.addPreferencesFromResource(this, R.xml.usage_and_crash_reports_preferences);
getActivity().setTitle(R.string.usage_and_crash_reports_title_legacy);
initUsageAndCrashReportsSwitch();
}
private void initUsageAndCrashReportsSwitch() {
ChromeSwitchPreference usageAndCrashReportsSwitch =
(ChromeSwitchPreference) findPreference(PREF_USAGE_AND_CRASH_REPORTS_SWITCH);
boolean enabled =
PrivacyPreferencesManager.getInstance().isUsageAndCrashReportingPermittedByUser();
usageAndCrashReportsSwitch.setChecked(enabled);
usageAndCrashReportsSwitch.setOnPreferenceChangeListener((preference, newValue) -> {
UmaSessionStats.changeMetricsReportingConsent((boolean) newValue);
return true;
});
usageAndCrashReportsSwitch.setManagedPreferenceDelegate(
preference -> PrefServiceBridge.getInstance().isMetricsReportingManaged());
}
}
......@@ -844,13 +844,6 @@ Your Google account may have other forms of browsing history like searches and a
<ph name="NUMBER_OF_ITEMS">%1$s<ex>3</ex></ph> items deleted
</message>
<message name="IDS_USAGE_AND_CRASH_REPORTS_TITLE_LEGACY" desc="Title for 'Usage and crash reports' preference">
Usage and crash reports
</message>
<message name="IDS_USAGE_AND_CRASH_REPORTS_DESCRIPTION_LEGACY" desc="Description for 'Usage and crash reports' preference">
Automatically send usage statistics and crash reports to Google
</message>
<!-- Accessibility preferences -->
<message name="IDS_PREFS_ACCESSIBILITY" desc="Title of Accessibility settings, which allows the user to change webpage font sizes. [CHAR-LIMIT=32]">
Accessibility
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment