refactoring

37 files changed, 342 insertions, 200 deletions

diff --git a/vdrmanager/res/drawable-hdpi/ic_menu_filter.png b/vdrmanager/res/drawable-hdpi/ic_menu_filter.png
new file mode 100644
index 0000000..39472a6
--- /dev/null
+++ b/vdrmanager/res/drawable-hdpi/ic_menu_filter.png
diff --git a/vdrmanager/res/drawable-hdpi/ic_menu_play_clip.png b/vdrmanager/res/drawable-hdpi/ic_menu_play_clip.png
new file mode 100644
index 0000000..2d0d2e2
--- /dev/null
+++ b/vdrmanager/res/drawable-hdpi/ic_menu_play_clip.png
diff --git a/vdrmanager/res/drawable-hdpi/ic_volume_small.png b/vdrmanager/res/drawable-hdpi/ic_volume_small.png
new file mode 100644
index 0000000..4e9a7ea
--- /dev/null
+++ b/vdrmanager/res/drawable-hdpi/ic_volume_small.png
diff --git a/vdrmanager/res/drawable-mdpi/ic_menu_filter.png b/vdrmanager/res/drawable-mdpi/ic_menu_filter.png
new file mode 100755
index 0000000..19e8d1b
--- /dev/null
+++ b/vdrmanager/res/drawable-mdpi/ic_menu_filter.png
diff --git a/vdrmanager/res/drawable-mdpi/ic_menu_play_clip.png b/vdrmanager/res/drawable-mdpi/ic_menu_play_clip.png
new file mode 100644
index 0000000..5983c22
--- /dev/null
+++ b/vdrmanager/res/drawable-mdpi/ic_menu_play_clip.png
diff --git a/vdrmanager/res/drawable-mdpi/ic_menu_video.png b/vdrmanager/res/drawable-mdpi/ic_menu_video.png
new file mode 100644
index 0000000..0a40ba6
--- /dev/null
+++ b/vdrmanager/res/drawable-mdpi/ic_menu_video.png
diff --git a/vdrmanager/res/drawable-mdpi/ic_video_small.png b/vdrmanager/res/drawable-mdpi/ic_video_small.png
new file mode 100644
index 0000000..441b81a
--- /dev/null
+++ b/vdrmanager/res/drawable-mdpi/ic_video_small.png
diff --git a/vdrmanager/res/drawable-mdpi/ic_volume_small.png b/vdrmanager/res/drawable-mdpi/ic_volume_small.png
new file mode 100644
index 0000000..2a7ec03
--- /dev/null
+++ b/vdrmanager/res/drawable-mdpi/ic_volume_small.png
diff --git a/vdrmanager/res/drawable-xhdpi/ic_menu_filter.png b/vdrmanager/res/drawable-xhdpi/ic_menu_filter.png
new file mode 100644
index 0000000..fe3836c
--- /dev/null
+++ b/vdrmanager/res/drawable-xhdpi/ic_menu_filter.png
diff --git a/vdrmanager/res/drawable-xhdpi/ic_menu_play_clip.png b/vdrmanager/res/drawable-xhdpi/ic_menu_play_clip.png
new file mode 100644
index 0000000..f680fce
--- /dev/null
+++ b/vdrmanager/res/drawable-xhdpi/ic_menu_play_clip.png
diff --git a/vdrmanager/res/drawable-xhdpi/ic_volume_small.png b/vdrmanager/res/drawable-xhdpi/ic_volume_small.png
new file mode 100644
index 0000000..9d6d920
--- /dev/null
+++ b/vdrmanager/res/drawable-xhdpi/ic_volume_small.png
diff --git a/vdrmanager/res/drawable/back.xml b/vdrmanager/res/drawable/back.xml
new file mode 100644
index 0000000..1975fd9
--- /dev/null
+++ b/vdrmanager/res/drawable/back.xml
@@ -0,0 +1,7 @@
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle" >
+
+    <stroke
+        android:width="1px"
+        android:color="#5F5656" />
+</shape>
\ No newline at end of file
diff --git a/vdrmanager/res/drawable/ic_menu_filter.png b/vdrmanager/res/drawable/ic_menu_filter.png
new file mode 100644
index 0000000..39472a6
--- /dev/null
+++ b/vdrmanager/res/drawable/ic_menu_filter.png
diff --git a/vdrmanager/res/drawable/ic_menu_play_clip.png b/vdrmanager/res/drawable/ic_menu_play_clip.png
new file mode 100644
index 0000000..2d0d2e2
--- /dev/null
+++ b/vdrmanager/res/drawable/ic_menu_play_clip.png
diff --git a/vdrmanager/res/drawable/ic_video_small.png b/vdrmanager/res/drawable/ic_video_small.png
new file mode 100644
index 0000000..67071fc
--- /dev/null
+++ b/vdrmanager/res/drawable/ic_video_small.png
diff --git a/vdrmanager/res/drawable/ic_volume_small.png b/vdrmanager/res/drawable/ic_volume_small.png
new file mode 100644
index 0000000..2a7ec03
--- /dev/null
+++ b/vdrmanager/res/drawable/ic_volume_small.png
diff --git a/vdrmanager/res/drawable/line_gradient.xml b/vdrmanager/res/drawable/line_gradient.xml
new file mode 100644
index 0000000..f04ecbc
--- /dev/null
+++ b/vdrmanager/res/drawable/line_gradient.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle" >
+
+    <gradient
+        android:angle="0"
+        android:centerColor="@color/white"
+        android:endColor="@color/black"
+        android:startColor="@color/black"
+        android:type="linear"
+        android:useLevel="false" />
+
+</shape>
\ No newline at end of file
diff --git a/vdrmanager/res/layout/epg_detail.xml b/vdrmanager/res/layout/epg_detail.xml
index 40dcec0..fd67d47 100644
--- a/vdrmanager/res/layout/epg_detail.xml
+++ b/vdrmanager/res/layout/epg_detail.xml
@@ -93,12 +93,39 @@
         android:layout_weight="1"
         android:padding="5dip" >
 
-        <TextView
-            android:id="@+id/epg_detail_description"
-            android:layout_width="fill_parent"
-            android:layout_height="fill_parent"
-            android:textSize="16dip" >
-        </TextView>
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:orientation="vertical" >
+
+            <TextView
+                android:id="@+id/epg_detail_description"
+                android:layout_width="fill_parent"
+                android:layout_height="fill_parent"
+                android:textSize="16dip" >
+            </TextView>
+
+            <View style="@style/Line" />
+
+            <LinearLayout
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal" >
+
+                <ImageView
+                    android:id="@+id/audio_image"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_volume_small" />
+
+                <TextView
+                    android:id="@+id/epg_detail_audio"
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="5dp"
+                    android:text="" />
+            </LinearLayout>
+        </LinearLayout>
     </ScrollView>
 
     <TextView
@@ -111,72 +138,73 @@
         android:layout_width="fill_parent"
         android:layout_height="4sp" />
 
-  <TableLayout xmlns:android="http://schemas.android.com/apk/res/android"
-      android:layout_width="fill_parent"
-      android:layout_height="wrap_content" 
-      android:id="@+id/root"
-      android:stretchColumns="*"
-      style="@android:style/ButtonBar">
-      
-  <TableRow android:layout_margin="0dip"
-         android:id="@+id/first_row">
-        <ImageButton
-            android:id="@+id/epg_event_livetv"
-            style="?android:attr/buttonStyleSmall"
-           android:layout_width="0dip"
-            android:layout_height="wrap_content"
-            android:layout_centerHorizontal="true"
-            android:layout_gravity="center_horizontal"
-            android:layout_weight="1"
-            android:background="@android:drawable/list_selector_background"
-            android:src="@drawable/tv"
-            android:text="@string/epg_eent_livetv_text" />
-
-        <ImageButton
-            android:id="@+id/epg_event_imdb"
-            style="?android:attr/buttonStyleSmall"
-        	android:layout_width="0dip"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:background="@android:drawable/list_selector_background"
-            android:src="@drawable/imdb"
-            android:text="@string/epg_event_imdb_text" />
-            
-        <ImageButton
-            android:id="@+id/epg_event_omdb"
-            style="?android:attr/buttonStyleSmall"
-        	android:layout_width="0dip"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:background="@android:drawable/list_selector_background"
-            android:src="@drawable/omdb"
-            android:text="@string/epg_event_omdb_text" />
-            
-                  
-        <ImageButton
-            android:id="@+id/epg_event_tmdb"
-            style="?android:attr/buttonStyleSmall"
-        	android:layout_width="0dip"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:background="@android:drawable/list_selector_background"
-            android:src="@drawable/tmdb"
-            android:text="@string/epg_event_tmdb_text" />
-
-        <ImageButton
-            android:id="@+id/epg_event_create_timer"
-            style="?android:attr/buttonStyleSmall"
-            android:layout_width="0dip"
-            android:layout_height="wrap_content"
-            android:layout_centerHorizontal="true"
-            android:layout_gravity="center_horizontal"
-            android:layout_weight="1"
-            android:background="@android:drawable/list_selector_background"
-            android:src="@drawable/timer"
-            android:text="@string/epg_event_create_timer_text" />
-
-</TableRow>
-        </TableLayout>
+    <TableLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/root"
+        style="@android:style/ButtonBar"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:stretchColumns="*" >
+
+        <TableRow
+            android:id="@+id/first_row"
+            android:layout_margin="0dip" >
+
+            <ImageButton
+                android:id="@+id/epg_event_livetv"
+                style="?android:attr/buttonStyleSmall"
+                android:layout_width="0dip"
+                android:layout_height="wrap_content"
+                android:layout_centerHorizontal="true"
+                android:layout_gravity="center_horizontal"
+                android:layout_weight="1"
+                android:background="@android:drawable/list_selector_background"
+                android:src="@drawable/tv"
+                android:text="@string/epg_eent_livetv_text" />
+
+            <ImageButton
+                android:id="@+id/epg_event_imdb"
+                style="?android:attr/buttonStyleSmall"
+                android:layout_width="0dip"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:background="@android:drawable/list_selector_background"
+                android:src="@drawable/imdb"
+                android:text="@string/epg_event_imdb_text" />
+
+            <ImageButton
+                android:id="@+id/epg_event_omdb"
+                style="?android:attr/buttonStyleSmall"
+                android:layout_width="0dip"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:background="@android:drawable/list_selector_background"
+                android:src="@drawable/omdb"
+                android:text="@string/epg_event_omdb_text" />
+
+            <ImageButton
+                android:id="@+id/epg_event_tmdb"
+                style="?android:attr/buttonStyleSmall"
+                android:layout_width="0dip"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:background="@android:drawable/list_selector_background"
+                android:src="@drawable/tmdb"
+                android:text="@string/epg_event_tmdb_text" />
+
+            <ImageButton
+                android:id="@+id/epg_event_create_timer"
+                style="?android:attr/buttonStyleSmall"
+                android:layout_width="0dip"
+                android:layout_height="wrap_content"
+                android:layout_centerHorizontal="true"
+                android:layout_gravity="center_horizontal"
+                android:layout_weight="1"
+                android:background="@android:drawable/list_selector_background"
+                android:src="@drawable/timer"
+                android:text="@string/epg_event_create_timer_text" />
+        </TableRow>
+    </TableLayout>
     <!--
      <ImageButton
       android:id="@+id/epg_event_share"
@@ -184,7 +212,7 @@
       android:layout_width="wrap_content"
       android:layout_height="wrap_content" android:layout_marginLeft="20dip" android:layout_marginRight="20dip"
       android:layout_gravity="center_horizontal"
-      android:layout_centerHorizontal="true" 
+      android:layout_centerHorizontal="true"
       android:background="@android:drawable/list_selector_background"
       style="?android:attr/buttonStyleSmall"
       android:text="@string/epg_event_share_text"/>
@@ -198,7 +226,7 @@
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:layout_gravity="center_horizontal"
-      android:layout_centerHorizontal="true"  android:layout_weight="1" 
+      android:layout_centerHorizontal="true"  android:layout_weight="1"
       android:background="@android:drawable/list_selector_background"
       style="?android:attr/buttonStyleSmall"
       android:text="@string/epg_event_create_timer_text"/>
diff --git a/vdrmanager/res/layout/event_epg_list.xml b/vdrmanager/res/layout/event_epg_list.xml
index ac75055..6c26b4a 100644
--- a/vdrmanager/res/layout/event_epg_list.xml
+++ b/vdrmanager/res/layout/event_epg_list.xml
@@ -5,61 +5,78 @@
     android:layout_height="fill_parent"
     android:orientation="vertical" >
 
-    <LinearLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
+    <RelativeLayout
         android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:orientation="vertical" >
-        
+        android:layout_height="wrap_content" >
+
         <LinearLayout
             android:id="@+id/whatson_time"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
+            android:layout_alignParentLeft="true"
+            android:layout_alignParentTop="true"
             android:orientation="horizontal" >
-        
 
-        <Spinner
-            android:id="@+id/epg_list_channel_spinner"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-			android:layout_marginTop="3dip"            
-            android:prompt="@string/epg_list_channel_spinner" />
+            <Spinner
+                android:id="@+id/epg_list_channel_spinner"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="3dip"
+                android:layout_weight="1"
+                android:prompt="@string/epg_list_channel_spinner" />
 
             <ImageView
-                android:clickable="true"
-                android:background="@android:drawable/list_selector_background"
-                android:layout_centerHorizontal="true"
-                android:layout_gravity="center_horizontal"
                 android:id="@+id/switch_epg_view"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
                 style="?android:attr/buttonStyleSmall"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:layout_centerHorizontal="true"
+                android:layout_gravity="center_horizontal"
+                android:background="@android:drawable/list_selector_background"
+                android:clickable="true"
                 android:src="@drawable/ic_menu_revert" />
-		</LinearLayout>
+        </LinearLayout>
 
         <ListView
             android:id="@+id/whatson_list"
             android:layout_width="fill_parent"
-            android:layout_height="fill_parent"
-            android:layout_alignParentTop="true"
+            android:layout_height="wrap_content"
+            android:layout_above="@+id/channel_info"
             android:layout_alignWithParentIfMissing="true"
-            android:layout_below="@id/epg_list_channel_spinner"
+            android:layout_below="@+id/whatson_time"
             android:layout_centerHorizontal="true"
             android:cacheColorHint="?android:attr/colorBackground" />
 
-        <TextView
-            android:id="@+id/epg_list_search_label"
-            android:layout_width="wrap_content"
+        <LinearLayout
+            android:id="@+id/channel_info"
+            android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:text="@string/epg_list_search_label" />
-    </LinearLayout>
+            android:layout_alignParentBottom="true"
+            android:background="@drawable/back"
+            android:orientation="horizontal"
+            android:layout_marginTop="4dp"
+            android:padding="2dp" >
+
+            <ImageView
+                android:id="@+id/audio_image"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:src="@drawable/ic_volume_small" />
+
+            <TextView
+                android:id="@+id/channel_audio"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="5dp"
+                android:text="" />
+        </LinearLayout>
+    </RelativeLayout>
 
     <LinearLayout
         android:id="@+id/no_connection_layout"
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"
-        android:orientation="vertical">
+        android:orientation="vertical" >
 
         <LinearLayout
             android:layout_width="fill_parent"
@@ -86,4 +103,5 @@
                 android:textSize="18dip" />
         </LinearLayout>
     </LinearLayout>
+
 </ViewFlipper>
\ No newline at end of file
diff --git a/vdrmanager/res/layout/time_epg_list.xml b/vdrmanager/res/layout/time_epg_list.xml
index e7c0322..3274adb 100644
--- a/vdrmanager/res/layout/time_epg_list.xml
+++ b/vdrmanager/res/layout/time_epg_list.xml
@@ -26,9 +26,9 @@
             <ImageView
                 android:id="@+id/epg_list_times"
                 style="?android:attr/buttonStyleSmall"
-                android:layout_centerHorizontal="true"
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                android:layout_height="match_parent"
+                android:layout_centerHorizontal="true"
                 android:layout_gravity="center_horizontal"
                 android:background="@android:drawable/list_selector_background"
                 android:clickable="true"
@@ -46,7 +46,7 @@
                 android:id="@+id/switch_epg_view"
                 style="?android:attr/buttonStyleSmall"
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                android:layout_height="match_parent"
                 android:layout_centerHorizontal="true"
                 android:layout_gravity="center_horizontal"
                 android:background="@android:drawable/list_selector_background"
diff --git a/vdrmanager/res/menu/channel_list_item_menu.xml b/vdrmanager/res/menu/channel_list_item_menu.xml
index aa953ac..c2fc9e0 100644
--- a/vdrmanager/res/menu/channel_list_item_menu.xml
+++ b/vdrmanager/res/menu/channel_list_item_menu.xml
@@ -5,21 +5,24 @@
   android:id="@+id/channel_item_menu_stream"
   android:title="@string/channel_item_menu_stream"/>
 
+<!--
   <item
     android:id="@+id/channel_item_menu_epg"
     android:title="@string/channel_item_menu_epg"/>
-	
-<item 
+-->
+
+<item
 	android:id="@+id/channel_item_menu_switch"
     android:title="@string/channel_item_menu_switch"/>
-      
-  
+
+<!--
   <item android:visible="false"
     android:id="@+id/channel_item_menu_hide"
     android:title="@string/channel_item_menu_hide"/>
+
   <item  android:visible="false"
     android:id="@+id/channel_item_menu_hide_permanent"
     android:title="@string/channel_item_menu_hide_permanent"/>
-  
-    
+-->
+
 </menu>
\ No newline at end of file
diff --git a/vdrmanager/res/menu/channellist.xml b/vdrmanager/res/menu/channellist.xml
index 2ca3884..29cf2d8 100644
--- a/vdrmanager/res/menu/channellist.xml
+++ b/vdrmanager/res/menu/channellist.xml
@@ -10,7 +10,7 @@
     <item
         android:id="@+id/channels_groupby" android:alphabeticShortcut="g"
         android:icon="@android:drawable/ic_menu_sort_alphabetically"
-        android:showAsAction="ifRoom"
+		android:showAsAction="ifRoom"
         android:title="@string/menu_groupby"/>
 
 </menu>
\ No newline at end of file
diff --git a/vdrmanager/res/menu/epg_event_list_menu.xml b/vdrmanager/res/menu/epg_event_list_menu.xml
new file mode 100644
index 0000000..c0615e9
--- /dev/null
+++ b/vdrmanager/res/menu/epg_event_list_menu.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <!--
+	<item
+	  android:id="@+id/epg_menu_search"
+	  android:icon="@android:drawable/ic_menu_search"
+	  android:title="@string/epg_menu_search"/>
+    -->
+    <!--
+	<item
+	  android:id="@+id/epg_menu_times"
+	  android:icon="@android:drawable/ic_menu_search"
+	  android:title="@string/epg_menu_times"/>
+    -->
+    <!--  -->
+
+    <item
+        android:id="@+id/epg_list_stream"
+        android:icon="@drawable/ic_menu_play_clip"
+        android:showAsAction="ifRoom"
+        android:title="@string/livetv"/>
+</menu>
\ No newline at end of file
diff --git a/vdrmanager/res/menu/epg_list_item_menu.xml b/vdrmanager/res/menu/epg_list_item_menu.xml
index 7bda366..15dbef8 100644
--- a/vdrmanager/res/menu/epg_list_item_menu.xml
+++ b/vdrmanager/res/menu/epg_list_item_menu.xml
@@ -1,29 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android" >
 
-   <item android:id="@+id/epg_item_menu_timer_toggle"
+    <item
+        android:id="@+id/epg_item_menu_timer_toggle"
         android:title="@string/epg_item_menu_timer_enable"
         android:visible="false"/>
-
     <item
         android:id="@+id/epg_item_menu_timer_add"
         android:title="@string/epg_item_menu_timer_add"/>
-
     <item
         android:id="@+id/epg_item_menu_timer_delete"
         android:title="@string/epg_item_menu_timer_delete"
         android:visible="false"/>
-
     <item
         android:id="@+id/epg_item_menu_timer_modify"
         android:title="@string/epg_item_menu_timer_modify"
         android:visible="false"/>
-
     <item
         android:id="@+id/epg_item_menu_live_tv"
         android:title="@string/livetv"
         android:visible="false"/>
-	
-	<item android:id="@+id/epg_item_menu_switchto" 	   android:title="@string/switch_to_channel" android:visible="true" />
-    
+    <item
+        android:id="@+id/epg_item_menu_switchto"
+        android:title="@string/switch_to_channel"
+        android:visible="true"/>
+
 </menu>
\ No newline at end of file
diff --git a/vdrmanager/res/menu/epg_list_menu.xml b/vdrmanager/res/menu/epg_list_menu.xml
index 8d1b0ba..ebbefa9 100644
--- a/vdrmanager/res/menu/epg_list_menu.xml
+++ b/vdrmanager/res/menu/epg_list_menu.xml
@@ -1,22 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-<!--
+<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <!--
 	<item
 	  android:id="@+id/epg_menu_search"
 	  android:icon="@android:drawable/ic_menu_search"
 	  android:title="@string/epg_menu_search"/>
--->
-<!--
+    -->
+    <!--
 	<item
 	  android:id="@+id/epg_menu_times"
 	  android:icon="@android:drawable/ic_menu_search"
 	  android:title="@string/epg_menu_times"/>
     -->
+    <!--  -->
 
-	<item
-	  android:showAsAction="ifRoom"
-	  android:id="@+id/epg_list_sort_menu"
-	  android:icon="@android:drawable/ic_menu_sort_alphabetically"
-	  android:title="@string/sort"/>
+    <item
+        android:id="@+id/epg_list_sort_menu"
+        android:icon="@android:drawable/ic_menu_sort_alphabetically"
+        android:showAsAction="ifRoom"
+        android:title="@string/sort"/>
 
 </menu>
\ No newline at end of file
diff --git a/vdrmanager/res/menu/epg_search_menu.xml b/vdrmanager/res/menu/epg_search_menu.xml
new file mode 100644
index 0000000..e4bf9d0
--- /dev/null
+++ b/vdrmanager/res/menu/epg_search_menu.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+
+<!-- -->
+	<item
+	  android:id="@+id/epg_search"
+	  android:icon="@android:drawable/ic_menu_search"
+	  android:alphabeticShortcut="s"
+	  android:showAsAction="always"
+	  android:title="@string/action_menu_search"/>
+
+</menu>
\ No newline at end of file
diff --git a/vdrmanager/res/menu/recording_list_menu.xml b/vdrmanager/res/menu/recording_list_menu.xml
index 2edc02b..ddc32e7 100644
--- a/vdrmanager/res/menu/recording_list_menu.xml
+++ b/vdrmanager/res/menu/recording_list_menu.xml
@@ -1,21 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
-<!-- 
+<!--
 	<item
 	  android:id="@+id/epg_menu_search"
 	  android:icon="@android:drawable/ic_menu_search"
 	  android:title="@string/epg_menu_search"/>
 -->
-<!-- 
+<!--
 	<item
 	  android:id="@+id/epg_menu_times"
 	  android:icon="@android:drawable/ic_menu_search"
 	  android:title="@string/epg_menu_times"/>
     -->
-    
+	<!--
     <item
         android:id="@+id/menu_groupby" android:alphabeticShortcut="g"
         android:icon="@android:drawable/ic_menu_sort_alphabetically"
         android:showAsAction="ifRoom"
         android:title="@string/menu_groupby"/>
+     -->
 </menu>
\ No newline at end of file
diff --git a/vdrmanager/res/menu/refresh_filter_menu.xml b/vdrmanager/res/menu/refresh_filter_menu.xml
new file mode 100644
index 0000000..a8065b5
--- /dev/null
+++ b/vdrmanager/res/menu/refresh_filter_menu.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <item
+        android:id="@+id/list_refresh"
+        android:alphabeticShortcut="r"
+        android:icon="@drawable/ic_menu_refresh"
+        android:showAsAction="ifRoom"
+        android:title="@string/refresh"/>
+
+    <item
+        android:id="@+id/list_filter"
+        android:alphabeticShortcut="f"
+        android:icon="@drawable/ic_menu_filter"
+        android:showAsAction="ifRoom"
+        android:title="@string/filter"/>
+</menu>
\ No newline at end of file
diff --git a/vdrmanager/res/menu/refresh_menu.xml b/vdrmanager/res/menu/refresh_menu.xml
index 9c31b62..1d8dcad 100644
--- a/vdrmanager/res/menu/refresh_menu.xml
+++ b/vdrmanager/res/menu/refresh_menu.xml
@@ -4,8 +4,7 @@
     <item
         android:id="@+id/list_refresh"
         android:alphabeticShortcut="r"
-        android:icon="@drawable/ic_menu_refresh"
         android:showAsAction="ifRoom"
+        android:icon="@drawable/ic_menu_refresh"
         android:title="@string/refresh"/>
-
 </menu>
\ No newline at end of file
diff --git a/vdrmanager/res/values-de/strings.xml b/vdrmanager/res/values-de/strings.xml
index 0755945..28ea91a 100644
--- a/vdrmanager/res/values-de/strings.xml
+++ b/vdrmanager/res/values-de/strings.xml
@@ -120,12 +120,7 @@
     <item>ES</item>
     <item>PS</item>
   </string-array>
-  <string-array name="livetv_streamformat_values">
-    <item>TS</item>
-    <item>PES</item>
-    <item>ES</item>
-    <item>PS</item>
-  </string-array>
+
 
   <string name="main_menu_preferences">Einstellungen</string>
   <string name="main_menu_info">Infomationen</string>
@@ -142,7 +137,6 @@
   <string name="vdr_host_summary">VDR Hostrechner</string>
   <string name="vdr_port_title">VDR Plugin Port </string>
   <string name="vdr_port_summary">Port für Verbindungen zum VDR Plugin</string>
-  <string name="vdr_port_default">6420</string>
   <string name="vdr_password_title">VDR Plugin Passwort</string>
   <string name="vdr_password_summary">Passwort für das VDR Plugin</string>
   <string name="vdr_ssl_title">Sichere Verbindung</string>
diff --git a/vdrmanager/res/values-it/strings.xml b/vdrmanager/res/values-it/strings.xml
index ad11824..4b1d181 100644
--- a/vdrmanager/res/values-it/strings.xml
+++ b/vdrmanager/res/values-it/strings.xml
@@ -33,7 +33,7 @@
   <string name="search_reapt">Riesegui</string>
   <string name="share_chooser">Condividi valore EPG</string>
   <string name="about_text">
-        Info sul programma \"Gestore VDR\" per Android\n 
+        Info sul programma \"Gestore VDR\" per Android\n
 		Questa è la versione %1$s\n
         Se a casa disponi di una VDR raggiungibile
          da Internet e possiedi un telefono cellulare che usa Android allora forse hai trovato l\'applicazione che fa per te.
@@ -141,7 +141,6 @@
   <string name="wakeup_password_summary">Password per accensione remota</string>
   <string name="wakeup_method_title">Metodo accensione</string>
   <string name="wakeup_method_summary">Scegli un metodo per accendere VDR</string>
-  <string name="default_wakeup_method">url</string>
   <string name="wakeup_wol_custom_boradcast_title">Indirizzo IP destinazione</string>
   <string name="wakeup_wol_custom_boradcast_summary">A meno di non avere delle tabelle ARP statiche dovresti usare un indirizzo di broadcast.</string>
   <string name="wakeup_wol_mac_title">Indirizzo MAC</string>
@@ -243,12 +242,6 @@
     <item>ES</item>
     <item>PS</item>
   </string-array>
-  <string-array name="livetv_streamformat_values">
-    <item>TS</item>
-    <item>PES</item>
-    <item>ES</item>
-    <item>PS</item>
-  </string-array>
   <string-array name="wakeup_methods">
     <item>Chiama URL</item>
     <item>WOL</item>
diff --git a/vdrmanager/res/values-uk/strings.xml b/vdrmanager/res/values-uk/strings.xml
index 9511c3d..28aee45 100644
--- a/vdrmanager/res/values-uk/strings.xml
+++ b/vdrmanager/res/values-uk/strings.xml
@@ -32,7 +32,7 @@
   <string name="share">Поділитися</string>
   <string name="search_reapt">Перезапустити</string>
   <string name="share_chooser">Поділитися текстом EPG</string>
-  <string name="about_text">Про програму \"VDR-менеджер\" для Android\n 
+  <string name="about_text">Про програму \"VDR-менеджер\" для Android\n
 Це версія %1$s\n
 Якщо Ви маєте пристрій VDR, до якого є доступ
 через інтернет і є мобільний телефон з ОС Android, тоді Ви оцінити можливості цієї прогорами.
@@ -117,7 +117,6 @@ herrlado&lt;herrlado@gmail.com&gt;
   <string name="vdr_host_summary">Вузол з запущеним VDR</string>
   <string name="vdr_port_title">Порт додатку VDR </string>
   <string name="vdr_port_summary">Порт для підключення до додатку VDR</string>
-  <string name="vdr_port_default">6420</string>
   <string name="vdr_password_title">Пароль додатку VDR</string>
   <string name="vdr_password_summary">Пароль для додатка VDR</string>
   <string name="vdr_ssl_title">Безпечне підключення</string>
@@ -138,7 +137,6 @@ herrlado&lt;herrlado@gmail.com&gt;
   <string name="wakeup_password_summary">Пароль для віддаленого пробудження</string>
   <string name="wakeup_method_title">Метод пробудження</string>
   <string name="wakeup_method_summary">Виберіть метод пробудження вузла VDR</string>
-  <string name="default_wakeup_method">wol</string>
   <string name="wakeup_wol_custom_boradcast_title">IP-адреса призначення</string>
   <string name="wakeup_wol_custom_boradcast_summary">Якщо у Вас немає статичних таблиці ARP, Вам потрібно використовувати якусь широкомовну адресу.</string>
   <string name="wakeup_wol_mac_title">MAC-адреса</string>
@@ -238,12 +236,7 @@ herrlado&lt;herrlado@gmail.com&gt;
     <item>ES</item>
     <item>PS</item>
   </string-array>
-  <string-array name="livetv_streamformat_values">
-    <item>TS</item>
-    <item>PES</item>
-    <item>ES</item>
-    <item>PS</item>
-  </string-array>
+
   <string-array name="wakeup_methods">
     <item>Виклик URL</item>
     <item>WOL (пробудження через інтернет)</item>
diff --git a/vdrmanager/res/values/colors.xml b/vdrmanager/res/values/colors.xml
new file mode 100644
index 0000000..60985bb
--- /dev/null
+++ b/vdrmanager/res/values/colors.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <color name="black">#000</color>
+    <color name="white">#fff</color>
+
+</resources>
\ No newline at end of file
diff --git a/vdrmanager/res/values/no_translate.xml b/vdrmanager/res/values/no_translate.xml
index 43a1464..048ef4d 100644
--- a/vdrmanager/res/values/no_translate.xml
+++ b/vdrmanager/res/values/no_translate.xml
@@ -1,4 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+
     <string name="default_wakeup_method">wol</string>
+    <string name="vdr_port_default">6420</string>
+
+    <string-array name="livetv_streamformat_values">
+        <item>TS</item>
+        <item>PES</item>
+        <item>ES</item>
+        <item>PS</item>
+    </string-array>
+
+    <string name="vdr_stream_proxy_key">key_vdr_stream_proxy</string>
+
 </resources>
\ No newline at end of file
diff --git a/vdrmanager/res/values/strings.xml b/vdrmanager/res/values/strings.xml
index adaaef2..5bb6068 100644
--- a/vdrmanager/res/values/strings.xml
+++ b/vdrmanager/res/values/strings.xml
@@ -9,7 +9,7 @@
     <string name="action_menu_wakeup">Wakeup</string>
     <string name="app_name">VDR-Manager</string>
     <string name="channel_item_menu_epg">Show EPG</string>
-    <string name="channel_item_menu_stream">Show live stream</string>
+    <string name="channel_item_menu_stream">Live stream</string>
     <string name="channel_item_menu_hide">Hide</string>
     <string name="channel_item_menu_hide_permanent">Hide permanent</string>
     <string name="channel_group_menu_hide">Hide</string>
@@ -82,7 +82,7 @@
     <string name="epg_search_button">Search</string>
     <string name="epg_duration_template">%1$s min</string>
     <string name="epg_duration_template_live">%1$s/%2$s min</string>
-    <string name="epg_of_a_channel">EPG -> %1$s,  %2$s/%3$s</string>
+    <string name="epg_of_a_channel">%1$s,  %2$s/%3$s</string>
     <string name="epg_by_channel">EPG by channel</string>
     <string name="epg_by_search">EPG Search</string>
     <string name="epg_by_search_param">EPG Search: \'%1$s\'</string>
@@ -95,7 +95,7 @@
     <string name="new_timer">New timer</string>
     <string name="vdr_error_text">The communication with VDR has caused an error: %1$s</string>
     <string name="livetv">Live TV</string>
-    <string name="settings_livetv_summary">Needs streamdev-server on VDR and an external
+      <string name="settings_livetv_summary">Needs streamdev-server on VDR and an external
 		player such as VPlayer</string>
     <string name="settings_livetv_streamformat">Streamformat</string>
     <string name="settings_livetv_port">Streaming Port</string>
@@ -108,17 +108,13 @@
         <item>ES</item>
         <item>PS</item>
     </string-array>
-    <string-array name="livetv_streamformat_values">
-        <item>TS</item>
-        <item>PES</item>
-        <item>ES</item>
-        <item>PS</item>
-    </string-array>
+
 
     <string name="key_remux_enable">remux_enable</string>
     <string name="key_remux_command">remux_command</string>
     <string name="key_remux_parameter">remux_parameter</string>
     <string name="stream_via_as">Stream</string>
+    <string name="stream_choose_audio">Choose Audio Track</string>
     <string name="stream_via">via %s</string>
     <string name="stream_as">as %s</string>
     <string name="remux_title">Remux</string>
@@ -144,7 +140,6 @@
     <string name="vdr_host_summary">Host running VDR</string>
     <string name="vdr_port_title">VDR plugin port </string>
     <string name="vdr_port_summary">Port for connections to VDR plugin</string>
-    <string name="vdr_port_default">6420</string>
     <string name="vdr_password_title">VDR plugin password</string>
     <string name="vdr_password_summary">Password for the VDR plugin</string>
     <string name="vdr_ssl_title">Secure connect</string>
@@ -288,6 +283,7 @@
     <string name="progress_recordings_loading">Loading recordings…</string>
     <string name="progress_switching">Switching…</string>
     <string name="progress_channels_loading">Loading channels…</string>
+    <string name="progress_loading">Loading…</string>
     <string name="progress_disconnect">Disconnecting…</string>
     <string name="progress_wakeup_sending">Initiating wakeup request…</string>
     <string name="progress_wakeup_sent">Wakeup request sent</string>
@@ -362,6 +358,10 @@
         <item>Channels</item>
         <item>Alphabet</item>
     </string-array>
+    <string-array name="recordings_group_by">
+        <item>By Time</item>
+        <item>By Alphabet</item>
+    </string-array>
 
     <string name="gui_recent_channels_order_summary">Sort by last used or mostly used</string>
     <string name="gui_recent_channels_order_title">Recent Channels Sorting</string>
@@ -372,7 +372,6 @@
         <item>Source</item>
         <item>Name</item>
     </string-array>
-
     <string-array name="navigation_array">
         <item>Channels</item>
         <item>EPG by Time</item>
@@ -381,5 +380,10 @@
         <item>Timers</item>
     </string-array>
 
+    <string name="filter">Filter</string>
 
+    <string name="vdr_stream_proxy_sum">Proxy server for streaming</string>
+    <string name="vdr_stream_proxy_title">Proxy Server</string>
+    <string name="audio_tracks_template">Audio Tracks: %1$s</string>
+    <string name="audio_track_dolby">D</string>
 </resources>
\ No newline at end of file
diff --git a/vdrmanager/res/values/styles.xml b/vdrmanager/res/values/styles.xml
index 180c299..4c463ba 100644
--- a/vdrmanager/res/values/styles.xml
+++ b/vdrmanager/res/values/styles.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 Jake Wharton
+<!--
+     Copyright (C) 2011 Jake Wharton
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -15,6 +16,7 @@
 -->
 
 <resources>
+
     <style name="Theme.PageIndicatorDefaults" parent="@android:style/Theme">
         <item name="circlePageIndicatorStyle">@style/Widget.CirclePageIndicator</item>
         <item name="titlePageIndicatorStyle">@style/Widget.TitlePageIndicator</item>
@@ -45,8 +47,7 @@
         <item name="titlePadding">@dimen/default_title_indicator_title_padding</item>
         <item name="topPadding">@dimen/default_title_indicator_top_padding</item>
     </style>
-    
-    
+
     <style name="MinusButton">
         <item name="android:background">@drawable/btn_circle</item>
         <item name="android:src">@drawable/ic_btn_round_minus</item>
@@ -56,6 +57,15 @@
         <item name="android:background">@drawable/btn_circle</item>
         <item name="android:src">@drawable/ic_btn_round_plus</item>
     </style>
-    
-    
-</resources>
+
+    <style name="Line">
+        <item name="android:layout_width">fill_parent</item>
+        <item name="android:layout_height">1px</item>
+        <item name="android:layout_marginLeft">10dp</item>
+        <item name="android:layout_marginRight">10dp</item>
+        <item name="android:layout_marginTop">10dp</item>
+        <item name="android:layout_marginBottom">10dp</item>
+        <item name="android:background">@drawable/line_gradient</item>
+    </style>
+
+</resources>
\ No newline at end of file
diff --git a/vdrmanager/res/xml/vdr_prefs.xml b/vdrmanager/res/xml/vdr_prefs.xml
index 20d9823..0d56c8e 100644
--- a/vdrmanager/res/xml/vdr_prefs.xml
+++ b/vdrmanager/res/xml/vdr_prefs.xml
@@ -4,7 +4,7 @@
 	<PreferenceCategory android:title="@string/vdr_prefs_category">
 
 		<EditTextPreference android:inputType="textCapWords"
-			android:defaultValue="-" android:key="@string/vdr_name_key"
+			android:key="@string/vdr_name_key"
 			android:summary="@string/vdr_name_summary" android:title="@string/vdr_name_title" />
 
 	</PreferenceCategory>
@@ -13,10 +13,10 @@
 		android:title="@string/vdr_preferences">
 
 		<EditTextPreference android:inputType="textNoSuggestions"
-			android:defaultValue="0.0.0.0" android:key="@string/vdr_host_key"
+			android:key="@string/vdr_host_key"
 			android:summary="@string/vdr_host_summary" android:title="@string/vdr_host_title" />
 
-		<EditTextPreference android:defaultValue="@string/vdr_port_default"
+		<EditTextPreference
 			android:key="@string/vdr_port_key" android:inputType="number"
 			android:summary="@string/vdr_port_summary" android:title="@string/vdr_port_title" />
 
@@ -25,7 +25,7 @@
 			android:title="@string/vdr_password_title" />
 
 		<CheckBoxPreference android:key="@string/vdr_ssl_key"
-			android:defaultValue="false" android:enabled="false"
+			android:enabled="false"
 			android:summary="@string/vdr_ssl_summary" android:title="@string/vdr_ssl_title" />
 
 	</PreferenceCategory>
@@ -34,10 +34,10 @@
 		android:title="@string/channel_filter_preferences">
 
 		<CheckBoxPreference android:key="@string/channel_filter_filter_key"
-			android:defaultValue="false" android:summary="@string/channel_filter_filter_summary"
+            android:summary="@string/channel_filter_filter_summary"
 			android:title="@string/channel_filter_filter_title" />
 
-		<EditTextPreference android:defaultValue="1-100"
+		<EditTextPreference
 			android:dependency="@string/channel_filter_filter_key" android:key="@string/channel_filter_last_key"
 			android:summary="@string/channel_filter_last_summary" android:title="@string/channel_filter_last_title" />
 	</PreferenceCategory>
@@ -48,10 +48,10 @@
 		android:title="@string/wakeup_preferences">
 
 		<CheckBoxPreference android:key="@string/wakeup_enabled_key"
-			android:defaultValue="false" android:summary="@string/wakeup_enabled_summary"
+            android:summary="@string/wakeup_enabled_summary"
 			android:title="@string/wakeup_enabled_title" />
 
-		<ListPreference android:defaultValue="@string/default_wakeup_method"
+		<ListPreference
 			android:dependency="@string/wakeup_enabled_key" android:entries="@array/wakeup_methods"
 			android:entryValues="@array/wakeup_methods_values" android:key="@string/wakeup_method_key"
 			android:summary="@string/wakeup_method_summary" android:title="@string/wakeup_method_title" />
@@ -72,7 +72,7 @@
 			android:key="@string/wakeup_wol_mac_key" android:summary="@string/wakeup_wol_mac_summary"
 			android:title="@string/wakeup_wol_mac_title" />
 
-		<EditTextPreference android:defaultValue="255.255.255.255"
+		<EditTextPreference
 			android:dependency="@string/wakeup_enabled_key" android:key="@string/wakeup_wol_custom_broadcast_key"
 			android:summaryOn="@string/wakeup_wol_custom_boradcast_summary"
 			android:title="@string/wakeup_wol_custom_boradcast_title" />
@@ -81,26 +81,26 @@
 	<PreferenceCategory android:key="timer_preferences"
 		android:title="@string/timer_preferences">
 
-		<EditTextPreference android:defaultValue="5"
+		<EditTextPreference
 			android:key="@string/timer_pre_start_buffer_key" android:summary="@string/timer_pre_start_buffer_summary"
 			android:title="@string/timer_pre_start_buffer_title" />
 
-		<EditTextPreference android:defaultValue="30"
+		<EditTextPreference
 			android:key="@string/timer_post_end_buffer_key" android:summary="@string/timer_post_end_buffer_summary"
 			android:title="@string/timer_post_end_buffer_title" />
 
-		<EditTextPreference android:defaultValue="99"
+		<EditTextPreference
 			android:key="@string/timer_default_lifetime_key" android:summary="@string/timer_default_lifetime_summary"
 			android:title="@string/timer_default_lifetime_title" />
 
-		<EditTextPreference android:defaultValue="50"
+		<EditTextPreference
 			android:key="@string/timer_default_priority_key" android:summary="@string/timer_default_priority_summary"
 			android:title="@string/timer_default_priority_title" />
 	</PreferenceCategory>
 
 	<PreferenceCategory android:title="@string/livetv">
 
-		<EditTextPreference android:defaultValue="3000"
+		<EditTextPreference
 			android:inputType="number" android:key="streamingport"
 			android:summary="@string/settings_livetv_port_summary" android:title="@string/settings_livetv_port" />
 
@@ -111,20 +111,21 @@
 			android:password="true" android:summary="@string/streaming_password_sum"
 			android:title="@string/streaming_password_title" />
 
-		<ListPreference android:defaultValue="TS"
+		<ListPreference
 			android:entries="@array/livetv_streamformat" android:entryValues="@array/livetv_streamformat_values"
 			android:key="livetv_streamformat" android:title="@string/settings_livetv_streamformat" />
 
 		<CheckBoxPreference android:key="remux_enable"
-			android:defaultValue="false" android:summary="@string/remux_enable_summary"
+
+            android:summary="@string/remux_enable_summary"
 			android:title="@string/remux_enable_title" />
 
-		<ListPreference android:defaultValue="EXT"
+		<ListPreference
 			android:entries="@array/remux_entries" android:entryValues="@array/remux_entry_values"
 			android:dependency="remux_enable" android:key="remux_command"
 			android:summary="@string/remux_command_summary" android:title="@string/remux_command_title" />
 
-		<EditTextPreference android:defaultValue="QUALITY=DSL1000"
+		<EditTextPreference
 			android:dependency="remux_enable" android:key="remux_parameter"
 			android:summary="@string/remux_parameter_summary" android:title="@string/remux_parameter_title" />
 	</PreferenceCategory>
@@ -132,10 +133,10 @@
 	<PreferenceCategory android:title="@string/recstream" android:key="key_streaming_category">
 
 		<CheckBoxPreference android:key="key_rec_stream_enable"
-			android:defaultValue="false" android:summary="@string/recstream_enable_summary"
+			android:summary="@string/recstream_enable_summary"
 			android:title="@string/recstream_enable_title" />
 
-		<ListPreference android:defaultValue="vdr-live"
+		<ListPreference
 			android:dependency="key_rec_stream_enable" android:entries="@array/recstream_entries"
 			android:entryValues="@array/recstream_entry_values" android:key="key_recstream_method"
 			android:summary="@string/recstream_method_summary" android:title="@string/recstream_method_title" />
@@ -147,25 +148,31 @@
 
 	</PreferenceCategory>
 
+
+
 	<PreferenceScreen android:title="Advanced">
 
-		<EditTextPreference android:defaultValue="10"
+
+		<EditTextPreference
 			android:inputType="number" android:key="@string/vdr_conntimeout_key"
 			android:summary="@string/vdr_conntimeout_sum" android:title="@string/vdr_conntimeout_title" />
 
-		<EditTextPreference android:defaultValue="10"
+		<EditTextPreference
 			android:inputType="number" android:key="@string/vdr_readtimeout_key"
 			android:summary="@string/vdr_readtimeout_sum" android:title="@string/vdr_readtimeout_title" />
 
-		<EditTextPreference android:defaultValue="120"
+		<EditTextPreference
 			android:inputType="number" android:key="@string/vdr_timeout_key"
 			android:summary="@string/vdr_timeout_sum" android:title="@string/vdr_timeout_title" />
 
 
-		<EditTextPreference android:defaultValue="utf-8"
+		<EditTextPreference
 			android:key="@string/vdr_encoding_key" android:summary="@string/vdr_encoding_summary"
 			android:title="@string/vdr_encoding_title" />
 
+
+
+
 	</PreferenceScreen>
 
 </PreferenceScreen>
\ No newline at end of file