smarttvweb and compat lib. removed actionbar sherloch

1 files changed, 86 insertions, 54 deletions

diff --git a/vdrmanager/res/layout/channel_list.xml b/vdrmanager/res/layout/channel_list.xml
index 3ff4c1e..df2d984 100644
--- a/vdrmanager/res/layout/channel_list.xml
+++ b/vdrmanager/res/layout/channel_list.xml
@@ -1,70 +1,102 @@
-<ViewFlipper xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/flipper"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:orientation="vertical" >
-
-    <LinearLayout
-        android:id="@+id/main_content"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:orientation="vertical" >
+<!--
+  Copyright 2013 The Android Open Source Project
 
-        <EditText
-            android:id="@+id/search_box"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:hint="@string/type_to_filter"
-            android:inputType="text"
-            android:maxLines="1"
-            android:visibility="gone" />
-
-        <ExpandableListView
-            android:id="@+id/channel_list"
-            android:layout_width="fill_parent"
-            android:layout_height="fill_parent"
-            android:layout_alignParentTop="true"
-            android:layout_alignWithParentIfMissing="true"
-            android:layout_centerHorizontal="true"
-            android:cacheColorHint="?android:attr/colorBackground" />
-
-        <TextView
-            android:id="@android:id/empty"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="Empty set" />
-    </LinearLayout>
-
-    <LinearLayout
-        android:id="@+id/no_connection_layout"
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+
+<!-- A DrawerLayout is intended to be used as the top-level content view using match_parent for both width and height to consume the full space available. -->
+<android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/drawer_layout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent" >
+
+    <!--
+         As the main content view, the view below consumes the entire
+         space available using match_parent in both dimensions.
+    -->
+
+    <ViewFlipper
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/flipper"
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"
         android:orientation="vertical" >
 
         <LinearLayout
+            android:id="@+id/main_content"
             android:layout_width="fill_parent"
             android:layout_height="fill_parent"
-            android:gravity="center"
-            android:orientation="horizontal" >
+            android:orientation="vertical" >
 
-            <TextView
-                android:layout_width="wrap_content"
+            <EditText
+                android:id="@+id/search_box"
+                android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
-                android:text="@string/no_connection"
-                android:textSize="18dip" />
+                android:hint="@string/type_to_filter"
+                android:inputType="text"
+                android:maxLines="1"
+                android:visibility="gone" />
 
-            <ImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:src="@drawable/sad" />
+            <ExpandableListView
+                android:id="@+id/channel_list"
+                android:layout_width="fill_parent"
+                android:layout_height="fill_parent"
+                android:layout_alignParentTop="true"
+                android:layout_alignWithParentIfMissing="true"
+                android:layout_centerHorizontal="true"
+                android:cacheColorHint="?android:attr/colorBackground" />
 
-            <Button
-                android:id="@+id/retry_button"
+            <TextView
+                android:id="@android:id/empty"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="@string/no_connection_retry"
-                android:textSize="18dip" />
+                android:text="Empty set" />
         </LinearLayout>
-    </LinearLayout>
 
-</ViewFlipper>
\ No newline at end of file
+        <LinearLayout
+            android:id="@+id/no_connection_layout"
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent"
+            android:orientation="vertical" >
+
+            <LinearLayout
+                android:layout_width="fill_parent"
+                android:layout_height="fill_parent"
+                android:gravity="center"
+                android:orientation="horizontal" >
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/no_connection"
+                    android:textSize="18dip" />
+
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/sad" />
+
+                <Button
+                    android:id="@+id/retry_button"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/no_connection_retry"
+                    android:textSize="18dip" />
+            </LinearLayout>
+        </LinearLayout>
+    </ViewFlipper>
+
+    <include layout="@layout/left_drawer" />
+
+</android.support.v4.widget.DrawerLayout>
\ No newline at end of file