| Index: mobile/android/base/resources/xml/preferences_privacy.xml |
| =================================================================== |
| --- a/mobile/android/base/resources/xml/preferences_privacy.xml |
| +++ b/mobile/android/base/resources/xml/preferences_privacy.xml |
| @@ -3,32 +3,18 @@ |
| - License, v. 2.0. If a copy of the MPL was not distributed with this |
| - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> |
| <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" |
| xmlns:gecko="http://schemas.android.com/apk/res-auto" |
| android:title="@string/pref_category_privacy_short" |
| android:enabled="false"> |
| - <CheckBoxPreference android:key="privacy.trackingprotection.pbmode.enabled" |
| - android:title="@string/pref_tracking_protection_title" |
| - android:summary="@string/pref_tracking_protection_summary" |
| - android:persistent="false" /> |
| - |
| - <ListPreference android:key="privacy.trackingprotection.state" |
| - android:title="@string/pref_tracking_protection_title" |
| - android:entries="@array/pref_tracking_protection_entries" |
| - android:entryValues="@array/pref_tracking_protection_values" |
| - android:persistent="false" /> |
| - |
| - <org.mozilla.gecko.preferences.AlignRightLinkPreference |
| - android:key="android.not_a_preference.trackingprotection.learn_more" |
| - android:title="@string/pref_learn_more" |
| - android:persistent="false" |
| - url="https://support.mozilla.org/kb/firefox-android-tracking-protection" /> |
| + <!-- Removed tracking protection preferences for private browsing --> |
| + <!-- See https://issues.adblockplus.org/ticket/5194 --> |
| <CheckBoxPreference android:key="privacy.donottrackheader.enabled" |
| android:title="@string/pref_donottrack_title" |
| android:summary="@string/pref_donottrack_summary" |
| android:persistent="false" /> |
| <org.mozilla.gecko.preferences.AlignRightLinkPreference |
| android:key="android.not_a_preference.donottrackheader.learn_more" |