Side by Side Diff: adblockplussbrowser/res/xml/preferences_main.xml
Issue 29510587:
Issue 5366 - Reach full legal compliance in ABP for Samsung Internet (Closed)
Patch Set: Fixed copyright text and xml formatting
Created Aug. 11, 2017, 1:29 p.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« adblockplussbrowser/res/values/sysstrings.xml ('k')
|
adblockplussbrowser/src/org/adblockplus/sbrowser/contentblocker/preferences/ImprintPreference.java » ('j')
|
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 <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 27 matching lines...) Expand all Loading... | |
| 38 <PreferenceCategory | 38 <PreferenceCategory |
| 39 android:title="@string/acceptable_ads_category"> | 39 android:title="@string/acceptable_ads_category"> |
| 40 | 40 |
| 41 <org.adblockplus.sbrowser.contentblocker.preferences.MultilineCheckBoxPr eference | 41 <org.adblockplus.sbrowser.contentblocker.preferences.MultilineCheckBoxPr eference |
| 42 android:defaultValue="true" | 42 android:defaultValue="true" |
| 43 android:key="@string/key_acceptable_ads" | 43 android:key="@string/key_acceptable_ads" |
| 44 android:singleLine="false" | 44 android:singleLine="false" |
| 45 android:title="@string/enable_acceptable_ads"/> | 45 android:title="@string/enable_acceptable_ads"/> |
| 46 </PreferenceCategory> | 46 </PreferenceCategory> |
| 47 | 47 |
| 48 <PreferenceScreen android:title="@string/about"> | |
| 49 <Preference android:title="@string/privacy_policy"> | |
| 50 <intent | |
| 51 android:action="android.intent.action.VIEW" | |
| 52 android:data="@string/url_privacy_policy"/> | |
| 53 </Preference> | |
| 54 <Preference android:title="@string/terms_of_use"> | |
| 55 <intent | |
| 56 android:action="android.intent.action.VIEW" | |
| 57 android:data="@string/url_terms_of_use"/> | |
| 58 </Preference> | |
| 59 <PreferenceScreen android:title="@string/imprint" > | |
| 60 <org.adblockplus.sbrowser.contentblocker.preferences.ImprintPreferen ce/> | |
| 61 </PreferenceScreen> | |
| 62 </PreferenceScreen> | |
| 63 | |
| 48 </PreferenceScreen> | 64 </PreferenceScreen> |
| OLD | NEW |
« no previous file with comments
|
« adblockplussbrowser/res/values/sysstrings.xml ('k')
|
adblockplussbrowser/src/org/adblockplus/sbrowser/contentblocker/preferences/ImprintPreference.java » ('j')
|
no next file with comments »
