Side by Side Diff: res/xml/preferences_main.xml
Issue 29376835:
Issue 4769 - Supporting adding whitelisted websites on ABP for Samsung Internet (Closed)
Patch Set: Removing some Java7 features and some code style adjustment
Created March 9, 2017, 9:11 p.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« res/values-ru/strings.xml ('K')
|
« res/values/sysstrings.xml ('k')
|
src/org/adblockplus/sbrowser/contentblocker/UrlInputOpenerPreference.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 android:layout_width="fill_parent" | 3 android:layout_width="fill_parent" |
| 4 android:layout_height="fill_parent" > | 4 android:layout_height="fill_parent" > |
| 5 | 5 |
| 6 <PreferenceScreen | 6 <PreferenceScreen |
| 7 android:summary="@string/manage_subscriptions_summary" | 7 android:summary="@string/manage_subscriptions_summary" |
| 8 android:title="@string/manage_subscriptions" > | 8 android:title="@string/manage_subscriptions" > |
| 9 | 9 |
| 10 <org.adblockplus.sbrowser.contentblocker.ListedSubscriptionsPreferenceCa tegory | 10 <org.adblockplus.sbrowser.contentblocker.ListedSubscriptionsPreferenceCa tegory |
| (...skipping 10 matching lines...) Expand all Loading... | |
| 21 <PreferenceScreen | 21 <PreferenceScreen |
| 22 android:summary="@string/more_blocking_summary" | 22 android:summary="@string/more_blocking_summary" |
| 23 android:title="@string/more_blocking" > | 23 android:title="@string/more_blocking" > |
| 24 | 24 |
| 25 <org.adblockplus.sbrowser.contentblocker.MoreBlockingPreferenceCategory | 25 <org.adblockplus.sbrowser.contentblocker.MoreBlockingPreferenceCategory |
| 26 android:layout_width="fill_parent" | 26 android:layout_width="fill_parent" |
| 27 android:layout_height="wrap_content" | 27 android:layout_height="wrap_content" |
| 28 android:title="@string/more_blocking_category" /> | 28 android:title="@string/more_blocking_category" /> |
| 29 </PreferenceScreen> | 29 </PreferenceScreen> |
| 30 | 30 |
| 31 <PreferenceScreen | |
| 32 android:summary="@string/whitelisted_websites_summary" | |
| 33 android:title="@string/whitelisted_websites"> | |
| 34 | |
| 35 <org.adblockplus.sbrowser.contentblocker.WhitelistedWebsitesPreferenceCa tegory/> | |
| 36 </PreferenceScreen> | |
| 37 | |
| 31 <ListPreference | 38 <ListPreference |
| 32 android:layout_width="fill_parent" | 39 android:layout_width="fill_parent" |
| 33 android:layout_height="wrap_content" | 40 android:layout_height="wrap_content" |
| 34 android:defaultValue="1" | 41 android:defaultValue="1" |
| 35 android:entries="@array/download_settings" | 42 android:entries="@array/download_settings" |
| 36 android:entryValues="@array/download_settings_values" | 43 android:entryValues="@array/download_settings_values" |
| 37 android:key="@string/key_automatic_updates" | 44 android:key="@string/key_automatic_updates" |
| 38 android:title="@string/automatic_updates" /> | 45 android:title="@string/automatic_updates" /> |
| 39 | 46 |
| 40 <PreferenceCategory | 47 <PreferenceCategory |
| 41 android:layout_width="fill_parent" | 48 android:layout_width="fill_parent" |
| 42 android:layout_height="wrap_content" | 49 android:layout_height="wrap_content" |
| 43 android:title="@string/acceptable_ads_category" > | 50 android:title="@string/acceptable_ads_category" > |
| 44 | 51 |
| 45 <CheckBoxPreference | 52 <CheckBoxPreference |
| 46 android:layout_width="fill_parent" | 53 android:layout_width="fill_parent" |
| 47 android:layout_height="wrap_content" | 54 android:layout_height="wrap_content" |
| 48 android:defaultValue="true" | 55 android:defaultValue="true" |
| 49 android:key="@string/key_acceptable_ads" | 56 android:key="@string/key_acceptable_ads" |
| 50 android:singleLine="false" | 57 android:singleLine="false" |
| 51 android:title="@string/enable_acceptable_ads" /> | 58 android:title="@string/enable_acceptable_ads" /> |
| 52 </PreferenceCategory> | 59 </PreferenceCategory> |
| 53 | 60 |
| 54 </PreferenceScreen> | 61 </PreferenceScreen> |
| OLD | NEW |
« res/values-ru/strings.xml ('K')
|
« res/values/sysstrings.xml ('k')
|
src/org/adblockplus/sbrowser/contentblocker/UrlInputOpenerPreference.java » ('j')
|
no next file with comments »
