Side by Side Diff: libadblockplus-android-settings/res/xml/preference_adblock_general.xml
Issue 29379647:
Issue 4948 - add possibility to not send data depending on connection properties (Closed)
Patch Set:
Created March 10, 2017, 6:40 a.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« gradle/wrapper/gradle-wrapper.properties ('K')
|
« libadblockplus-android-settings/res/values/adblock_settings_strings_internal.xml ('k')
|
libadblockplus-android-settings/src/org/adblockplus/libadblockplus/android/settings/AdblockHelper.java » ('j')
|
libadblockplus-android-settings/src/org/adblockplus/libadblockplus/android/settings/AdblockHelper.java » ('J')
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 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"> | 2 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"> |
| 3 | 3 |
| 4 <!-- Adblock: enabled/disabled --> | 4 <!-- Adblock: enabled/disabled --> |
| 5 <SwitchPreference | 5 <SwitchPreference |
| 6 android:key="@string/fragment_adblock_settings_enabled_key" | 6 android:key="@string/fragment_adblock_settings_enabled_key" |
| 7 android:title="@string/fragment_adblock_settings_enabled_title" /> | 7 android:title="@string/fragment_adblock_settings_enabled_title" /> |
| 8 | 8 |
| 9 <!-- Filter lists --> | 9 <!-- Filter lists --> |
| 10 <MultiSelectListPreference | 10 <MultiSelectListPreference |
| 11 android:key="adblock_filter_lists" | 11 android:key="adblock_filter_lists" |
| 12 android:title="@string/fragment_adblock_settings_filter_lists_title" | 12 android:title="@string/fragment_adblock_settings_filter_lists_title" |
| 13 android:summary="@string/fragment_adblock_settings_filter_lists_summary" /> | 13 android:summary="@string/fragment_adblock_settings_filter_lists_summary" /> |
| 14 | 14 |
| 15 <!-- Acceptable Ads: enabled/disabled --> | 15 <!-- Acceptable Ads: enabled/disabled --> |
| 16 <SwitchPreference | 16 <SwitchPreference |
| 17 android:key="@string/fragment_adblock_settings_aa_enabled_key" | 17 android:key="@string/fragment_adblock_settings_aa_enabled_key" |
| 18 android:title="@string/fragment_adblock_settings_aa_enabled_title" | 18 android:title="@string/fragment_adblock_settings_aa_enabled_title" |
| 19 android:summary="@string/fragment_adblock_settings_aa_enabled_summary" / > | 19 android:summary="@string/fragment_adblock_settings_aa_enabled_summary" / > |
| 20 | 20 |
| 21 <!-- Whitelisted domains --> | 21 <!-- Whitelisted domains --> |
| 22 <Preference | 22 <Preference |
| 23 android:key="@string/fragment_adblock_settings_wl_key" | 23 android:key="@string/fragment_adblock_settings_wl_key" |
| 24 android:title="@string/fragment_adblock_settings_wl_title" | 24 android:title="@string/fragment_adblock_settings_wl_title" |
| 25 android:summary="@string/fragment_adblock_settings_wl_summary" /> | 25 android:summary="@string/fragment_adblock_settings_wl_summary" /> |
| 26 | 26 |
| 27 <!-- Allowed connection type for updates --> | |
| 28 <ListPreference | |
| 29 android:key="@string/fragment_adblock_settings_allowed_connection_type_k ey" | |
| 30 android:title="@string/fragment_adblock_settings_allowed_connection_type " | |
| 31 android:summary="%s"/> | |
| 32 | |
| 27 </PreferenceScreen> | 33 </PreferenceScreen> |
| OLD | NEW |
« gradle/wrapper/gradle-wrapper.properties ('K')
|
« libadblockplus-android-settings/res/values/adblock_settings_strings_internal.xml ('k')
|
libadblockplus-android-settings/src/org/adblockplus/libadblockplus/android/settings/AdblockHelper.java » ('j')
|
libadblockplus-android-settings/src/org/adblockplus/libadblockplus/android/settings/AdblockHelper.java » ('J')
