Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3)

Side by Side Diff: chrome/android/java/res/xml/privacy_preferences.xml

Issue 1712943002: [Android] Simplify "network predictions" preference to a boolean value. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: added bug link; rebased Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 <?xml version="1.0" encoding="utf-8"?> 1 <?xml version="1.0" encoding="utf-8"?>
2 <!-- Copyright 2015 The Chromium Authors. All rights reserved. 2 <!-- Copyright 2015 The Chromium Authors. All rights reserved.
3 Use of this source code is governed by a BSD-style license that can be 3 Use of this source code is governed by a BSD-style license that can be
4 found in the LICENSE file. --> 4 found in the LICENSE file. -->
5 5
6 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"> 6 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
7 <org.chromium.chrome.browser.preferences.ChromeBaseCheckBoxPreference 7 <org.chromium.chrome.browser.preferences.ChromeBaseCheckBoxPreference
8 android:key="navigation_error" 8 android:key="navigation_error"
9 android:title="@string/navigation_error_title" 9 android:title="@string/navigation_error_title"
10 android:summary="@string/navigation_error_summary" 10 android:summary="@string/navigation_error_summary"
11 android:defaultValue="true" /> 11 android:defaultValue="true" />
12 <org.chromium.chrome.browser.preferences.ChromeBaseCheckBoxPreference 12 <org.chromium.chrome.browser.preferences.ChromeBaseCheckBoxPreference
13 android:key="search_suggestions" 13 android:key="search_suggestions"
14 android:title="@string/search_suggestions_title" 14 android:title="@string/search_suggestions_title"
15 android:summary="@string/search_suggestions_summary" 15 android:summary="@string/search_suggestions_summary"
16 android:defaultValue="true" /> 16 android:defaultValue="true" />
17 <org.chromium.chrome.browser.preferences.ChromeBaseCheckBoxPreference 17 <org.chromium.chrome.browser.preferences.ChromeBaseCheckBoxPreference
18 android:key="safe_browsing_extended_reporting" 18 android:key="safe_browsing_extended_reporting"
19 android:title="@string/safe_browsing_extended_reporting_title" 19 android:title="@string/safe_browsing_extended_reporting_title"
20 android:summary="@string/safe_browsing_extended_reporting_summary" /> 20 android:summary="@string/safe_browsing_extended_reporting_summary" />
21 <org.chromium.chrome.browser.preferences.ChromeBaseCheckBoxPreference 21 <org.chromium.chrome.browser.preferences.ChromeBaseCheckBoxPreference
22 android:key="safe_browsing" 22 android:key="safe_browsing"
23 android:title="@string/safe_browsing_title" 23 android:title="@string/safe_browsing_title"
24 android:summary="@string/safe_browsing_summary" /> 24 android:summary="@string/safe_browsing_summary" />
25 25 <org.chromium.chrome.browser.preferences.ChromeBaseCheckBoxPreference
26 <!-- Only one of these network prediction preferences will be shown, dependi ng on whether
27 the device has cellular support. -->
28 <org.chromium.chrome.browser.preferences.privacy.NetworkPredictionPreference
29 android:key="network_predictions" 26 android:key="network_predictions"
30 android:title="@string/network_predictions_title" 27 android:title="@string/network_predictions_title"
31 android:persistent="false" 28 android:persistent="false" />
32 android:entries="@array/bandwidth_entries"
33 android:entryValues="@array/bandwidth_entry_values"
34 android:defaultValue="@string/network_prediction_wifi_only_value" />
35 <org.chromium.chrome.browser.preferences.ChromeBaseCheckBoxPreference
36 android:key="network_predictions_no_cellular"
37 android:title="@string/network_predictions_title"
38 android:summary="@string/network_predictions_summary"
39 android:defaultValue="true" />
40 29
41 <!-- Only one of these "Usage and crash reports" preferences will be shown, depending on whether 30 <!-- Only one of these "Usage and crash reports" preferences will be shown, depending on whether
42 the device has cellular support. --> 31 the device has cellular support. -->
43 <org.chromium.chrome.browser.preferences.privacy.CrashDumpUploadPreference 32 <org.chromium.chrome.browser.preferences.privacy.CrashDumpUploadPreference
44 android:key="crash_dump_upload" 33 android:key="crash_dump_upload"
45 android:title="@string/crash_dump_upload_title" 34 android:title="@string/crash_dump_upload_title"
46 android:entries="@array/crash_upload_entries" 35 android:entries="@array/crash_upload_entries"
47 android:entryValues="@array/crash_upload_values" 36 android:entryValues="@array/crash_upload_values"
48 android:defaultValue="@string/crash_dump_never_upload_value" /> 37 android:defaultValue="@string/crash_dump_never_upload_value" />
49 <org.chromium.chrome.browser.preferences.ChromeBaseCheckBoxPreference 38 <org.chromium.chrome.browser.preferences.ChromeBaseCheckBoxPreference
(...skipping 16 matching lines...) Expand all
66 <Preference 55 <Preference
67 android:key="physical_web" 56 android:key="physical_web"
68 android:title="@string/physical_web_pref_title" 57 android:title="@string/physical_web_pref_title"
69 android:fragment="org.chromium.chrome.browser.preferences.privacy.Physic alWebPreferenceFragment" /> 58 android:fragment="org.chromium.chrome.browser.preferences.privacy.Physic alWebPreferenceFragment" />
70 <Preference 59 <Preference
71 android:key="clear_browsing_data" 60 android:key="clear_browsing_data"
72 android:title="@string/clear_browsing_data_title" 61 android:title="@string/clear_browsing_data_title"
73 android:summary="@string/clear_browsing_data_summary" 62 android:summary="@string/clear_browsing_data_summary"
74 android:fragment="org.chromium.chrome.browser.preferences.privacy.ClearB rowsingDataPreferences" /> 63 android:fragment="org.chromium.chrome.browser.preferences.privacy.ClearB rowsingDataPreferences" />
75 </PreferenceScreen> 64 </PreferenceScreen>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698