Side by Side Diff: mobile/android/base/resources/xml/preferences_privacy.xml
Issue 29430589:
Issue 5194 - Remove Tracking Protection from Private Browsing (Closed)
Patch Set:
Created May 5, 2017, 2:21 p.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« mobile/android/app/mobile.js ('k')
|
no next file »
|
no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
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 <!-- This Source Code Form is subject to the terms of the Mozilla Public | 2 <!-- This Source Code Form is subject to the terms of the Mozilla Public |
| 3 - License, v. 2.0. If a copy of the MPL was not distributed with this | 3 - License, v. 2.0. If a copy of the MPL was not distributed with this |
| 4 - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> | 4 - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> |
| 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 xmlns:gecko="http://schemas.android.com/apk/res-auto" | 7 xmlns:gecko="http://schemas.android.com/apk/res-auto" |
| 8 android:title="@string/pref_category_privacy_short" | 8 android:title="@string/pref_category_privacy_short" |
| 9 android:enabled="false"> | 9 android:enabled="false"> |
| 10 | 10 |
| 11 <CheckBoxPreference android:key="privacy.trackingprotection.pbmode.enabled" | 11 <!-- Removed tracking protection preferences for private browsing --> |
| 12 android:title="@string/pref_tracking_protection_title" | 12 <!-- See https://issues.adblockplus.org/ticket/5194 --> |
| 13 android:summary="@string/pref_tracking_protection_summar y" | |
| 14 android:persistent="false" /> | |
| 15 | |
| 16 <ListPreference android:key="privacy.trackingprotection.state" | |
| 17 android:title="@string/pref_tracking_protection_title" | |
| 18 android:entries="@array/pref_tracking_protection_entries" | |
| 19 android:entryValues="@array/pref_tracking_protection_values" | |
| 20 android:persistent="false" /> | |
| 21 | |
| 22 <org.mozilla.gecko.preferences.AlignRightLinkPreference | |
| 23 android:key="android.not_a_preference.trackingprotection.learn_more" | |
| 24 android:title="@string/pref_learn_more" | |
| 25 android:persistent="false" | |
| 26 url="https://support.mozilla.org/kb/firefox-android-tracking-protect ion" /> | |
| 27 | 13 |
| 28 <CheckBoxPreference android:key="privacy.donottrackheader.enabled" | 14 <CheckBoxPreference android:key="privacy.donottrackheader.enabled" |
| 29 android:title="@string/pref_donottrack_title" | 15 android:title="@string/pref_donottrack_title" |
| 30 android:summary="@string/pref_donottrack_summary" | 16 android:summary="@string/pref_donottrack_summary" |
| 31 android:persistent="false" /> | 17 android:persistent="false" /> |
| 32 | 18 |
| 33 <org.mozilla.gecko.preferences.AlignRightLinkPreference | 19 <org.mozilla.gecko.preferences.AlignRightLinkPreference |
| 34 android:key="android.not_a_preference.donottrackheader.learn_more" | 20 android:key="android.not_a_preference.donottrackheader.learn_more" |
| 35 android:title="@string/pref_learn_more" | 21 android:title="@string/pref_learn_more" |
| 36 android:persistent="false" | 22 android:persistent="false" |
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 82 android:summary="@string/pref_clear_on_exit_summary2 " | 68 android:summary="@string/pref_clear_on_exit_summary2 " |
| 83 | 69 |
| 84 android:dialogTitle="@string/pref_clear_on_exit_dial og_title" | 70 android:dialogTitle="@string/pref_clear_on_exit_dial og_title" |
| 85 android:positiveButtonText="@string/button_set"/> | 71 android:positiveButtonText="@string/button_set"/> |
| 86 | 72 |
| 87 </PreferenceCategory> | 73 </PreferenceCategory> |
| 88 | 74 |
| 89 </PreferenceScreen> | 75 </PreferenceScreen> |
| 90 | 76 |
| 91 | 77 |
| OLD | NEW |
« no previous file with comments
|
« mobile/android/app/mobile.js ('k')
|
no next file »
|
no next file with comments »
