From 7a25588995ed6c6fcacdd4befe13df4b992bb845 Mon Sep 17 00:00:00 2001
From: Christian Schabesberger <chris.schabesberger@mailbox.org>
Date: Tue, 2 Aug 2016 21:30:55 +0200
Subject: [PATCH] remove listactivity layout

---
 .../newpipe/search_fragment/SearchWorker.java |  2 +-
 .../activity_videoitem_list.xml               | 55 -------------------
 .../res/layout/activity_videoitem_list.xml    | 18 ------
 app/src/main/res/layout/paginate_footer.xml   | 15 -----
 4 files changed, 1 insertion(+), 89 deletions(-)
 delete mode 100644 app/src/main/res/layout-sw600dp-land/activity_videoitem_list.xml
 delete mode 100644 app/src/main/res/layout/activity_videoitem_list.xml
 delete mode 100644 app/src/main/res/layout/paginate_footer.xml

diff --git a/app/src/main/java/org/schabi/newpipe/search_fragment/SearchWorker.java b/app/src/main/java/org/schabi/newpipe/search_fragment/SearchWorker.java
index e4b53344c..d14cdbd41 100644
--- a/app/src/main/java/org/schabi/newpipe/search_fragment/SearchWorker.java
+++ b/app/src/main/java/org/schabi/newpipe/search_fragment/SearchWorker.java
@@ -101,7 +101,7 @@ public class SearchWorker {
                         Log.e(TAG, "------");
                     }
 
-                    View rootView = a.findViewById(R.id.videoitem_list);
+                    View rootView = a.findViewById(android.R.id.content);
                     ErrorActivity.reportError(h, a, result.errors, null, rootView,
                             ErrorActivity.ErrorInfo.make(ErrorActivity.SEARCHED,
                         /* todo: this shoudl not be assigned static */  YOUTUBE, query, R.string.light_parsing_error));
diff --git a/app/src/main/res/layout-sw600dp-land/activity_videoitem_list.xml b/app/src/main/res/layout-sw600dp-land/activity_videoitem_list.xml
deleted file mode 100644
index 4704bd3d2..000000000
--- a/app/src/main/res/layout-sw600dp-land/activity_videoitem_list.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:baselineAligned="false"
-    android:divider="?android:attr/dividerHorizontal"
-    android:orientation="horizontal"
-    android:showDividers="middle"
-    tools:context=".VideoItemListActivity">
-
-    <!--
-    This layout is a two-pane layout for the VideoItems
-    master/detail flow.
-    
-    -->
-
-    <LinearLayout
-        android:orientation="vertical"
-        android:layout_width="0dp"
-        android:layout_height="match_parent"
-        android:layout_weight = "2">
-
-        <android.support.v7.widget.SearchView
-            android:id="@+id/searchViewTablet"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:iconifiedByDefault="false"
-            android:focusable="false"
-            tools:ignore="InconsistentLayout" />
-
-        <include layout="@layout/main_bg" />
-
-        <fragment android:id="@+id/videoitem_list"
-            android:name="org.schabi.newpipe.VideoItemListFragment"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            tools:layout="@android:layout/list_content" />
-
-    </LinearLayout>
-
-
-    <LinearLayout
-        android:orientation="vertical"
-        android:layout_height="match_parent"
-        android:layout_width="0dp"
-        android:layout_weight="4">
-
-        <FrameLayout android:id="@+id/videoitem_detail_container"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            tools:ignore="InconsistentLayout" />
-
-    </LinearLayout>
-
-</LinearLayout>
diff --git a/app/src/main/res/layout/activity_videoitem_list.xml b/app/src/main/res/layout/activity_videoitem_list.xml
deleted file mode 100644
index 5c5a5fc8a..000000000
--- a/app/src/main/res/layout/activity_videoitem_list.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-
-    <include layout="@layout/main_bg" />
-
-    <fragment
-        xmlns:tools="http://schemas.android.com/tools"
-        android:id="@+id/videoitem_list"
-        android:name="org.schabi.newpipe.VideoItemListFragment"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        tools:context=".VideoItemListActivity"
-        tools:layout="@android:layout/list_content" />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/paginate_footer.xml b/app/src/main/res/layout/paginate_footer.xml
deleted file mode 100644
index 8459a3887..000000000
--- a/app/src/main/res/layout/paginate_footer.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:gravity="center_horizontal"
-    android:orientation="vertical">
-
-    <ProgressBar
-        android:id="@+id/paginate_progress_bar"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:gravity="center"
-        android:paddingBottom="10dp"/>
-
-</LinearLayout>
\ No newline at end of file