remove drawer in headlines_articles on phones

2 files changed, 2 insertions, 14 deletions

diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java
index 3b0d9d5e..2b7cd8c6 100644
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java
@@ -768,7 +768,7 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener,
 			String articleContent = article.content != null ? article.content : "";
 
 			if (holder.excerptView != null) {
-				if ((m_compactLayoutMode && m_activity.isSmallScreen()) || !m_prefs.getBoolean("headlines_show_content", true)) {
+				if (!m_prefs.getBoolean("headlines_show_content", true)) {
 					holder.excerptView.setVisibility(View.GONE);
 				} else {
 					String excerpt = Jsoup.parse(articleContent).text(); 
@@ -966,12 +966,6 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener,
 				});								
 			}
 
-            if (m_compactLayoutMode && m_activity.isSmallScreen()) {
-                if (holder.headlineFooter != null) {
-                    holder.headlineFooter.setVisibility(View.GONE);
-                }
-            }
-			
 			return v;
 		}
 
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesFragment.java
index 56e90248..50815f8d 100644
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesFragment.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesFragment.java
@@ -592,7 +592,7 @@ public class OfflineHeadlinesFragment extends Fragment implements OnItemClickLis
 			TextView te = (TextView)v.findViewById(R.id.excerpt);
 
 			if (te != null) {
-				if ((m_compactLayoutMode && m_activity.isSmallScreen()) || !m_prefs.getBoolean("headlines_show_content", true)) {
+				if (!m_prefs.getBoolean("headlines_show_content", true)) {
 					te.setVisibility(View.GONE);
 				} else {
 					String excerpt = Jsoup.parse(article.getString(article.getColumnIndex("content"))).text(); 
@@ -684,12 +684,6 @@ public class OfflineHeadlinesFragment extends Fragment implements OnItemClickLis
 				});								
 			}
 
-            View headlineFooter = v.findViewById(R.id.headline_footer);
-
-            if (headlineFooter != null && m_compactLayoutMode && m_activity.isSmallScreen()) {
-                headlineFooter.setVisibility(View.GONE);
-            }
-
             return v;
 		}