chrome/android/java/res/xml/privacy_preferences.xml - Issue 1618413002: Change the CBD dialog on Android to a PreferenceFragment

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 1618413002: Change the CBD dialog on Android to a PreferenceFragment (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Removed button, fixed tests Created 4 years, 10 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

« no previous file with comments | « chrome/android/java/res/xml/clear_browsing_data_dialog.xml ('k') | chrome/android/java/src/org/chromium/chrome/browser/ChromeApplication.java » ('j') | chrome/android/java/src/org/chromium/chrome/browser/ChromeApplication.java » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
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"

(...skipping 49 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
60 android:key="do_not_track"	60 android:key="do_not_track"

61 android:title="@string/do_not_track_title" />	61 android:title="@string/do_not_track_title" />

62 <Preference	62 <Preference

63 android:key="contextual_search"	63 android:key="contextual_search"

64 android:title="@string/contextual_search_title"	64 android:title="@string/contextual_search_title"

65 android:fragment="org.chromium.chrome.browser.preferences.privacy.Contex tualSearchPreferenceFragment" />	65 android:fragment="org.chromium.chrome.browser.preferences.privacy.Contex tualSearchPreferenceFragment" />

66 <Preference	66 <Preference

67 android:key="physical_web"	67 android:key="physical_web"

68 android:title="@string/physical_web_pref_title"	68 android:title="@string/physical_web_pref_title"

69 android:fragment="org.chromium.chrome.browser.preferences.privacy.Physic alWebPreferenceFragment" />	69 android:fragment="org.chromium.chrome.browser.preferences.privacy.Physic alWebPreferenceFragment" />

70 <org.chromium.chrome.browser.preferences.ButtonPreference	70 <Preference
	msramek 2016/01/28 18:43:48 I had a discussion with our UX designer today and I had a discussion with our UX designer today and we decided to replace the button with a simple preference, since it was a special case and didn't fit into our settings UI.
71 android:key="clear_browsing_data"	71 android:key="clear_browsing_data"

72 android:title="@string/clear_browsing_data_title" />	72 android:title="@string/clear_browsing_data_title"

	73 android:fragment="org.chromium.chrome.browser.preferences.privacy.ClearB rowsingDataDialogFragment" />

73 </PreferenceScreen>	74 </PreferenceScreen>

OLD	NEW