Side by Side Diff: adblockplussbrowser/res/xml/preferences_main.xml
Issue 29441558:
Issue 5243 - Clipped text across languages (Closed)
Patch Set: Added copyright header, extracted static method to set multiline property in onBindView(), added multi line property for subscriptions screen
Created May 30, 2017, 12:25 p.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« adblockplussbrowser/res/layout/multiline_preference_screen.xml ('K')
|
« adblockplussbrowser/res/layout/multiline_preference_screen.xml ('k')
|
adblockplussbrowser/src/org/adblockplus/sbrowser/contentblocker/ListedSubscriptionsPreferenceCategory.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:layout="@layout/multiline_preference_screen" | |
| 7 android:summary="@string/manage_subscriptions_summary" | 8 android:summary="@string/manage_subscriptions_summary" |
| 8 android:title="@string/manage_subscriptions" > | 9 android:title="@string/manage_subscriptions" |
| 10 > | |
|
diegocarloslima
2017/05/31 13:33:58
the android:title line shouldn't have changed. the
jens
2017/05/31 13:58:57
Acknowledged.
| |
| 9 | 11 |
| 10 <org.adblockplus.sbrowser.contentblocker.ListedSubscriptionsPreferenceCa tegory | 12 <org.adblockplus.sbrowser.contentblocker.ListedSubscriptionsPreferenceCa tegory |
| 11 android:layout_width="fill_parent" | 13 android:layout_width="fill_parent" |
| 12 android:layout_height="wrap_content" | 14 android:layout_height="wrap_content" |
| 13 android:title="@string/enabled_subscriptions" /> | 15 android:title="@string/enabled_subscriptions" /> |
| 14 | 16 |
| 15 <org.adblockplus.sbrowser.contentblocker.ListedSubscriptionsPreferenceCa tegory | 17 <org.adblockplus.sbrowser.contentblocker.ListedSubscriptionsPreferenceCa tegory |
| 16 android:layout_width="fill_parent" | 18 android:layout_width="fill_parent" |
| 17 android:layout_height="wrap_content" | 19 android:layout_height="wrap_content" |
| 18 android:title="@string/available_subscriptions" /> | 20 android:title="@string/available_subscriptions" /> |
| 19 </PreferenceScreen> | 21 </PreferenceScreen> |
| 20 | 22 |
| 21 <PreferenceScreen | 23 <PreferenceScreen |
| 22 android:summary="@string/more_blocking_summary" | 24 android:summary="@string/more_blocking_summary" |
| 23 android:title="@string/more_blocking" > | 25 android:title="@string/more_blocking" > |
| 24 | 26 |
| 25 <org.adblockplus.sbrowser.contentblocker.MoreBlockingPreferenceCategory | 27 <org.adblockplus.sbrowser.contentblocker.MoreBlockingPreferenceCategory |
| 26 android:layout_width="fill_parent" | 28 android:layout_width="fill_parent" |
| 27 android:layout_height="wrap_content" | 29 android:layout_height="wrap_content" |
| 28 android:title="@string/more_blocking_category" /> | 30 android:title="@string/more_blocking_category" /> |
| 29 </PreferenceScreen> | 31 </PreferenceScreen> |
| 30 | 32 |
| 31 <PreferenceScreen | 33 <PreferenceScreen |
| 32 android:summary="@string/whitelisted_websites_summary" | 34 android:summary="@string/whitelisted_websites_summary" |
| 33 android:title="@string/whitelisted_websites"> | 35 android:title="@string/whitelisted_websites"> |
| 34 | 36 |
| 35 <org.adblockplus.sbrowser.contentblocker.WhitelistedWebsitesPreferenceCa tegory/> | 37 <org.adblockplus.sbrowser.contentblocker.WhitelistedWebsitesPreferenceCa tegory/> |
| 36 </PreferenceScreen> | 38 </PreferenceScreen> |
| 37 | 39 |
| 38 <ListPreference | 40 <org.adblockplus.sbrowser.contentblocker.preferences.MultilineListPreference |
| 39 android:layout_width="fill_parent" | 41 android:layout_width="fill_parent" |
| 40 android:layout_height="wrap_content" | 42 android:layout_height="wrap_content" |
| 41 android:defaultValue="1" | 43 android:defaultValue="1" |
| 42 android:entries="@array/download_settings" | 44 android:entries="@array/download_settings" |
| 43 android:entryValues="@array/download_settings_values" | 45 android:entryValues="@array/download_settings_values" |
| 44 android:key="@string/key_automatic_updates" | 46 android:key="@string/key_automatic_updates" |
| 45 android:title="@string/automatic_updates" /> | 47 android:title="@string/automatic_updates" /> |
| 46 | 48 |
| 47 <PreferenceCategory | 49 <PreferenceCategory |
| 48 android:layout_width="fill_parent" | 50 android:layout_width="fill_parent" |
| 49 android:layout_height="wrap_content" | 51 android:layout_height="wrap_content" |
| 50 android:title="@string/acceptable_ads_category" > | 52 android:title="@string/acceptable_ads_category" > |
| 51 | 53 |
| 52 <CheckBoxPreference | 54 <org.adblockplus.sbrowser.contentblocker.preferences.MultilineCheckBoxPr eference |
| 53 android:layout_width="fill_parent" | 55 android:layout_width="fill_parent" |
| 54 android:layout_height="wrap_content" | 56 android:layout_height="wrap_content" |
| 55 android:defaultValue="true" | 57 android:defaultValue="true" |
| 56 android:key="@string/key_acceptable_ads" | 58 android:key="@string/key_acceptable_ads" |
| 57 android:singleLine="false" | 59 android:singleLine="false" |
| 58 android:title="@string/enable_acceptable_ads" /> | 60 android:title="@string/enable_acceptable_ads" /> |
| 59 </PreferenceCategory> | 61 </PreferenceCategory> |
| 60 | 62 |
| 61 </PreferenceScreen> | 63 </PreferenceScreen> |
| OLD | NEW |
