Delta Between Two Patch Sets: adblockplussbrowser/res/xml/preferences_main.xml
Issue 29441558:
Issue 5243 - Clipped text across languages (Closed)
Left 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.
Right Patch Set: Fixed layout name and bracket in preferences_main.xml
Created May 31, 2017, 1:58 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/layout/multiline_preference.xml ('k')
|
adblockplussbrowser/src/org/adblockplus/sbrowser/contentblocker/ListedSubscriptionsPreferenceCategory.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" | 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:layout="@layout/multiline_preference" |
| 8 android:summary="@string/manage_subscriptions_summary" | 8 android:summary="@string/manage_subscriptions_summary" |
| 9 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.
| |
| 11 | 10 |
| 12 <org.adblockplus.sbrowser.contentblocker.ListedSubscriptionsPreferenceCa tegory | 11 <org.adblockplus.sbrowser.contentblocker.ListedSubscriptionsPreferenceCa tegory |
| 13 android:layout_width="fill_parent" | 12 android:layout_width="fill_parent" |
| 14 android:layout_height="wrap_content" | 13 android:layout_height="wrap_content" |
| 15 android:title="@string/enabled_subscriptions" /> | 14 android:title="@string/enabled_subscriptions" /> |
| 16 | 15 |
| 17 <org.adblockplus.sbrowser.contentblocker.ListedSubscriptionsPreferenceCa tegory | 16 <org.adblockplus.sbrowser.contentblocker.ListedSubscriptionsPreferenceCa tegory |
| 18 android:layout_width="fill_parent" | 17 android:layout_width="fill_parent" |
| 19 android:layout_height="wrap_content" | 18 android:layout_height="wrap_content" |
| 20 android:title="@string/available_subscriptions" /> | 19 android:title="@string/available_subscriptions" /> |
| (...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 54 <org.adblockplus.sbrowser.contentblocker.preferences.MultilineCheckBoxPr eference | 53 <org.adblockplus.sbrowser.contentblocker.preferences.MultilineCheckBoxPr eference |
| 55 android:layout_width="fill_parent" | 54 android:layout_width="fill_parent" |
| 56 android:layout_height="wrap_content" | 55 android:layout_height="wrap_content" |
| 57 android:defaultValue="true" | 56 android:defaultValue="true" |
| 58 android:key="@string/key_acceptable_ads" | 57 android:key="@string/key_acceptable_ads" |
| 59 android:singleLine="false" | 58 android:singleLine="false" |
| 60 android:title="@string/enable_acceptable_ads" /> | 59 android:title="@string/enable_acceptable_ads" /> |
| 61 </PreferenceCategory> | 60 </PreferenceCategory> |
| 62 | 61 |
| 63 </PreferenceScreen> | 62 </PreferenceScreen> |
| LEFT | RIGHT |
