diff options
| -rw-r--r-- | vdrmanager/res/menu-v11/epg_list_menu.xml | 7 | ||||
| -rw-r--r-- | vdrmanager/res/menu-v11/main_menu.xml | 23 | ||||
| -rw-r--r-- | vdrmanager/res/menu/epg_list_menu.xml | 6 | ||||
| -rw-r--r-- | vdrmanager/res/menu/main_menu.xml | 50 |
4 files changed, 43 insertions, 43 deletions
diff --git a/vdrmanager/res/menu-v11/epg_list_menu.xml b/vdrmanager/res/menu-v11/epg_list_menu.xml index 215fc26..ea31378 100644 --- a/vdrmanager/res/menu-v11/epg_list_menu.xml +++ b/vdrmanager/res/menu-v11/epg_list_menu.xml @@ -17,4 +17,11 @@ 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-v11/main_menu.xml b/vdrmanager/res/menu-v11/main_menu.xml deleted file mode 100644 index f1aad3f..0000000 --- a/vdrmanager/res/menu-v11/main_menu.xml +++ /dev/null @@ -1,23 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<menu xmlns:android="http://schemas.android.com/apk/res/android"> - - - <item android:id="@+id/main_menu_goto" android:title="@string/main_menu_goto" - android:icon="@drawable/ic_menu_goto" - android:showAsAction="ifRoom"/> - <item android:id="@+id/menu_search" - android:title="Search" - android:icon="@android:drawable/ic_menu_search" android:showAsAction="ifRoom|collapseActionView" - android:actionViewClass="android.widget.SearchView" /> - - <item android:id="@+id/main_menu_preferences" android:title="@string/main_menu_preferences" - android:showAsAction="ifRoom" - android:icon="@android:drawable/ic_menu_preferences" /> - - <item android:id="@+id/main_menu_info" android:title="@string/main_menu_info" - android:icon="@android:drawable/ic_menu_info_details" /> - - <item android:id="@+id/main_menu_exit" android:title="@string/main_menu_exit" - android:icon="@android:drawable/ic_menu_close_clear_cancel" /> - -</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 54598c8..2335101 100644 --- a/vdrmanager/res/menu/epg_list_menu.xml +++ b/vdrmanager/res/menu/epg_list_menu.xml @@ -12,4 +12,10 @@ android:icon="@android:drawable/ic_menu_agenda" android:title="@string/action_menu_channels"/> + <item + 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/main_menu.xml b/vdrmanager/res/menu/main_menu.xml index 478f61b..9e11f42 100644 --- a/vdrmanager/res/menu/main_menu.xml +++ b/vdrmanager/res/menu/main_menu.xml @@ -1,23 +1,33 @@ <?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/main_menu_goto" + android:icon="@drawable/ic_menu_goto" + android:showAsAction="ifRoom" + android:title="@string/main_menu_goto"/> + <item + android:id="@+id/menu_search" + android:actionViewClass="com.actionbarsherlock.widget.SearchView" + android:icon="@android:drawable/ic_menu_search" + android:showAsAction="always" + android:title="Search"/> + <item + android:id="@+id/main_menu_preferences" + android:icon="@android:drawable/ic_menu_preferences" + android:showAsAction="ifRoom" + android:title="@string/main_menu_preferences"/> + <item + android:id="@+id/main_menu_clear_search" + android:icon="@android:drawable/ic_menu_delete" + android:title="@string/main_menu_clear_search"/> + <item + android:id="@+id/main_menu_info" + android:icon="@android:drawable/ic_menu_info_details" + android:title="@string/main_menu_info"/> + <item + android:id="@+id/main_menu_exit" + android:icon="@android:drawable/ic_menu_close_clear_cancel" + android:title="@string/main_menu_exit"/> - <item - android:id="@+id/main_menu_preferences" - android:title="@string/main_menu_preferences" - android:icon="@android:drawable/ic_menu_preferences" - /> - <item - android:id="@+id/main_menu_info" - android:title="@string/main_menu_info" - android:icon="@android:drawable/ic_menu_info_details" - /> - <item - android:id="@+id/main_menu_exit" - android:title="@string/main_menu_exit" - android:icon="@android:drawable/ic_menu_close_clear_cancel" - /> - - <item android:id="@+id/main_menu_goto" android:title="@string/main_menu_goto" - android:icon="@drawable/ic_menu_goto" - /> </menu>
\ No newline at end of file |