Move subsonic-android to root

32 files changed, 0 insertions, 844 deletions

diff --git a/subsonic-android/res/menu/chat.xml b/subsonic-android/res/menu/chat.xml
deleted file mode 100644
index e0f9a718..00000000
--- a/subsonic-android/res/menu/chat.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">		
-	<item 
-		android:id="@+id/menu_refresh"
-		android:icon="@drawable/action_refresh"
-		android:title="@string/menu.refresh"
-		android:showAsAction="always|withText"/>
-
-	<item 
-		android:id="@+id/menu_settings"
-		android:icon="@drawable/action_settings"
-		android:title="@string/menu.settings"/>
-
-	<item 
-		android:id="@+id/menu_exit"
-		android:icon="@drawable/action_exit"
-		android:title="@string/menu.exit"/>
-</menu>
\ No newline at end of file
diff --git a/subsonic-android/res/menu/empty.xml b/subsonic-android/res/menu/empty.xml
deleted file mode 100644
index b6db96aa..00000000
--- a/subsonic-android/res/menu/empty.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-	<item 
-		android:id="@+id/menu_refresh"
-		android:icon="@drawable/action_refresh"
-		android:title="@string/menu.refresh"
-		android:showAsAction="always|withText"/>
-</menu>
diff --git a/subsonic-android/res/menu/main.xml b/subsonic-android/res/menu/main.xml
deleted file mode 100644
index c9420236..00000000
--- a/subsonic-android/res/menu/main.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-	<item 
-		android:id="@+id/menu_search"
-		android:icon="@drawable/action_search"
-		android:title="@string/menu.search"
-		android:showAsAction="always|withText"/>
-	
-	<item 
-		android:id="@+id/menu_shuffle"
-		android:icon="@drawable/action_shuffle"
-		android:title="@string/menu.shuffle"
-		android:showAsAction="always|withText"/>
-
-	<item 
-		android:id="@+id/menu_help"
-		android:icon="@drawable/action_help"
-		android:title="@string/menu.help"/>
-		
-	<item 
-		android:id="@+id/menu_about"
-		android:icon="@drawable/action_help"
-		android:title="@string/menu.about"/>
-		
-	<item 
-		android:id="@+id/menu_log"
-		android:title="@string/menu.log"/>
-
-	<item 
-		android:id="@+id/menu_changelog"
-		android:title="@string/changelog_full_title"/>
-
-	<item 
-		android:id="@+id/menu_settings"
-		android:icon="@drawable/action_settings"
-		android:title="@string/menu.settings"/>
-
-	<item 
-		android:id="@+id/menu_exit"
-		android:icon="@drawable/action_exit"
-		android:title="@string/menu.exit"/>
-
-</menu>
diff --git a/subsonic-android/res/menu/nowplaying.xml b/subsonic-android/res/menu/nowplaying.xml
deleted file mode 100644
index 572c5bac..00000000
--- a/subsonic-android/res/menu/nowplaying.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:id="@+id/menu_shuffle"
-        android:icon="@drawable/action_shuffle"
-        android:title="@string/download.menu_shuffle"
-        android:showAsAction="ifRoom|withText"/>
-		
-	<item
-        android:id="@+id/menu_remove_all"
-        android:icon="@drawable/action_remove_all"
-        android:title="@string/download.menu_remove_all"
-        android:showAsAction="ifRoom|withText"/>
-
-    <item
-        android:id="@+id/menu_save_playlist"
-        android:icon="@drawable/action_save"
-        android:title="@string/download.menu_save"
-        android:showAsAction="ifRoom|withText"/>
-
-    <item
-        android:id="@+id/menu_screen_on_off"
-        android:icon="@drawable/action_screen_on_off"
-        android:title="@string/download.menu_screen_on"
-        android:showAsAction="ifRoom|withText"/>
-		
-	<item
-        android:id="@+id/menu_toggle_timer"
-        android:title="@string/download.start_timer"/>
-		
-	<item
-        android:id="@+id/menu_toggle_now_playing"
-        android:title="@string/download.show_downloading"/>
-		
-	<item 
-		android:id="@+id/menu_exit"
-		android:icon="@drawable/action_exit"
-		android:title="@string/menu.exit"/>
-</menu>
diff --git a/subsonic-android/res/menu/nowplaying_context.xml b/subsonic-android/res/menu/nowplaying_context.xml
deleted file mode 100644
index f42c3644..00000000
--- a/subsonic-android/res/menu/nowplaying_context.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-	<item
-		android:id="@+id/menu_info"
-		android:title="@string/common.info"
-		/>
-	
-	<item 
-		android:id="@+id/menu_show_album"
-		android:title="@string/download.menu_show_album"/>
-
-	<item 
-		android:id="@+id/menu_lyrics"
-		android:title="@string/download.menu_lyrics"/>
-
-	<item 
-		android:id="@+id/menu_remove"
-		android:title="@string/download.menu_remove"/>
-
-	<item 
-		android:id="@+id/menu_delete"
-		android:title="@string/download.menu_delete"/>
-		
-	<item 
-		android:id="@+id/menu_star"
-		android:title="@string/common.star"/>  
-		
-	<item 
-		android:id="@+id/menu_add_playlist"
-		android:title="@string/menu.add_playlist"/>
-</menu>
diff --git a/subsonic-android/res/menu/nowplaying_context_offline.xml b/subsonic-android/res/menu/nowplaying_context_offline.xml
deleted file mode 100644
index 1446353f..00000000
--- a/subsonic-android/res/menu/nowplaying_context_offline.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/menu_info"
-		android:title="@string/common.info"
-		/>
-	
-	<item 
-		android:id="@+id/menu_show_album"
-		android:title="@string/download.menu_show_album"/>
-
-	<item 
-		android:id="@+id/menu_remove"
-		android:title="@string/download.menu_remove"/>
-
-	<item 
-		android:id="@+id/menu_delete"
-		android:title="@string/download.menu_delete"/>
-
-	<item 
-		android:id="@+id/menu_star"
-		android:title="@string/common.star"/>
-</menu>
diff --git a/subsonic-android/res/menu/nowplaying_downloading.xml b/subsonic-android/res/menu/nowplaying_downloading.xml
deleted file mode 100644
index 9376731a..00000000
--- a/subsonic-android/res/menu/nowplaying_downloading.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">		
-	<item
-        android:id="@+id/menu_remove_all"
-        android:icon="@drawable/action_remove_all"
-        android:title="@string/download.menu_remove_all"
-        android:showAsAction="always|withText"/>
-
-    <item
-        android:id="@+id/menu_screen_on_off"
-        android:icon="@drawable/action_screen_on_off"
-        android:title="@string/download.menu_screen_on"
-        android:showAsAction="ifRoom|withText"/>
-		
-	<item
-        android:id="@+id/menu_toggle_timer"
-        android:title="@string/download.start_timer"/>
-		
-	<item
-        android:id="@+id/menu_toggle_now_playing"
-        android:title="@string/download.show_now_playing"/>
-		
-	<item 
-		android:id="@+id/menu_exit"
-		android:icon="@drawable/action_exit"
-		android:title="@string/menu.exit"/>
-</menu>
diff --git a/subsonic-android/res/menu/nowplaying_offline.xml b/subsonic-android/res/menu/nowplaying_offline.xml
deleted file mode 100644
index e3e85040..00000000
--- a/subsonic-android/res/menu/nowplaying_offline.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item
-        android:id="@+id/menu_shuffle"
-        android:icon="@drawable/action_shuffle"
-        android:title="@string/download.menu_shuffle"
-        android:showAsAction="always|withText"/>
-		
-	<item
-        android:id="@+id/menu_remove_all"
-        android:icon="@drawable/action_remove_all"
-        android:title="@string/download.menu_remove_all"
-        android:showAsAction="always|withText"/>
-	
-	<item
-        android:id="@+id/menu_screen_on_off"
-        android:icon="@drawable/action_screen_on_off"
-        android:title="@string/download.menu_screen_on"
-        android:showAsAction="ifRoom|withText"/>
-		
-	<item
-        android:id="@+id/menu_toggle_timer"
-        android:title="@string/download.start_timer"/>
-		
-	<item 
-		android:id="@+id/menu_exit"
-		android:icon="@drawable/action_exit"
-		android:title="@string/menu.exit"/>
-</menu>
diff --git a/subsonic-android/res/menu/search.xml b/subsonic-android/res/menu/search.xml
deleted file mode 100644
index b9cdecac..00000000
--- a/subsonic-android/res/menu/search.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-	<item 
-		android:id="@+id/menu_search"
-		android:icon="@drawable/action_search"
-		android:title="@string/menu.search"
-		android:showAsAction="ifRoom|withText"/>
-
-	<item 
-		android:id="@+id/menu_help"
-		android:icon="@drawable/ic_menu_help"
-		android:title="@string/menu.help"/>
-
-	<item 
-		android:id="@+id/menu_settings"
-		android:icon="@drawable/ic_menu_settings"
-		android:title="@string/menu.settings"/>
-
-	<item 
-		android:id="@+id/menu_exit"
-		android:icon="@drawable/ic_menu_exit"
-		android:title="@string/menu.exit"/>
-
-</menu>
diff --git a/subsonic-android/res/menu/select_album.xml b/subsonic-android/res/menu/select_album.xml
deleted file mode 100644
index 5ca9c537..00000000
--- a/subsonic-android/res/menu/select_album.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">		
-	<item 
-		android:id="@+id/menu_play_now"
-		android:icon="@drawable/action_play_all"
-		android:title="@string/menu.play"
-		android:showAsAction="always|withText"/>
-		
-	<item 
-		android:id="@+id/menu_refresh"
-		android:icon="@drawable/action_refresh"
-		android:title="@string/menu.refresh"
-		android:showAsAction="always|withText"/>
-		
-	<item 
-		android:id="@+id/menu_shuffle"
-		android:icon="@drawable/action_shuffle"
-		android:title="@string/menu.shuffle"
-		android:showAsAction="ifRoom|withText"/>
-</menu>
diff --git a/subsonic-android/res/menu/select_album_context.xml b/subsonic-android/res/menu/select_album_context.xml
deleted file mode 100644
index 00fe7993..00000000
--- a/subsonic-android/res/menu/select_album_context.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item 
-        android:id="@+id/album_menu_play_now"
-        android:title="@string/common.play_now"
-        />
-		
-	<item 
-        android:id="@+id/album_menu_play_shuffled"
-        android:title="@string/common.play_shuffled"
-        />
-
-    <item 
-        android:id="@+id/album_menu_play_last"
-        android:title="@string/common.play_last"
-        />
-
-    <item 
-        android:id="@+id/album_menu_download"
-        android:title="@string/common.download"
-        />
-		
-	<item 
-        android:id="@+id/album_menu_pin"
-        android:title="@string/common.pin"
-        />
-
-	<item 
-		android:id="@+id/album_menu_delete"
-		android:title="@string/common.delete"/>
-		
-	<item 
-		android:id="@+id/album_menu_star"
-		android:title="@string/common.star"/>  
-        
-</menu>
diff --git a/subsonic-android/res/menu/select_album_context_offline.xml b/subsonic-android/res/menu/select_album_context_offline.xml
deleted file mode 100644
index 70cf9da9..00000000
--- a/subsonic-android/res/menu/select_album_context_offline.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-    <item 
-        android:id="@+id/album_menu_play_now"
-        android:title="@string/common.play_now"
-        />
-		
-	<item 
-        android:id="@+id/album_menu_play_shuffled"
-        android:title="@string/common.play_shuffled"
-        />
-
-    <item 
-        android:id="@+id/album_menu_play_last"
-        android:title="@string/common.play_last"
-        />
-
-	<item 
-		android:id="@+id/album_menu_delete"
-		android:title="@string/common.delete"/>
-
-	<item 
-		android:id="@+id/album_menu_star"
-		android:title="@string/common.star"/>
-</menu>
\ No newline at end of file
diff --git a/subsonic-android/res/menu/select_album_list.xml b/subsonic-android/res/menu/select_album_list.xml
deleted file mode 100644
index b6db96aa..00000000
--- a/subsonic-android/res/menu/select_album_list.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-	<item 
-		android:id="@+id/menu_refresh"
-		android:icon="@drawable/action_refresh"
-		android:title="@string/menu.refresh"
-		android:showAsAction="always|withText"/>
-</menu>
diff --git a/subsonic-android/res/menu/select_artist.xml b/subsonic-android/res/menu/select_artist.xml
deleted file mode 100644
index a7b988a5..00000000
--- a/subsonic-android/res/menu/select_artist.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">		
-	<item 
-		android:id="@+id/menu_refresh"
-		android:icon="@drawable/action_refresh"
-		android:title="@string/menu.refresh"
-		android:showAsAction="always|withText"/>
-		
-	<item 
-		android:id="@+id/menu_shuffle"
-		android:icon="@drawable/action_shuffle"
-		android:title="@string/menu.shuffle"
-		android:showAsAction="always|withText"/>
-		
-	<item 
-		android:id="@+id/menu_search"
-		android:icon="@drawable/action_search"
-		android:title="@string/menu.search"
-		android:showAsAction="ifRoom|withText"/>
-
-	<item 
-		android:id="@+id/menu_settings"
-		android:icon="@drawable/action_settings"
-		android:title="@string/menu.settings"/>
-
-	<item 
-		android:id="@+id/menu_exit"
-		android:icon="@drawable/action_exit"
-		android:title="@string/menu.exit"/>
-</menu>
diff --git a/subsonic-android/res/menu/select_artist_context.xml b/subsonic-android/res/menu/select_artist_context.xml
deleted file mode 100644
index 23d64c4e..00000000
--- a/subsonic-android/res/menu/select_artist_context.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item 
-        android:id="@+id/artist_menu_play_now"
-        android:title="@string/common.play_now"
-        />
-		
-	<item 
-        android:id="@+id/artist_menu_play_shuffled"
-        android:title="@string/common.play_shuffled"
-        />
-
-    <item 
-        android:id="@+id/artist_menu_play_last"
-        android:title="@string/common.play_last"
-        />
-		
-	<item 
-        android:id="@+id/artist_menu_download"
-        android:title="@string/common.download"
-        />
-
-    <item 
-        android:id="@+id/artist_menu_pin"
-        android:title="@string/common.pin"
-        />
-
-	<item 
-		android:id="@+id/artist_menu_delete"
-		android:title="@string/common.delete"/>
-</menu>
diff --git a/subsonic-android/res/menu/select_artist_context_offline.xml b/subsonic-android/res/menu/select_artist_context_offline.xml
deleted file mode 100644
index c80db020..00000000
--- a/subsonic-android/res/menu/select_artist_context_offline.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item 
-        android:id="@+id/artist_menu_play_now"
-        android:title="@string/common.play_now"
-        />
-		
-	<item 
-        android:id="@+id/artist_menu_play_shuffled"
-        android:title="@string/common.play_shuffled"
-        />
-
-    <item 
-        android:id="@+id/artist_menu_play_last"
-        android:title="@string/common.play_last"
-        />
-
-	<item 
-		android:id="@+id/artist_menu_delete"
-		android:title="@string/common.delete"/>
-</menu>
diff --git a/subsonic-android/res/menu/select_genres.xml b/subsonic-android/res/menu/select_genres.xml
deleted file mode 100644
index e0f9a718..00000000
--- a/subsonic-android/res/menu/select_genres.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">		
-	<item 
-		android:id="@+id/menu_refresh"
-		android:icon="@drawable/action_refresh"
-		android:title="@string/menu.refresh"
-		android:showAsAction="always|withText"/>
-
-	<item 
-		android:id="@+id/menu_settings"
-		android:icon="@drawable/action_settings"
-		android:title="@string/menu.settings"/>
-
-	<item 
-		android:id="@+id/menu_exit"
-		android:icon="@drawable/action_exit"
-		android:title="@string/menu.exit"/>
-</menu>
\ No newline at end of file
diff --git a/subsonic-android/res/menu/select_playlist.xml b/subsonic-android/res/menu/select_playlist.xml
deleted file mode 100644
index a68e6da0..00000000
--- a/subsonic-android/res/menu/select_playlist.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">		
-	<item 
-		android:id="@+id/menu_refresh"
-		android:icon="@drawable/action_refresh"
-		android:title="@string/menu.refresh"
-		android:showAsAction="always|withText"/>
-		
-	<item 
-		android:id="@+id/menu_search"
-		android:icon="@drawable/action_search"
-		android:title="@string/menu.search"
-		android:showAsAction="always|withText"/>
-
-	<item 
-		android:id="@+id/menu_settings"
-		android:icon="@drawable/action_settings"
-		android:title="@string/menu.settings"/>
-
-	<item 
-		android:id="@+id/menu_exit"
-		android:icon="@drawable/action_exit"
-		android:title="@string/menu.exit"/>
-</menu>
diff --git a/subsonic-android/res/menu/select_playlist_context.xml b/subsonic-android/res/menu/select_playlist_context.xml
deleted file mode 100644
index 6d844a16..00000000
--- a/subsonic-android/res/menu/select_playlist_context.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-	
-	<item
-		android:id="@+id/playlist_info"
-        android:title="@string/common.info"
-        />
-
-    <item 
-        android:id="@+id/playlist_menu_play_now"
-        android:title="@string/common.play_now"
-        />
-		
-	<item 
-        android:id="@+id/playlist_menu_play_shuffled"
-        android:title="@string/common.play_shuffled"
-        />
-		
-	<item 
-        android:id="@+id/playlist_menu_download"
-        android:title="@string/common.download"
-        />
-
-    <item 
-        android:id="@+id/playlist_menu_pin"
-        android:title="@string/common.pin"
-        />
-		
-	<item 
-        android:id="@+id/playlist_update_info"
-        android:title="@string/playlist.update_info"
-        /> 
-	
-	<item 
-        android:id="@+id/playlist_menu_delete"
-        android:title="@string/common.delete"
-        /> 
-        
-</menu>
\ No newline at end of file
diff --git a/subsonic-android/res/menu/select_playlist_context_offline.xml b/subsonic-android/res/menu/select_playlist_context_offline.xml
deleted file mode 100644
index 644df2d3..00000000
--- a/subsonic-android/res/menu/select_playlist_context_offline.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-    <item 
-        android:id="@+id/playlist_menu_play_now"
-        android:title="@string/common.play_now"
-        />
-		
-	<item 
-        android:id="@+id/playlist_menu_play_shuffled"
-        android:title="@string/common.play_shuffled"
-        />        
-</menu>
\ No newline at end of file
diff --git a/subsonic-android/res/menu/select_podcast_episode.xml b/subsonic-android/res/menu/select_podcast_episode.xml
deleted file mode 100644
index ff5898e2..00000000
--- a/subsonic-android/res/menu/select_podcast_episode.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-	<item 
-		android:id="@+id/menu_refresh"
-		android:icon="@drawable/action_refresh"
-		android:title="@string/menu.refresh"
-		android:showAsAction="always|withText"/>
-
-	<item 
-		android:id="@+id/menu_delete"
-		android:icon="@drawable/action_remove_all"
-		android:title="@string/common.delete"/>
-</menu>
diff --git a/subsonic-android/res/menu/select_podcast_episode_context.xml b/subsonic-android/res/menu/select_podcast_episode_context.xml
deleted file mode 100644
index 25c83989..00000000
--- a/subsonic-android/res/menu/select_podcast_episode_context.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-	
-	<item
-		android:id="@+id/song_menu_info"
-		android:title="@string/common.info"
-		/>
-
-    <item 
-        android:id="@+id/song_menu_play_now"
-        android:title="@string/common.play_now"
-        />
-
-    <item 
-        android:id="@+id/song_menu_play_last"
-        android:title="@string/common.play_last"
-        />
-		
-	<item 
-        android:id="@+id/song_menu_download"
-        android:title="@string/common.download"
-        />
-		
-	<item 
-		android:id="@+id/song_menu_delete"
-		android:title="@string/common.delete"/>
-        
-	<item 
-		android:id="@+id/song_menu_server_download"
-		android:title="@string/select_podcasts.server_download"/>
-
-	<item 
-		android:id="@+id/song_menu_server_delete"
-		android:title="@string/select_podcasts.server_delete"/>
-</menu>
diff --git a/subsonic-android/res/menu/select_podcast_episode_context_offline.xml b/subsonic-android/res/menu/select_podcast_episode_context_offline.xml
deleted file mode 100644
index 38c4569b..00000000
--- a/subsonic-android/res/menu/select_podcast_episode_context_offline.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-	
-	<item
-		android:id="@+id/song_menu_info"
-		android:title="@string/common.info"
-		/>
-	
-    <item 
-        android:id="@+id/song_menu_play_now"
-        android:title="@string/common.play_now"
-        />
-
-    <item 
-        android:id="@+id/song_menu_play_last"
-        android:title="@string/common.play_last"
-        />
-		
-	<item 
-		android:id="@+id/song_menu_delete"
-		android:title="@string/common.delete"/>
-</menu>
diff --git a/subsonic-android/res/menu/select_podcast_episode_offline.xml b/subsonic-android/res/menu/select_podcast_episode_offline.xml
deleted file mode 100644
index 9bbc2d92..00000000
--- a/subsonic-android/res/menu/select_podcast_episode_offline.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-	<item 
-		android:id="@+id/menu_refresh"
-		android:icon="@drawable/action_refresh"
-		android:title="@string/menu.refresh"
-		android:showAsAction="always|withText"/>
-		
-	<item 
-		android:id="@+id/menu_delete"
-		android:icon="@drawable/action_remove_all"
-		android:title="@string/common.delete"/>
-</menu>
diff --git a/subsonic-android/res/menu/select_podcasts.xml b/subsonic-android/res/menu/select_podcasts.xml
deleted file mode 100644
index e77b43db..00000000
--- a/subsonic-android/res/menu/select_podcasts.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">		
-	<item 
-		android:id="@+id/menu_refresh"
-		android:icon="@drawable/action_refresh"
-		android:title="@string/menu.refresh"
-		android:showAsAction="always|withText"/>
-
-	<item 
-		android:id="@+id/menu_add_podcast"
-		android:icon="@drawable/action_exit"
-		android:title="@string/menu.add_podcast"/>
-
-	<item 
-		android:id="@+id/menu_check"
-		android:icon="@drawable/action_refresh"
-		android:title="@string/menu.check_podcasts"/>
-
-	<item 
-		android:id="@+id/menu_settings"
-		android:icon="@drawable/action_settings"
-		android:title="@string/menu.settings"/>
-
-	<item 
-		android:id="@+id/menu_exit"
-		android:icon="@drawable/action_exit"
-		android:title="@string/menu.exit"/>
-</menu>
\ No newline at end of file
diff --git a/subsonic-android/res/menu/select_podcasts_context.xml b/subsonic-android/res/menu/select_podcasts_context.xml
deleted file mode 100644
index af4edb55..00000000
--- a/subsonic-android/res/menu/select_podcasts_context.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-	<item
-		android:id="@+id/podcast_channel_info"
-		android:title="@string/common.info"/>
-	<item 
-		android:id="@+id/podcast_channel_delete"
-		android:title="@string/common.delete"/> 
-</menu>
\ No newline at end of file
diff --git a/subsonic-android/res/menu/select_song.xml b/subsonic-android/res/menu/select_song.xml
deleted file mode 100644
index 3a55fee0..00000000
--- a/subsonic-android/res/menu/select_song.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">		
-	<item 
-		android:id="@+id/menu_play_now"
-		android:icon="@drawable/action_play_all"
-		android:title="@string/menu.play"
-		android:showAsAction="always|withText"/>
-		
-	<item 
-		android:id="@+id/menu_refresh"
-		android:icon="@drawable/action_refresh"
-		android:title="@string/menu.refresh"
-		android:showAsAction="always|withText"/>
-		
-	<item 
-		android:id="@+id/menu_shuffle"
-		android:icon="@drawable/action_shuffle"
-		android:title="@string/menu.shuffle"
-		android:showAsAction="ifRoom|withText"/>
-		
-	<item 
-		android:id="@+id/menu_select"
-		android:icon="@drawable/action_select"
-		android:title="@string/menu.select"
-		android:showAsAction="ifRoom|withText"/>
-		
-	<item 
-		android:id="@+id/menu_download"
-		android:icon="@drawable/action_save"
-		android:title="@string/common.download"
-		android:showAsAction="ifRoom|withText"/>
-		
-	<item 
-		android:id="@+id/menu_cache"
-		android:icon="@drawable/action_save"
-		android:title="@string/common.pin"
-		android:showAsAction="ifRoom|withText"/>
-		
-	<item 
-		android:id="@+id/menu_delete"
-		android:icon="@drawable/action_remove_all"
-		android:title="@string/common.delete"
-		android:showAsAction="ifRoom|withText"/>
-	
-	<item 
-		android:id="@+id/menu_add_playlist"
-		android:title="@string/menu.add_playlist"/>
-		
-	<item 
-		android:id="@+id/menu_remove_playlist"
-		android:title="@string/menu.remove_playlist"/>
-		
-	<item 
-		android:id="@+id/menu_play_last"
-		android:icon="@drawable/action_play_all"
-		android:title="@string/menu.play_last"
-		android:showAsAction="ifRoom|withText"/>
-</menu>
diff --git a/subsonic-android/res/menu/select_song_context.xml b/subsonic-android/res/menu/select_song_context.xml
deleted file mode 100644
index 4db229f2..00000000
--- a/subsonic-android/res/menu/select_song_context.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-	
-	<item
-		android:id="@+id/song_menu_info"
-		android:title="@string/common.info"
-		/>
-
-    <item 
-        android:id="@+id/song_menu_play_now"
-        android:title="@string/common.play_now"
-        />
-
-    <item 
-        android:id="@+id/song_menu_play_next"
-        android:title="@string/common.play_next"
-        />
-
-    <item 
-        android:id="@+id/song_menu_play_last"
-        android:title="@string/common.play_last"
-        />
-		
-	<item 
-        android:id="@+id/song_menu_download"
-        android:title="@string/common.download"
-        />
-		
-	<item 
-        android:id="@+id/song_menu_pin"
-        android:title="@string/common.pin"
-        />
-		
-	<item 
-		android:id="@+id/song_menu_delete"
-		android:title="@string/common.delete"/>
-	
-	<item 
-		android:id="@+id/song_menu_add_playlist"
-		android:title="@string/menu.add_playlist"/>
-		
-	<item 
-		android:id="@+id/song_menu_remove_playlist"
-		android:title="@string/menu.remove_playlist"/>
-		
-	<item 
-		android:id="@+id/song_menu_star"
-		android:title="@string/common.star"/>  
-        
-</menu>
diff --git a/subsonic-android/res/menu/select_song_context_offline.xml b/subsonic-android/res/menu/select_song_context_offline.xml
deleted file mode 100644
index d19eaa70..00000000
--- a/subsonic-android/res/menu/select_song_context_offline.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-	
-	<item
-		android:id="@+id/song_menu_info"
-		android:title="@string/common.info"
-		/>
-	
-    <item 
-        android:id="@+id/song_menu_play_now"
-        android:title="@string/common.play_now"
-        />
-
-    <item 
-        android:id="@+id/song_menu_play_next"
-        android:title="@string/common.play_next"
-        />
-
-    <item 
-        android:id="@+id/song_menu_play_last"
-        android:title="@string/common.play_last"
-        />
-		
-	<item 
-		android:id="@+id/song_menu_delete"
-		android:title="@string/common.delete"/>
-
-	<item 
-		android:id="@+id/song_menu_star"
-		android:title="@string/common.star"/>
-</menu>
diff --git a/subsonic-android/res/menu/select_song_offline.xml b/subsonic-android/res/menu/select_song_offline.xml
deleted file mode 100644
index 6ed43b71..00000000
--- a/subsonic-android/res/menu/select_song_offline.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">		
-	<item 
-		android:id="@+id/menu_play_now"
-		android:icon="@drawable/action_play_all"
-		android:title="@string/menu.play"
-		android:showAsAction="always|withText"/>
-		
-	<item 
-		android:id="@+id/menu_refresh"
-		android:icon="@drawable/action_refresh"
-		android:title="@string/menu.refresh"
-		android:showAsAction="always|withText"/>
-		
-	<item 
-		android:id="@+id/menu_shuffle"
-		android:icon="@drawable/action_shuffle"
-		android:title="@string/menu.shuffle"
-		android:showAsAction="ifRoom|withText"/>
-		
-	<item 
-		android:id="@+id/menu_select"
-		android:icon="@drawable/action_select"
-		android:title="@string/menu.select"
-		android:showAsAction="ifRoom|withText"/>
-		
-	<item 
-		android:id="@+id/menu_delete"
-		android:icon="@drawable/action_remove_all"
-		android:title="@string/common.delete"
-		android:showAsAction="ifRoom|withText"/>
-		
-	<item 
-		android:id="@+id/menu_play_last"
-		android:icon="@drawable/action_play_all"
-		android:title="@string/menu.play_last"
-		android:showAsAction="ifRoom|withText"/>
-</menu>
diff --git a/subsonic-android/res/menu/select_video_context.xml b/subsonic-android/res/menu/select_video_context.xml
deleted file mode 100644
index 5926f8a5..00000000
--- a/subsonic-android/res/menu/select_video_context.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/song_menu_info"
-		android:title="@string/common.info"/>
-	
-	<item 
-		android:id="@+id/song_menu_stream_external"
-		android:title="@string/common.stream_external"/>
-	
-	<item 
-		android:id="@+id/song_menu_play_external"
-		android:title="@string/common.play_external"/>
-
-	<item 
-		android:id="@+id/song_menu_download"
-		android:title="@string/common.download"
-		/>
-
-	<item 
-		android:id="@+id/song_menu_delete"
-		android:title="@string/common.delete"/>
-</menu>
diff --git a/subsonic-android/res/menu/select_video_context_offline.xml b/subsonic-android/res/menu/select_video_context_offline.xml
deleted file mode 100644
index fc354119..00000000
--- a/subsonic-android/res/menu/select_video_context_offline.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-	<item
-		android:id="@+id/song_menu_info"
-		android:title="@string/common.info"/>
-	
-	<item 
-		android:id="@+id/song_menu_play_external"
-		android:title="@string/common.play_external"/>
-		
-	<item 
-		android:id="@+id/song_menu_delete"
-		android:title="@string/common.delete"/>
-</menu>