Delta Between Two Patch Sets: adblockplussbrowser/res/xml/preferences_main.xml
Issue 29453722:
Noissue - Lint adjustments and optimizations (Closed)
Left Patch Set: Adjustments based on review comments
Created June 13, 2017, 9:23 p.m.
Right Patch Set: Adjusting HashSet initialization in Subscription
Created July 19, 2017, 4:40 p.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with change/comment
|
« adblockplussbrowser/res/values/sysstrings.xml ('k')
|
adblockplussbrowser/src/org/adblockplus/sbrowser/contentblocker/ContentBlockerContentProvider.java » ('j')
|
no next file with change/comment »
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')
| LEFT | RIGHT |
|---|---|
| 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" | |
| 4 android:layout_height="fill_parent" > | |
| 5 | 3 |
| 6 <PreferenceScreen | 4 <PreferenceScreen |
| 5 android:layout="@layout/multiline_preference" | |
| 7 android:summary="@string/manage_subscriptions_summary" | 6 android:summary="@string/manage_subscriptions_summary" |
| 8 android:title="@string/manage_subscriptions" > | 7 android:title="@string/manage_subscriptions"> |
| 9 | 8 |
| 10 <org.adblockplus.sbrowser.contentblocker.ListedSubscriptionsPreferenceCa tegory | 9 <org.adblockplus.sbrowser.contentblocker.ListedSubscriptionsPreferenceCa tegory |
| 11 android:layout_width="fill_parent" | 10 android:title="@string/enabled_subscriptions"/> |
| 12 android:layout_height="wrap_content" | |
| 13 android:title="@string/enabled_subscriptions" /> | |
| 14 | 11 |
| 15 <org.adblockplus.sbrowser.contentblocker.ListedSubscriptionsPreferenceCa tegory | 12 <org.adblockplus.sbrowser.contentblocker.ListedSubscriptionsPreferenceCa tegory |
| 16 android:layout_width="fill_parent" | 13 android:title="@string/available_subscriptions"/> |
| 17 android:layout_height="wrap_content" | |
| 18 android:title="@string/available_subscriptions" /> | |
| 19 </PreferenceScreen> | 14 </PreferenceScreen> |
| 20 | 15 |
| 21 <PreferenceScreen | 16 <PreferenceScreen |
| 22 android:summary="@string/more_blocking_summary" | 17 android:summary="@string/more_blocking_summary" |
| 23 android:title="@string/more_blocking" > | 18 android:title="@string/more_blocking"> |
| 24 | 19 |
| 25 <org.adblockplus.sbrowser.contentblocker.MoreBlockingPreferenceCategory | 20 <org.adblockplus.sbrowser.contentblocker.MoreBlockingPreferenceCategory |
| 26 android:layout_width="fill_parent" | 21 android:title="@string/more_blocking_category"/> |
| 27 android:layout_height="wrap_content" | |
| 28 android:title="@string/more_blocking_category" /> | |
| 29 </PreferenceScreen> | 22 </PreferenceScreen> |
| 30 | 23 |
| 31 <PreferenceScreen | 24 <PreferenceScreen |
| 32 android:summary="@string/whitelisted_websites_summary" | 25 android:summary="@string/whitelisted_websites_summary" |
| 33 android:title="@string/whitelisted_websites"> | 26 android:title="@string/whitelisted_websites"> |
| 34 | 27 |
| 35 <org.adblockplus.sbrowser.contentblocker.WhitelistedWebsitesPreferenceCa tegory/> | 28 <org.adblockplus.sbrowser.contentblocker.WhitelistedWebsitesPreferenceCa tegory/> |
| 36 </PreferenceScreen> | 29 </PreferenceScreen> |
| 37 | 30 |
| 38 <ListPreference | 31 <org.adblockplus.sbrowser.contentblocker.preferences.MultilineListPreference |
| 39 android:layout_width="fill_parent" | |
| 40 android:layout_height="wrap_content" | |
| 41 android:defaultValue="@string/download_settings_value_wifi" | 32 android:defaultValue="@string/download_settings_value_wifi" |
| 42 android:entries="@array/download_settings" | 33 android:entries="@array/download_settings" |
| 43 android:entryValues="@array/download_settings_values" | 34 android:entryValues="@array/download_settings_values" |
| 44 android:key="@string/key_automatic_updates" | 35 android:key="@string/key_automatic_updates" |
| 45 android:title="@string/automatic_updates" /> | 36 android:title="@string/automatic_updates"/> |
| 46 | 37 |
| 47 <PreferenceCategory | 38 <PreferenceCategory |
| 48 android:layout_width="fill_parent" | 39 android:title="@string/acceptable_ads_category"> |
| 49 android:layout_height="wrap_content" | |
| 50 android:title="@string/acceptable_ads_category" > | |
| 51 | 40 |
| 52 <CheckBoxPreference | 41 <org.adblockplus.sbrowser.contentblocker.preferences.MultilineCheckBoxPr eference |
| 53 android:layout_width="fill_parent" | |
| 54 android:layout_height="wrap_content" | |
| 55 android:defaultValue="true" | 42 android:defaultValue="true" |
| 56 android:key="@string/key_acceptable_ads" | 43 android:key="@string/key_acceptable_ads" |
| 57 android:singleLine="false" | 44 android:singleLine="false" |
| 58 android:title="@string/enable_acceptable_ads" /> | 45 android:title="@string/enable_acceptable_ads"/> |
| 59 </PreferenceCategory> | 46 </PreferenceCategory> |
| 60 | 47 |
| 61 </PreferenceScreen> | 48 </PreferenceScreen> |
| LEFT | RIGHT |
