Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Side by Side Diff: adblockplussbrowser/res/xml/preferences_main.xml

Issue 29673565: Issue 6066 - Implement 'force update' functionality for subscriptions (Closed)
Patch Set: Fixes Created Jan. 23, 2018, 3:12 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
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 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"> 2 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
3 3
4 <PreferenceScreen 4 <PreferenceScreen
5 android:layout="@layout/multiline_preference" 5 android:layout="@layout/multiline_preference"
6 android:summary="@string/manage_subscriptions_summary" 6 android:summary="@string/manage_subscriptions_summary"
7 android:title="@string/manage_subscriptions"> 7 android:title="@string/manage_subscriptions">
8 8
9 <org.adblockplus.sbrowser.contentblocker.ListedSubscriptionsPreferenceCa tegory 9 <org.adblockplus.sbrowser.contentblocker.ListedSubscriptionsPreferenceCa tegory
10 android:title="@string/enabled_subscriptions"/> 10 android:title="@string/enabled_subscriptions"/>
(...skipping 17 matching lines...) Expand all
28 <org.adblockplus.sbrowser.contentblocker.WhitelistedWebsitesPreferenceCa tegory/> 28 <org.adblockplus.sbrowser.contentblocker.WhitelistedWebsitesPreferenceCa tegory/>
29 </PreferenceScreen> 29 </PreferenceScreen>
30 30
31 <org.adblockplus.sbrowser.contentblocker.preferences.MultilineListPreference 31 <org.adblockplus.sbrowser.contentblocker.preferences.MultilineListPreference
32 android:defaultValue="@string/download_settings_value_wifi" 32 android:defaultValue="@string/download_settings_value_wifi"
33 android:entries="@array/download_settings" 33 android:entries="@array/download_settings"
34 android:entryValues="@array/download_settings_values" 34 android:entryValues="@array/download_settings_values"
35 android:key="@string/key_automatic_updates" 35 android:key="@string/key_automatic_updates"
36 android:title="@string/automatic_updates"/> 36 android:title="@string/automatic_updates"/>
37 37
38 <Preference android:title="@string/update_subscriptions"
39 android:key="@string/key_force_update_subscriptions"
40 android:summary="@string/update_subscriptions_summary"/>
41
38 <PreferenceCategory 42 <PreferenceCategory
39 android:title="@string/acceptable_ads_category"> 43 android:title="@string/acceptable_ads_category">
40 44
41 <org.adblockplus.sbrowser.contentblocker.preferences.MultilineCheckBoxPr eference 45 <org.adblockplus.sbrowser.contentblocker.preferences.MultilineCheckBoxPr eference
42 android:defaultValue="true" 46 android:defaultValue="true"
43 android:key="@string/key_acceptable_ads" 47 android:key="@string/key_acceptable_ads"
44 android:singleLine="false" 48 android:singleLine="false"
45 android:title="@string/enable_acceptable_ads"/> 49 android:title="@string/enable_acceptable_ads"/>
46 </PreferenceCategory> 50 </PreferenceCategory>
47 51
48 <PreferenceScreen android:title="@string/about"> 52 <PreferenceScreen android:title="@string/about">
49 <Preference android:title="@string/privacy_policy"> 53 <Preference android:title="@string/privacy_policy">
50 <intent 54 <intent
51 android:action="android.intent.action.VIEW" 55 android:action="android.intent.action.VIEW"
52 android:data="@string/url_privacy_policy"/> 56 android:data="@string/url_privacy_policy"/>
53 </Preference> 57 </Preference>
54 <Preference android:title="@string/terms_of_use"> 58 <Preference android:title="@string/terms_of_use">
55 <intent 59 <intent
56 android:action="android.intent.action.VIEW" 60 android:action="android.intent.action.VIEW"
57 android:data="@string/url_terms_of_use"/> 61 android:data="@string/url_terms_of_use"/>
58 </Preference> 62 </Preference>
59 <PreferenceScreen android:title="@string/imprint" > 63 <PreferenceScreen android:title="@string/imprint" >
60 <org.adblockplus.sbrowser.contentblocker.preferences.ImprintPreferen ce/> 64 <org.adblockplus.sbrowser.contentblocker.preferences.ImprintPreferen ce/>
61 </PreferenceScreen> 65 </PreferenceScreen>
62 </PreferenceScreen> 66 </PreferenceScreen>
63 67
64 </PreferenceScreen> 68 </PreferenceScreen>
OLDNEW

Powered by Google App Engine
This is Rietveld