From 6ad4d12110219b25d9c7517631174e5551c053c3 Mon Sep 17 00:00:00 2001
From: lado <herrlado@gmail.com>
Date: Mon, 25 Feb 2013 01:12:30 +0100
Subject: Feature #1273

---
 vdrmanager/res/menu/epg_list_menu.xml   | 13 ++++---------
 vdrmanager/res/menu/timer_list_menu.xml |  7 +------
 vdrmanager/res/values/strings.xml       |  9 +++++++++
 3 files changed, 14 insertions(+), 15 deletions(-)

(limited to 'vdrmanager/res')

diff --git a/vdrmanager/res/menu/epg_list_menu.xml b/vdrmanager/res/menu/epg_list_menu.xml
index ea31378..8d1b0ba 100644
--- a/vdrmanager/res/menu/epg_list_menu.xml
+++ b/vdrmanager/res/menu/epg_list_menu.xml
@@ -1,27 +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/epg_list_menu_channels"
-	  android:icon="@drawable/ic_menu_moreoverflow"
-	  android:showAsAction="ifRoom"
-	  android:title="@string/action_menu_channels"/>
-    	
+
 	<item
 	  android:showAsAction="ifRoom"
 	  android:id="@+id/epg_list_sort_menu"
 	  android:icon="@android:drawable/ic_menu_sort_alphabetically"
 	  android:title="@string/sort"/>
-	
+
 </menu>
\ No newline at end of file
diff --git a/vdrmanager/res/menu/timer_list_menu.xml b/vdrmanager/res/menu/timer_list_menu.xml
index fa00a26..3003bea 100644
--- a/vdrmanager/res/menu/timer_list_menu.xml
+++ b/vdrmanager/res/menu/timer_list_menu.xml
@@ -1,6 +1,6 @@
 <?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"
@@ -13,9 +13,4 @@
 	  android:alphabeticShortcut="a"
 	  android:title="@string/epg_item_menu_timer_add"/>
 
-    	<item
-	  android:id="@+id/epg_list_menu_channels"
-	  android:icon="@drawable/ic_menu_moreoverflow"
-	  android:showAsAction="ifRoom"
-	  android:title="@string/action_menu_channels"/>
 </menu>
\ No newline at end of file
diff --git a/vdrmanager/res/values/strings.xml b/vdrmanager/res/values/strings.xml
index efbc841..adaaef2 100644
--- a/vdrmanager/res/values/strings.xml
+++ b/vdrmanager/res/values/strings.xml
@@ -373,4 +373,13 @@
         <item>Name</item>
     </string-array>
 
+    <string-array name="navigation_array">
+        <item>Channels</item>
+        <item>EPG by Time</item>
+        <item>EPG by Channel</item>
+        <item>Recordings</item>
+        <item>Timers</item>
+    </string-array>
+
+
 </resources>
\ No newline at end of file
-- 
cgit v1.2.3