From 82f93c7b751988806043dbf3d4970c57d04782ea Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Wed, 11 Feb 2015 16:10:00 +0300 Subject: remove feeds listview header hack --- .../src/main/java/org/fox/ttrss/FeedCategoriesFragment.java | 2 +- org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsFragment.java | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) (limited to 'org.fox.ttrss/src') diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedCategoriesFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedCategoriesFragment.java index 17f1db05..8604dc1a 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedCategoriesFragment.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedCategoriesFragment.java @@ -216,7 +216,7 @@ public class FeedCategoriesFragment extends Fragment implements OnItemClickListe list.setOnItemClickListener(this); registerForContextMenu(list); - View layout = inflater.inflate(R.layout.drawer_header, container, false); + View layout = inflater.inflate(R.layout.drawer_header, list, false); list.addHeaderView(layout, null, false); TextView login = (TextView) view.findViewById(R.id.drawer_header_login); diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsFragment.java index 63605765..47ffa809 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsFragment.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsFragment.java @@ -286,10 +286,7 @@ public class FeedsFragment extends Fragment implements OnItemClickListener, OnSh ListView list = (ListView)view.findViewById(R.id.feeds); if (m_enableParentBtn) { - View layout = inflater.inflate(R.layout.feeds_goback, container, false); - - layout.setLayoutParams(new ListView.LayoutParams(ListView.LayoutParams.MATCH_PARENT, - ListView.LayoutParams.WRAP_CONTENT)); + View layout = inflater.inflate(R.layout.feeds_goback, list, false); layout.setOnClickListener(new OnClickListener() { @Override @@ -300,7 +297,7 @@ public class FeedsFragment extends Fragment implements OnItemClickListener, OnSh list.addHeaderView(layout, null, false); } else { - View layout = inflater.inflate(R.layout.drawer_header, container, false); + View layout = inflater.inflate(R.layout.drawer_header, list, false); list.addHeaderView(layout, null, false); TextView login = (TextView) view.findViewById(R.id.drawer_header_login); -- cgit v1.2.3