diff options
| author | Parménides GV <parmegv@sdf.org> | 2014-03-29 01:48:07 +0100 |
|---|---|---|
| committer | Parménides GV <parmegv@sdf.org> | 2014-03-29 01:48:07 +0100 |
| commit | 40c58015378ca9f9b7e8ad060eacf51eaaf00057 (patch) | |
| tree | 2b5329c1bdee338c1c180c1a1b116fc4dbf0b657 /src/se/leap/bitmaskclient | |
| parent | 59a3efd287a71648f478ca46fd6be000d9014760 (diff) | |
| parent | 9aa13d7a9a5c9ea8b0ca42fd1090051b89b2129e (diff) | |
Merge branch 'bug/font-size-too-small-for-10'-devices-#5211' into develop
Diffstat (limited to 'src/se/leap/bitmaskclient')
| -rw-r--r-- | src/se/leap/bitmaskclient/ProviderListAdapter.java | 2 | ||||
| -rw-r--r-- | src/se/leap/bitmaskclient/ProviderListFragment.java | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/se/leap/bitmaskclient/ProviderListAdapter.java b/src/se/leap/bitmaskclient/ProviderListAdapter.java index c5e8b64d..43bba085 100644 --- a/src/se/leap/bitmaskclient/ProviderListAdapter.java +++ b/src/se/leap/bitmaskclient/ProviderListAdapter.java @@ -101,7 +101,7 @@ public class ProviderListAdapter<T> extends ArrayAdapter<T> { int position = getRealPosition(index); if (convertView == null) { LayoutInflater inflater = (LayoutInflater) getContext().getSystemService(Context.LAYOUT_INFLATER_SERVICE); - row = (TwoLineListItem)inflater.inflate(android.R.layout.simple_list_item_2, null); + row = (TwoLineListItem)inflater.inflate(R.layout.provider_list_item, null); } else { row = (TwoLineListItem)convertView; } diff --git a/src/se/leap/bitmaskclient/ProviderListFragment.java b/src/se/leap/bitmaskclient/ProviderListFragment.java index f35cf739..db414d87 100644 --- a/src/se/leap/bitmaskclient/ProviderListFragment.java +++ b/src/se/leap/bitmaskclient/ProviderListFragment.java @@ -94,12 +94,12 @@ public class ProviderListFragment extends ListFragment { if(getArguments().containsKey(SHOW_ALL_PROVIDERS))
content_adapter = new ProviderListAdapter<ProviderListContent.ProviderItem>(
getActivity(),
- android.R.layout.simple_list_item_activated_2,
+ R.layout.provider_list_item,
ProviderListContent.ITEMS, getArguments().getBoolean(SHOW_ALL_PROVIDERS));
else
content_adapter = new ProviderListAdapter<ProviderListContent.ProviderItem>(
getActivity(),
- android.R.layout.simple_list_item_activated_2,
+ R.layout.provider_list_item,
ProviderListContent.ITEMS);
|