From 8e30b9706587ed9f3b2609719e67951be06d5ea8 Mon Sep 17 00:00:00 2001
From: Scott Jackson <daneren2005@gmail.com>
Date: Mon, 12 Aug 2013 20:35:43 -0700
Subject: Converted everything to ActionBarCompat

---
 Subsonic.iml                                       |  2 +-
 project.properties                                 |  4 +--
 res/menu/chat.xml                                  |  5 ++--
 res/menu/empty.xml                                 |  5 ++--
 res/menu/main.xml                                  |  7 +++--
 res/menu/nowplaying.xml                            | 11 +++----
 res/menu/nowplaying_context.xml                    |  3 +-
 res/menu/nowplaying_context_offline.xml            |  3 +-
 res/menu/nowplaying_downloading.xml                |  7 +++--
 res/menu/nowplaying_offline.xml                    |  9 +++---
 res/menu/search.xml                                |  5 ++--
 res/menu/select_album.xml                          |  9 +++---
 res/menu/select_album_context.xml                  |  3 +-
 res/menu/select_album_context_offline.xml          |  3 +-
 res/menu/select_album_list.xml                     |  5 ++--
 res/menu/select_artist.xml                         |  9 +++---
 res/menu/select_artist_context.xml                 |  3 +-
 res/menu/select_artist_context_offline.xml         |  3 +-
 res/menu/select_genres.xml                         |  5 ++--
 res/menu/select_playlist.xml                       |  7 +++--
 res/menu/select_playlist_context.xml               |  3 +-
 res/menu/select_playlist_context_offline.xml       |  3 +-
 res/menu/select_podcast_episode.xml                |  5 ++--
 res/menu/select_podcast_episode_context.xml        |  3 +-
 .../select_podcast_episode_context_offline.xml     |  3 +-
 res/menu/select_podcast_episode_offline.xml        |  5 ++--
 res/menu/select_podcasts.xml                       |  5 ++--
 res/menu/select_podcasts_context.xml               |  3 +-
 res/menu/select_song.xml                           | 19 ++++++------
 res/menu/select_song_context.xml                   |  3 +-
 res/menu/select_song_context_offline.xml           |  3 +-
 res/menu/select_song_offline.xml                   | 15 +++++-----
 res/menu/select_video_context.xml                  |  3 +-
 res/menu/select_video_context_offline.xml          |  3 +-
 res/values/themes.xml                              | 12 ++++----
 .../dsub/activity/DownloadActivity.java            |  2 +-
 .../daneren2005/dsub/activity/MainActivity.java    |  3 +-
 .../daneren2005/dsub/activity/SearchActivity.java  |  3 +-
 .../dsub/activity/SubsonicActivity.java            | 34 +++++++++++-----------
 .../daneren2005/dsub/fragments/ChatFragment.java   |  8 +++--
 .../dsub/fragments/DownloadFragment.java           |  6 ++--
 .../daneren2005/dsub/fragments/MainFragment.java   |  6 ++--
 .../daneren2005/dsub/fragments/SearchFragment.java |  7 +++--
 .../dsub/fragments/SelectArtistFragment.java       |  6 ++--
 .../dsub/fragments/SelectDirectoryFragment.java    |  6 ++--
 .../dsub/fragments/SelectGenreFragment.java        |  6 ++--
 .../dsub/fragments/SelectPlaylistFragment.java     |  5 ++--
 .../dsub/fragments/SelectPodcastsFragment.java     |  6 ++--
 .../dsub/fragments/SubsonicFragment.java           |  6 ++--
 49 files changed, 169 insertions(+), 131 deletions(-)

diff --git a/Subsonic.iml b/Subsonic.iml
index 2fdd68ae..d89b96cf 100644
--- a/Subsonic.iml
+++ b/Subsonic.iml
@@ -16,8 +16,8 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="libs1" level="project" />
-    <orderEntry type="module" module-name="ActionBarSherlock" />
     <orderEntry type="module" module-name="DragSortListView" />
+    <orderEntry type="module" module-name="appcompat" />
   </component>
 </module>
 
diff --git a/project.properties b/project.properties
index 56014cda..e05b5bd9 100644
--- a/project.properties
+++ b/project.properties
@@ -9,5 +9,5 @@
 
 # Project target.
 target=android-17
-android.library.reference.1=ActionBarSherlock/actionbarsherlock
-android.library.reference.2=DragSortListView/library
\ No newline at end of file
+android.library.reference.1=DragSortListView/library
+android.library.reference.2=../../../../Program Files (x86)/Android/android-sdk/extras/android/support/v7/appcompat
\ No newline at end of file
diff --git a/res/menu/chat.xml b/res/menu/chat.xml
index e0f9a718..685aba18 100644
--- a/res/menu/chat.xml
+++ b/res/menu/chat.xml
@@ -1,10 +1,11 @@
 <?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"
+	  xmlns:compat="http://schemas.android.com/apk/res-auto">
 	<item 
 		android:id="@+id/menu_refresh"
 		android:icon="@drawable/action_refresh"
 		android:title="@string/menu.refresh"
-		android:showAsAction="always|withText"/>
+		compat:showAsAction="always|withText"/>
 
 	<item 
 		android:id="@+id/menu_settings"
diff --git a/res/menu/empty.xml b/res/menu/empty.xml
index b6db96aa..979eefe4 100644
--- a/res/menu/empty.xml
+++ b/res/menu/empty.xml
@@ -1,8 +1,9 @@
 <?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"
+	  xmlns:compat="http://schemas.android.com/apk/res-auto">
 	<item 
 		android:id="@+id/menu_refresh"
 		android:icon="@drawable/action_refresh"
 		android:title="@string/menu.refresh"
-		android:showAsAction="always|withText"/>
+		compat:showAsAction="always|withText"/>
 </menu>
diff --git a/res/menu/main.xml b/res/menu/main.xml
index c9420236..1390b68b 100644
--- a/res/menu/main.xml
+++ b/res/menu/main.xml
@@ -1,16 +1,17 @@
 <?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"
+		xmlns:compat="http://schemas.android.com/apk/res-auto">
 	<item 
 		android:id="@+id/menu_search"
 		android:icon="@drawable/action_search"
 		android:title="@string/menu.search"
-		android:showAsAction="always|withText"/>
+		compat:showAsAction="always|withText"/>
 	
 	<item 
 		android:id="@+id/menu_shuffle"
 		android:icon="@drawable/action_shuffle"
 		android:title="@string/menu.shuffle"
-		android:showAsAction="always|withText"/>
+		compat:showAsAction="always|withText"/>
 
 	<item 
 		android:id="@+id/menu_help"
diff --git a/res/menu/nowplaying.xml b/res/menu/nowplaying.xml
index 572c5bac..ae411240 100644
--- a/res/menu/nowplaying.xml
+++ b/res/menu/nowplaying.xml
@@ -1,28 +1,29 @@
 <?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"
+	  xmlns:compat="http://schemas.android.com/apk/res-auto">
     <item
         android:id="@+id/menu_shuffle"
         android:icon="@drawable/action_shuffle"
         android:title="@string/download.menu_shuffle"
-        android:showAsAction="ifRoom|withText"/>
+        compat: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"/>
+        compat: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"/>
+        compat: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"/>
+        compat:showAsAction="ifRoom|withText"/>
 		
 	<item
         android:id="@+id/menu_toggle_timer"
diff --git a/res/menu/nowplaying_context.xml b/res/menu/nowplaying_context.xml
index f42c3644..405b8e51 100644
--- a/res/menu/nowplaying_context.xml
+++ b/res/menu/nowplaying_context.xml
@@ -1,5 +1,6 @@
 <?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"
+		xmlns:compat="http://schemas.android.com/apk/res-auto">
 	<item
 		android:id="@+id/menu_info"
 		android:title="@string/common.info"
diff --git a/res/menu/nowplaying_context_offline.xml b/res/menu/nowplaying_context_offline.xml
index 1446353f..77f94bb6 100644
--- a/res/menu/nowplaying_context_offline.xml
+++ b/res/menu/nowplaying_context_offline.xml
@@ -1,5 +1,6 @@
 <?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"
+		xmlns:compat="http://schemas.android.com/apk/res-auto">
 	<item
 		android:id="@+id/menu_info"
 		android:title="@string/common.info"
diff --git a/res/menu/nowplaying_downloading.xml b/res/menu/nowplaying_downloading.xml
index 9376731a..fbdb78f4 100644
--- a/res/menu/nowplaying_downloading.xml
+++ b/res/menu/nowplaying_downloading.xml
@@ -1,16 +1,17 @@
 <?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"
+		xmlns:compat="http://schemas.android.com/apk/res-auto">
 	<item
         android:id="@+id/menu_remove_all"
         android:icon="@drawable/action_remove_all"
         android:title="@string/download.menu_remove_all"
-        android:showAsAction="always|withText"/>
+        compat: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"/>
+        compat:showAsAction="ifRoom|withText"/>
 		
 	<item
         android:id="@+id/menu_toggle_timer"
diff --git a/res/menu/nowplaying_offline.xml b/res/menu/nowplaying_offline.xml
index e3e85040..3800c013 100644
--- a/res/menu/nowplaying_offline.xml
+++ b/res/menu/nowplaying_offline.xml
@@ -1,23 +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"
+		xmlns:compat="http://schemas.android.com/apk/res-auto">
 
     <item
         android:id="@+id/menu_shuffle"
         android:icon="@drawable/action_shuffle"
         android:title="@string/download.menu_shuffle"
-        android:showAsAction="always|withText"/>
+        compat: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"/>
+        compat: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"/>
+        compat:showAsAction="ifRoom|withText"/>
 		
 	<item
         android:id="@+id/menu_toggle_timer"
diff --git a/res/menu/search.xml b/res/menu/search.xml
index b9cdecac..fa361566 100644
--- a/res/menu/search.xml
+++ b/res/menu/search.xml
@@ -1,10 +1,11 @@
 <?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"
+		xmlns:compat="http://schemas.android.com/apk/res-auto">
 	<item 
 		android:id="@+id/menu_search"
 		android:icon="@drawable/action_search"
 		android:title="@string/menu.search"
-		android:showAsAction="ifRoom|withText"/>
+		compat:showAsAction="ifRoom|withText"/>
 
 	<item 
 		android:id="@+id/menu_help"
diff --git a/res/menu/select_album.xml b/res/menu/select_album.xml
index 5ca9c537..329c479c 100644
--- a/res/menu/select_album.xml
+++ b/res/menu/select_album.xml
@@ -1,20 +1,21 @@
 <?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"
+		xmlns:compat="http://schemas.android.com/apk/res-auto">
 	<item 
 		android:id="@+id/menu_play_now"
 		android:icon="@drawable/action_play_all"
 		android:title="@string/menu.play"
-		android:showAsAction="always|withText"/>
+		compat:showAsAction="always|withText"/>
 		
 	<item 
 		android:id="@+id/menu_refresh"
 		android:icon="@drawable/action_refresh"
 		android:title="@string/menu.refresh"
-		android:showAsAction="always|withText"/>
+		compat:showAsAction="always|withText"/>
 		
 	<item 
 		android:id="@+id/menu_shuffle"
 		android:icon="@drawable/action_shuffle"
 		android:title="@string/menu.shuffle"
-		android:showAsAction="ifRoom|withText"/>
+		compat:showAsAction="ifRoom|withText"/>
 </menu>
diff --git a/res/menu/select_album_context.xml b/res/menu/select_album_context.xml
index 00fe7993..efc2f2fd 100644
--- a/res/menu/select_album_context.xml
+++ b/res/menu/select_album_context.xml
@@ -1,5 +1,6 @@
 <?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"
+		xmlns:compat="http://schemas.android.com/apk/res-auto">
 
     <item 
         android:id="@+id/album_menu_play_now"
diff --git a/res/menu/select_album_context_offline.xml b/res/menu/select_album_context_offline.xml
index 70cf9da9..d40466fd 100644
--- a/res/menu/select_album_context_offline.xml
+++ b/res/menu/select_album_context_offline.xml
@@ -1,5 +1,6 @@
 <?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"
+		xmlns:compat="http://schemas.android.com/apk/res-auto">
     <item 
         android:id="@+id/album_menu_play_now"
         android:title="@string/common.play_now"
diff --git a/res/menu/select_album_list.xml b/res/menu/select_album_list.xml
index b6db96aa..635a36bf 100644
--- a/res/menu/select_album_list.xml
+++ b/res/menu/select_album_list.xml
@@ -1,8 +1,9 @@
 <?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"
+		xmlns:compat="http://schemas.android.com/apk/res-auto">
 	<item 
 		android:id="@+id/menu_refresh"
 		android:icon="@drawable/action_refresh"
 		android:title="@string/menu.refresh"
-		android:showAsAction="always|withText"/>
+		compat:showAsAction="always|withText"/>
 </menu>
diff --git a/res/menu/select_artist.xml b/res/menu/select_artist.xml
index a7b988a5..3c694cd2 100644
--- a/res/menu/select_artist.xml
+++ b/res/menu/select_artist.xml
@@ -1,22 +1,23 @@
 <?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"
+		xmlns:compat="http://schemas.android.com/apk/res-auto">
 	<item 
 		android:id="@+id/menu_refresh"
 		android:icon="@drawable/action_refresh"
 		android:title="@string/menu.refresh"
-		android:showAsAction="always|withText"/>
+		compat:showAsAction="always|withText"/>
 		
 	<item 
 		android:id="@+id/menu_shuffle"
 		android:icon="@drawable/action_shuffle"
 		android:title="@string/menu.shuffle"
-		android:showAsAction="always|withText"/>
+		compat:showAsAction="always|withText"/>
 		
 	<item 
 		android:id="@+id/menu_search"
 		android:icon="@drawable/action_search"
 		android:title="@string/menu.search"
-		android:showAsAction="ifRoom|withText"/>
+		compat:showAsAction="ifRoom|withText"/>
 
 	<item 
 		android:id="@+id/menu_settings"
diff --git a/res/menu/select_artist_context.xml b/res/menu/select_artist_context.xml
index 23d64c4e..d7a5c6ac 100644
--- a/res/menu/select_artist_context.xml
+++ b/res/menu/select_artist_context.xml
@@ -1,5 +1,6 @@
 <?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"
+		xmlns:compat="http://schemas.android.com/apk/res-auto">
 
     <item 
         android:id="@+id/artist_menu_play_now"
diff --git a/res/menu/select_artist_context_offline.xml b/res/menu/select_artist_context_offline.xml
index c80db020..72d99cd5 100644
--- a/res/menu/select_artist_context_offline.xml
+++ b/res/menu/select_artist_context_offline.xml
@@ -1,5 +1,6 @@
 <?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"
+		xmlns:compat="http://schemas.android.com/apk/res-auto">
 
     <item 
         android:id="@+id/artist_menu_play_now"
diff --git a/res/menu/select_genres.xml b/res/menu/select_genres.xml
index e0f9a718..7ce7f1a0 100644
--- a/res/menu/select_genres.xml
+++ b/res/menu/select_genres.xml
@@ -1,10 +1,11 @@
 <?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"
+		xmlns:compat="http://schemas.android.com/apk/res-auto">
 	<item 
 		android:id="@+id/menu_refresh"
 		android:icon="@drawable/action_refresh"
 		android:title="@string/menu.refresh"
-		android:showAsAction="always|withText"/>
+		compat:showAsAction="always|withText"/>
 
 	<item 
 		android:id="@+id/menu_settings"
diff --git a/res/menu/select_playlist.xml b/res/menu/select_playlist.xml
index a68e6da0..4c4cc302 100644
--- a/res/menu/select_playlist.xml
+++ b/res/menu/select_playlist.xml
@@ -1,16 +1,17 @@
 <?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"
+		xmlns:compat="http://schemas.android.com/apk/res-auto">
 	<item 
 		android:id="@+id/menu_refresh"
 		android:icon="@drawable/action_refresh"
 		android:title="@string/menu.refresh"
-		android:showAsAction="always|withText"/>
+		compat:showAsAction="always|withText"/>
 		
 	<item 
 		android:id="@+id/menu_search"
 		android:icon="@drawable/action_search"
 		android:title="@string/menu.search"
-		android:showAsAction="always|withText"/>
+		compat:showAsAction="always|withText"/>
 
 	<item 
 		android:id="@+id/menu_settings"
diff --git a/res/menu/select_playlist_context.xml b/res/menu/select_playlist_context.xml
index 6d844a16..0ec94e02 100644
--- a/res/menu/select_playlist_context.xml
+++ b/res/menu/select_playlist_context.xml
@@ -1,5 +1,6 @@
 <?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"
+		xmlns:compat="http://schemas.android.com/apk/res-auto">
 	
 	<item
 		android:id="@+id/playlist_info"
diff --git a/res/menu/select_playlist_context_offline.xml b/res/menu/select_playlist_context_offline.xml
index 644df2d3..d63aec17 100644
--- a/res/menu/select_playlist_context_offline.xml
+++ b/res/menu/select_playlist_context_offline.xml
@@ -1,5 +1,6 @@
 <?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"
+		xmlns:compat="http://schemas.android.com/apk/res-auto">
     <item 
         android:id="@+id/playlist_menu_play_now"
         android:title="@string/common.play_now"
diff --git a/res/menu/select_podcast_episode.xml b/res/menu/select_podcast_episode.xml
index 7cd1ec88..7e79d0f7 100644
--- a/res/menu/select_podcast_episode.xml
+++ b/res/menu/select_podcast_episode.xml
@@ -1,10 +1,11 @@
 <?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"
+		xmlns:compat="http://schemas.android.com/apk/res-auto">
 	<item 
 		android:id="@+id/menu_refresh"
 		android:icon="@drawable/action_refresh"
 		android:title="@string/menu.refresh"
-		android:showAsAction="always|withText"/>
+		compat:showAsAction="always|withText"/>
 		
 	<item
 		android:id="@+id/menu_download_all"
diff --git a/res/menu/select_podcast_episode_context.xml b/res/menu/select_podcast_episode_context.xml
index 25c83989..deffdecf 100644
--- a/res/menu/select_podcast_episode_context.xml
+++ b/res/menu/select_podcast_episode_context.xml
@@ -1,5 +1,6 @@
 <?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"
+		xmlns:compat="http://schemas.android.com/apk/res-auto">
 	
 	<item
 		android:id="@+id/song_menu_info"
diff --git a/res/menu/select_podcast_episode_context_offline.xml b/res/menu/select_podcast_episode_context_offline.xml
index 38c4569b..8d1508ac 100644
--- a/res/menu/select_podcast_episode_context_offline.xml
+++ b/res/menu/select_podcast_episode_context_offline.xml
@@ -1,5 +1,6 @@
 <?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"
+		xmlns:compat="http://schemas.android.com/apk/res-auto">
 	
 	<item
 		android:id="@+id/song_menu_info"
diff --git a/res/menu/select_podcast_episode_offline.xml b/res/menu/select_podcast_episode_offline.xml
index 9bbc2d92..cb6d1a3b 100644
--- a/res/menu/select_podcast_episode_offline.xml
+++ b/res/menu/select_podcast_episode_offline.xml
@@ -1,10 +1,11 @@
 <?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"
+		xmlns:compat="http://schemas.android.com/apk/res-auto">
 	<item 
 		android:id="@+id/menu_refresh"
 		android:icon="@drawable/action_refresh"
 		android:title="@string/menu.refresh"
-		android:showAsAction="always|withText"/>
+		compat:showAsAction="always|withText"/>
 		
 	<item 
 		android:id="@+id/menu_delete"
diff --git a/res/menu/select_podcasts.xml b/res/menu/select_podcasts.xml
index e77b43db..6c1ffa07 100644
--- a/res/menu/select_podcasts.xml
+++ b/res/menu/select_podcasts.xml
@@ -1,10 +1,11 @@
 <?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"
+		xmlns:compat="http://schemas.android.com/apk/res-auto">
 	<item 
 		android:id="@+id/menu_refresh"
 		android:icon="@drawable/action_refresh"
 		android:title="@string/menu.refresh"
-		android:showAsAction="always|withText"/>
+		compat:showAsAction="always|withText"/>
 
 	<item 
 		android:id="@+id/menu_add_podcast"
diff --git a/res/menu/select_podcasts_context.xml b/res/menu/select_podcasts_context.xml
index af4edb55..c9785b92 100644
--- a/res/menu/select_podcasts_context.xml
+++ b/res/menu/select_podcasts_context.xml
@@ -1,5 +1,6 @@
 <?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"
+		xmlns:compat="http://schemas.android.com/apk/res-auto">
 	<item
 		android:id="@+id/podcast_channel_info"
 		android:title="@string/common.info"/>
diff --git a/res/menu/select_song.xml b/res/menu/select_song.xml
index 3a55fee0..658e3ffe 100644
--- a/res/menu/select_song.xml
+++ b/res/menu/select_song.xml
@@ -1,46 +1,47 @@
 <?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"
+		xmlns:compat="http://schemas.android.com/apk/res-auto">
 	<item 
 		android:id="@+id/menu_play_now"
 		android:icon="@drawable/action_play_all"
 		android:title="@string/menu.play"
-		android:showAsAction="always|withText"/>
+		compat:showAsAction="always|withText"/>
 		
 	<item 
 		android:id="@+id/menu_refresh"
 		android:icon="@drawable/action_refresh"
 		android:title="@string/menu.refresh"
-		android:showAsAction="always|withText"/>
+		compat:showAsAction="always|withText"/>
 		
 	<item 
 		android:id="@+id/menu_shuffle"
 		android:icon="@drawable/action_shuffle"
 		android:title="@string/menu.shuffle"
-		android:showAsAction="ifRoom|withText"/>
+		compat:showAsAction="ifRoom|withText"/>
 		
 	<item 
 		android:id="@+id/menu_select"
 		android:icon="@drawable/action_select"
 		android:title="@string/menu.select"
-		android:showAsAction="ifRoom|withText"/>
+		compat:showAsAction="ifRoom|withText"/>
 		
 	<item 
 		android:id="@+id/menu_download"
 		android:icon="@drawable/action_save"
 		android:title="@string/common.download"
-		android:showAsAction="ifRoom|withText"/>
+		compat:showAsAction="ifRoom|withText"/>
 		
 	<item 
 		android:id="@+id/menu_cache"
 		android:icon="@drawable/action_save"
 		android:title="@string/common.pin"
-		android:showAsAction="ifRoom|withText"/>
+		compat:showAsAction="ifRoom|withText"/>
 		
 	<item 
 		android:id="@+id/menu_delete"
 		android:icon="@drawable/action_remove_all"
 		android:title="@string/common.delete"
-		android:showAsAction="ifRoom|withText"/>
+		compat:showAsAction="ifRoom|withText"/>
 	
 	<item 
 		android:id="@+id/menu_add_playlist"
@@ -54,5 +55,5 @@
 		android:id="@+id/menu_play_last"
 		android:icon="@drawable/action_play_all"
 		android:title="@string/menu.play_last"
-		android:showAsAction="ifRoom|withText"/>
+		compat:showAsAction="ifRoom|withText"/>
 </menu>
diff --git a/res/menu/select_song_context.xml b/res/menu/select_song_context.xml
index 4db229f2..e2048b20 100644
--- a/res/menu/select_song_context.xml
+++ b/res/menu/select_song_context.xml
@@ -1,5 +1,6 @@
 <?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"
+		xmlns:compat="http://schemas.android.com/apk/res-auto">
 	
 	<item
 		android:id="@+id/song_menu_info"
diff --git a/res/menu/select_song_context_offline.xml b/res/menu/select_song_context_offline.xml
index d19eaa70..36a0c1ff 100644
--- a/res/menu/select_song_context_offline.xml
+++ b/res/menu/select_song_context_offline.xml
@@ -1,5 +1,6 @@
 <?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"
+		xmlns:compat="http://schemas.android.com/apk/res-auto">
 	
 	<item
 		android:id="@+id/song_menu_info"
diff --git a/res/menu/select_song_offline.xml b/res/menu/select_song_offline.xml
index 6ed43b71..7588d9ad 100644
--- a/res/menu/select_song_offline.xml
+++ b/res/menu/select_song_offline.xml
@@ -1,38 +1,39 @@
 <?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"
+		xmlns:compat="http://schemas.android.com/apk/res-auto">
 	<item 
 		android:id="@+id/menu_play_now"
 		android:icon="@drawable/action_play_all"
 		android:title="@string/menu.play"
-		android:showAsAction="always|withText"/>
+		compat:showAsAction="always|withText"/>
 		
 	<item 
 		android:id="@+id/menu_refresh"
 		android:icon="@drawable/action_refresh"
 		android:title="@string/menu.refresh"
-		android:showAsAction="always|withText"/>
+		compat:showAsAction="always|withText"/>
 		
 	<item 
 		android:id="@+id/menu_shuffle"
 		android:icon="@drawable/action_shuffle"
 		android:title="@string/menu.shuffle"
-		android:showAsAction="ifRoom|withText"/>
+		compat:showAsAction="ifRoom|withText"/>
 		
 	<item 
 		android:id="@+id/menu_select"
 		android:icon="@drawable/action_select"
 		android:title="@string/menu.select"
-		android:showAsAction="ifRoom|withText"/>
+		compat:showAsAction="ifRoom|withText"/>
 		
 	<item 
 		android:id="@+id/menu_delete"
 		android:icon="@drawable/action_remove_all"
 		android:title="@string/common.delete"
-		android:showAsAction="ifRoom|withText"/>
+		compat: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"/>
+		compat:showAsAction="ifRoom|withText"/>
 </menu>
diff --git a/res/menu/select_video_context.xml b/res/menu/select_video_context.xml
index 5926f8a5..084c29aa 100644
--- a/res/menu/select_video_context.xml
+++ b/res/menu/select_video_context.xml
@@ -1,5 +1,6 @@
 <?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"
+		xmlns:compat="http://schemas.android.com/apk/res-auto">
 	<item
 		android:id="@+id/song_menu_info"
 		android:title="@string/common.info"/>
diff --git a/res/menu/select_video_context_offline.xml b/res/menu/select_video_context_offline.xml
index fc354119..7a9020f5 100644
--- a/res/menu/select_video_context_offline.xml
+++ b/res/menu/select_video_context_offline.xml
@@ -1,5 +1,6 @@
 <?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"
+		xmlns:compat="http://schemas.android.com/apk/res-auto">
 	<item
 		android:id="@+id/song_menu_info"
 		android:title="@string/common.info"/>
diff --git a/res/values/themes.xml b/res/values/themes.xml
index 33dd2de7..a32a34e8 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<style name="Theme.DSub.Light" parent="Theme.Sherlock.Light">
+	<style name="Theme.DSub.Light" parent="@style/Theme.AppCompat.Light">
 		<item name="actionBarStyle">@style/Widget.DSub.ActionBarStyle.Light</item>
 		<item name="android:actionBarStyle">@style/Widget.DSub.ActionBarStyle.Light</item>
 		<item name="offline_icon">@drawable/main_offline_light</item>
@@ -13,7 +13,7 @@
 		<item name="chat">@drawable/ic_menu_chat_light</item> 
 		<item name="chat_send">@drawable/ic_menu_chat_send_light</item> 
 	</style>
-	<style name="Theme.DSub.Dark" parent="Theme.Sherlock">
+	<style name="Theme.DSub.Dark" parent="@style/Theme.AppCompat.Light.DarkActionBar">
 		<item name="actionBarStyle">@style/Widget.DSub.ActionBarStyle.Dark</item>
 		<item name="android:actionBarStyle">@style/Widget.DSub.ActionBarStyle.Dark</item>
 		<item name="android:textColorSecondary">@color/cyan</item>
@@ -30,7 +30,7 @@
 	<style name="Theme.DSub.Black" parent="Theme.DSub.Dark">
 		<item name="android:windowBackground">@android:color/black</item>
 	</style>
-	<style name="Theme.DSub.Holo" parent="Theme.Sherlock">
+	<style name="Theme.DSub.Holo" parent="@style/Theme.AppCompat">
 		<item name="actionBarStyle">@style/Widget.DSub.ActionBarStyle.Holo</item>
 		<item name="android:actionBarStyle">@style/Widget.DSub.ActionBarStyle.Holo</item>
 		<item name="android:textColorSecondary">@color/cyan</item>
@@ -59,21 +59,21 @@
 		<item name="android:windowFullscreen">true</item>
 	</style>
 	
-	<style name="Widget.DSub.ActionBarStyle.Light" parent="Widget.Sherlock.Light.ActionBar.Solid">
+	<style name="Widget.DSub.ActionBarStyle.Light" parent="Widget.AppCompat.Light.ActionBar.Solid">
 		<item name="background">@android:color/transparent</item>
 		<item name="android:background">@android:color/transparent</item>
 		<item name="backgroundStacked">@android:color/transparent</item>
 		<item name="android:backgroundStacked">@android:color/transparent</item>
 	</style>
 	
-	<style name="Widget.DSub.ActionBarStyle.Dark" parent="Widget.Sherlock.ActionBar.Solid">
+	<style name="Widget.DSub.ActionBarStyle.Dark" parent="Widget.AppCompat.ActionBar.Solid">
 		<item name="background">@android:color/transparent</item>
 		<item name="android:background">@android:color/transparent</item>
 		<item name="backgroundStacked">@android:color/transparent</item>
 		<item name="android:backgroundStacked">@android:color/transparent</item>
 	</style>
 	
-	<style name="Widget.DSub.ActionBarStyle.Holo" parent="Widget.Sherlock.ActionBar.Solid">
+	<style name="Widget.DSub.ActionBarStyle.Holo" parent="Widget.AppCompat.ActionBar.Solid">
 		<item name="background">@android:color/transparent</item>
 		<item name="android:background">@android:color/transparent</item>
 		<item name="backgroundStacked">@android:color/transparent</item>
diff --git a/src/github/daneren2005/dsub/activity/DownloadActivity.java b/src/github/daneren2005/dsub/activity/DownloadActivity.java
index bfdc9eb9..447bbb34 100644
--- a/src/github/daneren2005/dsub/activity/DownloadActivity.java
+++ b/src/github/daneren2005/dsub/activity/DownloadActivity.java
@@ -20,6 +20,7 @@ package github.daneren2005.dsub.activity;
 
 import github.daneren2005.dsub.R;
 import android.os.Bundle;
+import android.view.MenuItem;
 import android.view.MotionEvent;
 import github.daneren2005.dsub.fragments.DownloadFragment;
 import android.app.Dialog;
@@ -33,7 +34,6 @@ import android.content.DialogInterface;
 import android.content.Intent;
 import android.util.Log;
 import android.view.View;
-import com.actionbarsherlock.view.MenuItem;
 import github.daneren2005.dsub.domain.MusicDirectory;
 import github.daneren2005.dsub.service.DownloadFile;
 import github.daneren2005.dsub.service.MusicService;
diff --git a/src/github/daneren2005/dsub/activity/MainActivity.java b/src/github/daneren2005/dsub/activity/MainActivity.java
index c077c87c..8aa68b3d 100644
--- a/src/github/daneren2005/dsub/activity/MainActivity.java
+++ b/src/github/daneren2005/dsub/activity/MainActivity.java
@@ -8,9 +8,8 @@ import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.os.Handler;
 import android.preference.PreferenceManager;
-import com.actionbarsherlock.app.ActionBar;
-import com.actionbarsherlock.view.Menu;
 import android.support.v4.view.ViewPager;
+import android.support.v7.app.ActionBar;
 import android.util.Log;
 import android.view.View;
 import android.widget.ImageButton;
diff --git a/src/github/daneren2005/dsub/activity/SearchActivity.java b/src/github/daneren2005/dsub/activity/SearchActivity.java
index aeddcf4f..1dfe4790 100644
--- a/src/github/daneren2005/dsub/activity/SearchActivity.java
+++ b/src/github/daneren2005/dsub/activity/SearchActivity.java
@@ -23,9 +23,10 @@ import github.daneren2005.dsub.R;
 import android.content.Intent;
 import android.os.Bundle;
 import android.util.Log;
+import android.view.MenuItem;
+
 import github.daneren2005.dsub.fragments.SearchFragment;
 import github.daneren2005.dsub.util.Constants;
-import com.actionbarsherlock.view.MenuItem;
 
 public class SearchActivity extends SubsonicActivity {
 	private static final String TAG = SearchActivity.class.getSimpleName();
diff --git a/src/github/daneren2005/dsub/activity/SubsonicActivity.java b/src/github/daneren2005/dsub/activity/SubsonicActivity.java
index 611a19ee..f59d0a3f 100644
--- a/src/github/daneren2005/dsub/activity/SubsonicActivity.java
+++ b/src/github/daneren2005/dsub/activity/SubsonicActivity.java
@@ -12,18 +12,18 @@ import android.support.v4.app.FragmentManager;
 import android.support.v4.app.FragmentPagerAdapter;
 import android.support.v4.app.FragmentTransaction;
 import android.support.v4.view.ViewPager;
+import android.support.v7.app.ActionBar;
+import android.support.v7.app.ActionBarActivity;
 import android.util.Log;
 import android.view.KeyEvent;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
 import android.view.View;
 import android.widget.AdapterView;
 import android.widget.AdapterView.OnItemSelectedListener;
 import android.widget.ArrayAdapter;
 import android.widget.Spinner;
-import com.actionbarsherlock.app.ActionBar;
-import com.actionbarsherlock.app.ActionBar.Tab;
-import com.actionbarsherlock.app.ActionBar.TabListener;
-import com.actionbarsherlock.app.SherlockFragmentActivity;
-import com.actionbarsherlock.view.Menu;
 
 import github.daneren2005.dsub.R;
 import github.daneren2005.dsub.fragments.SubsonicFragment;
@@ -37,7 +37,7 @@ import java.io.PrintWriter;
 import java.util.ArrayList;
 import java.util.List;
 
-public class SubsonicActivity extends SherlockFragmentActivity implements OnItemSelectedListener {
+public class SubsonicActivity extends ActionBarActivity implements OnItemSelectedListener {
 	private static final String TAG = SubsonicActivity.class.getSimpleName();
 	private static ImageLoader IMAGE_LOADER;
 	protected static String theme;
@@ -131,7 +131,7 @@ public class SubsonicActivity extends SherlockFragmentActivity implements OnItem
 	
 	@Override
 	public boolean onCreateOptionsMenu(Menu menu) {
-		com.actionbarsherlock.view.MenuInflater menuInflater = getSupportMenuInflater();
+		MenuInflater menuInflater = getMenuInflater();
 		if(pagerAdapter != null) {
 			pagerAdapter.onCreateOptionsMenu(menu, menuInflater);
 		} else if(currentFragment != null) {
@@ -140,7 +140,7 @@ public class SubsonicActivity extends SherlockFragmentActivity implements OnItem
 		return true;
 	}
 	@Override
-	public boolean onOptionsItemSelected(com.actionbarsherlock.view.MenuItem item) {
+	public boolean onOptionsItemSelected(MenuItem item) {
 		if(pagerAdapter != null) {
 			return pagerAdapter.onOptionsItemSelected(item);
 		} else if(currentFragment != null) {
@@ -384,8 +384,8 @@ public class SubsonicActivity extends SherlockFragmentActivity implements OnItem
 		}
 	}
 	
-	public class TabPagerAdapter extends FragmentPagerAdapter implements TabListener, ViewPager.OnPageChangeListener {
-		private SherlockFragmentActivity activity;
+	public class TabPagerAdapter extends FragmentPagerAdapter implements ActionBar.TabListener, ViewPager.OnPageChangeListener {
+		private ActionBarActivity activity;
 		private ViewPager pager;
 		private ActionBar actionBar;
 		private SubsonicFragment currentFragment;
@@ -394,7 +394,7 @@ public class SubsonicActivity extends SherlockFragmentActivity implements OnItem
 		private List<QueuedFragment> queue = new ArrayList<QueuedFragment>();
 		private int currentPosition;
 
-		public TabPagerAdapter(SherlockFragmentActivity activity, ViewPager pager) {
+		public TabPagerAdapter(ActionBarActivity activity, ViewPager pager) {
 			super(activity.getSupportFragmentManager());
 			this.activity = activity;
 			this.actionBar = activity.getSupportActionBar();
@@ -428,7 +428,7 @@ public class SubsonicActivity extends SherlockFragmentActivity implements OnItem
 			return tabs.size();
 		}
 		
-		public void onCreateOptionsMenu(Menu menu, com.actionbarsherlock.view.MenuInflater menuInflater) {
+		public void onCreateOptionsMenu(Menu menu, MenuInflater menuInflater) {
 			if(currentFragment != null) {
 				currentFragment.onCreateOptionsMenu(menu, menuInflater);
 				
@@ -440,7 +440,7 @@ public class SubsonicActivity extends SherlockFragmentActivity implements OnItem
 				queue.clear();
 			}
 		}
-		public boolean onOptionsItemSelected(com.actionbarsherlock.view.MenuItem item) {
+		public boolean onOptionsItemSelected(MenuItem item) {
 			if(currentFragment != null) {
 				return currentFragment.onOptionsItemSelected(item);
 			} else {
@@ -448,7 +448,7 @@ public class SubsonicActivity extends SherlockFragmentActivity implements OnItem
 			}
 		}
 
-		public void onTabSelected(Tab tab, FragmentTransaction ft) {
+		public void onTabSelected(ActionBar.Tab tab, FragmentTransaction ft) {
 			TabInfo tabInfo = (TabInfo) tab.getTag();
 			for (int i = 0; i < tabs.size(); i++) {
 				if ( tabs.get(i) == tabInfo ) {
@@ -458,9 +458,9 @@ public class SubsonicActivity extends SherlockFragmentActivity implements OnItem
 			}
 		}
 
-		public void onTabUnselected(Tab tab, FragmentTransaction ft) {}
+		public void onTabUnselected(ActionBar.Tab tab, FragmentTransaction ft) {}
 
-		public void onTabReselected(Tab tab, FragmentTransaction ft) {}
+		public void onTabReselected(ActionBar.Tab tab, FragmentTransaction ft) {}
 
 		public void onPageScrollStateChanged(int arg0) {}
 
@@ -486,7 +486,7 @@ public class SubsonicActivity extends SherlockFragmentActivity implements OnItem
 		public void addTab(CharSequence title, Class fragmentClass, Bundle args) {
 			final TabInfo tabInfo = new TabInfo(fragmentClass, args);
 
-			Tab tab = actionBar.newTab();
+			ActionBar.Tab tab = actionBar.newTab();
 			tab.setText(title);
 			tab.setTabListener(this);
 			tab.setTag(tabInfo);
diff --git a/src/github/daneren2005/dsub/fragments/ChatFragment.java b/src/github/daneren2005/dsub/fragments/ChatFragment.java
index 4f373442..a17d680c 100644
--- a/src/github/daneren2005/dsub/fragments/ChatFragment.java
+++ b/src/github/daneren2005/dsub/fragments/ChatFragment.java
@@ -12,6 +12,9 @@ import android.text.TextWatcher;
 import android.util.Log;
 import android.view.KeyEvent;
 import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.WindowManager;
@@ -29,7 +32,6 @@ import github.daneren2005.dsub.util.BackgroundTask;
 import github.daneren2005.dsub.util.TabBackgroundTask;
 import github.daneren2005.dsub.util.Util;
 import github.daneren2005.dsub.view.ChatAdapter;
-import com.actionbarsherlock.view.Menu;
 import github.daneren2005.dsub.util.Constants;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
@@ -140,12 +142,12 @@ public class ChatFragment extends SubsonicFragment {
 	}
 	
 	@Override
-	public void onCreateOptionsMenu(Menu menu, com.actionbarsherlock.view.MenuInflater menuInflater) {
+	public void onCreateOptionsMenu(Menu menu, MenuInflater menuInflater) {
 		menuInflater.inflate(R.menu.chat, menu);
 	}
 
 	@Override
-	public boolean onOptionsItemSelected(com.actionbarsherlock.view.MenuItem item) {
+	public boolean onOptionsItemSelected(MenuItem item) {
 		if(super.onOptionsItemSelected(item)) {
 			return true;
 		}
diff --git a/src/github/daneren2005/dsub/fragments/DownloadFragment.java b/src/github/daneren2005/dsub/fragments/DownloadFragment.java
index 48102539..bed97137 100644
--- a/src/github/daneren2005/dsub/fragments/DownloadFragment.java
+++ b/src/github/daneren2005/dsub/fragments/DownloadFragment.java
@@ -20,6 +20,9 @@ import android.view.Display;
 import android.view.GestureDetector;
 import android.view.GestureDetector.OnGestureListener;
 import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.View.OnClickListener;
@@ -36,9 +39,6 @@ import android.widget.LinearLayout;
 import android.widget.SeekBar;
 import android.widget.TextView;
 import android.widget.ViewFlipper;
-import com.actionbarsherlock.view.Menu;
-import com.actionbarsherlock.view.MenuItem;
-import com.actionbarsherlock.view.MenuInflater;
 import github.daneren2005.dsub.R;
 import github.daneren2005.dsub.domain.MusicDirectory;
 import github.daneren2005.dsub.domain.PlayerState;
diff --git a/src/github/daneren2005/dsub/fragments/MainFragment.java b/src/github/daneren2005/dsub/fragments/MainFragment.java
index 9a48acd5..05726483 100644
--- a/src/github/daneren2005/dsub/fragments/MainFragment.java
+++ b/src/github/daneren2005/dsub/fragments/MainFragment.java
@@ -9,6 +9,9 @@ import android.os.Bundle;
 import android.os.StatFs;
 import android.view.ContextMenu;
 import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.AdapterView;
@@ -22,9 +25,6 @@ import github.daneren2005.dsub.util.FileUtil;
 import github.daneren2005.dsub.util.LoadingTask;
 import github.daneren2005.dsub.view.MergeAdapter;
 import github.daneren2005.dsub.util.Util;
-import com.actionbarsherlock.view.Menu;
-import com.actionbarsherlock.view.MenuItem;
-import com.actionbarsherlock.view.MenuInflater;
 import github.daneren2005.dsub.service.MusicService;
 import github.daneren2005.dsub.service.MusicServiceFactory;
 import github.daneren2005.dsub.util.SilentBackgroundTask;
diff --git a/src/github/daneren2005/dsub/fragments/SearchFragment.java b/src/github/daneren2005/dsub/fragments/SearchFragment.java
index 1c35d38c..869287d1 100644
--- a/src/github/daneren2005/dsub/fragments/SearchFragment.java
+++ b/src/github/daneren2005/dsub/fragments/SearchFragment.java
@@ -8,6 +8,8 @@ import android.content.Intent;
 import android.os.Bundle;
 import android.view.ContextMenu;
 import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
 import android.view.View;
 import android.view.MenuItem;
 import android.widget.AdapterView;
@@ -16,7 +18,6 @@ import android.widget.ListView;
 import android.widget.TextView;
 import android.net.Uri;
 import android.view.ViewGroup;
-import com.actionbarsherlock.view.Menu;
 import github.daneren2005.dsub.R;
 import github.daneren2005.dsub.activity.SearchActivity;
 import github.daneren2005.dsub.domain.Artist;
@@ -118,12 +119,12 @@ public class SearchFragment extends SubsonicFragment {
 	}
 
 	@Override
-	public void onCreateOptionsMenu(Menu menu, com.actionbarsherlock.view.MenuInflater menuInflater) {
+	public void onCreateOptionsMenu(Menu menu, MenuInflater menuInflater) {
 		menuInflater.inflate(R.menu.search, menu);
 	}
 
 	@Override
-	public boolean onOptionsItemSelected(com.actionbarsherlock.view.MenuItem item) {
+	public boolean onOptionsItemSelected(MenuItem item) {
 		if(super.onOptionsItemSelected(item)) {
 			return true;
 		}
diff --git a/src/github/daneren2005/dsub/fragments/SelectArtistFragment.java b/src/github/daneren2005/dsub/fragments/SelectArtistFragment.java
index 0a35233e..9451c648 100644
--- a/src/github/daneren2005/dsub/fragments/SelectArtistFragment.java
+++ b/src/github/daneren2005/dsub/fragments/SelectArtistFragment.java
@@ -6,9 +6,9 @@ import android.support.v4.app.FragmentTransaction;
 import android.util.Log;
 import android.view.ContextMenu;
 import android.view.LayoutInflater;
+import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
-import com.actionbarsherlock.view.Menu;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.AdapterView;
@@ -68,12 +68,12 @@ public class SelectArtistFragment extends SubsonicFragment implements AdapterVie
 	}
 
 	@Override
-	public void onCreateOptionsMenu(Menu menu, com.actionbarsherlock.view.MenuInflater menuInflater) {
+	public void onCreateOptionsMenu(Menu menu, MenuInflater menuInflater) {
 		menuInflater.inflate(R.menu.select_artist, menu);
 	}
 
 	@Override
-	public boolean onOptionsItemSelected(com.actionbarsherlock.view.MenuItem item) {
+	public boolean onOptionsItemSelected(MenuItem item) {
 		if(super.onOptionsItemSelected(item)) {
 			return true;
 		}
diff --git a/src/github/daneren2005/dsub/fragments/SelectDirectoryFragment.java b/src/github/daneren2005/dsub/fragments/SelectDirectoryFragment.java
index be8cf91e..d75ba1b4 100644
--- a/src/github/daneren2005/dsub/fragments/SelectDirectoryFragment.java
+++ b/src/github/daneren2005/dsub/fragments/SelectDirectoryFragment.java
@@ -8,6 +8,8 @@ import android.os.Bundle;
 import android.util.Log;
 import android.view.ContextMenu;
 import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
@@ -139,7 +141,7 @@ public class SelectDirectoryFragment extends SubsonicFragment implements Adapter
 	}
 
 	@Override
-	public void onCreateOptionsMenu(com.actionbarsherlock.view.Menu menu, com.actionbarsherlock.view.MenuInflater menuInflater) {
+	public void onCreateOptionsMenu(Menu menu, MenuInflater menuInflater) {
 		if(licenseValid == null) {
 			menuInflater.inflate(R.menu.empty, menu);
 		}
@@ -173,7 +175,7 @@ public class SelectDirectoryFragment extends SubsonicFragment implements Adapter
 	}
 
 	@Override
-	public boolean onOptionsItemSelected(com.actionbarsherlock.view.MenuItem item) {
+	public boolean onOptionsItemSelected(MenuItem item) {
 		switch (item.getItemId()) {
 			case R.id.menu_play_now:
 				playNow(false, false);
diff --git a/src/github/daneren2005/dsub/fragments/SelectGenreFragment.java b/src/github/daneren2005/dsub/fragments/SelectGenreFragment.java
index 623aba4e..a509c4b7 100644
--- a/src/github/daneren2005/dsub/fragments/SelectGenreFragment.java
+++ b/src/github/daneren2005/dsub/fragments/SelectGenreFragment.java
@@ -21,6 +21,9 @@ package github.daneren2005.dsub.fragments;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.AdapterView;
@@ -33,9 +36,6 @@ import github.daneren2005.dsub.util.BackgroundTask;
 import github.daneren2005.dsub.util.Constants;
 import github.daneren2005.dsub.util.TabBackgroundTask;
 import github.daneren2005.dsub.view.GenreAdapter;
-import com.actionbarsherlock.view.Menu;
-import com.actionbarsherlock.view.MenuItem;
-import com.actionbarsherlock.view.MenuInflater;
 import java.util.ArrayList;
 import java.util.List;
 
diff --git a/src/github/daneren2005/dsub/fragments/SelectPlaylistFragment.java b/src/github/daneren2005/dsub/fragments/SelectPlaylistFragment.java
index 84316b7c..8bcd9d7a 100644
--- a/src/github/daneren2005/dsub/fragments/SelectPlaylistFragment.java
+++ b/src/github/daneren2005/dsub/fragments/SelectPlaylistFragment.java
@@ -8,6 +8,7 @@ import android.support.v4.app.FragmentTransaction;
 import android.util.Log;
 import android.view.ContextMenu;
 import android.view.LayoutInflater;
+import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
@@ -61,12 +62,12 @@ public class SelectPlaylistFragment extends SubsonicFragment implements AdapterV
 	}
 
 	@Override
-	public void onCreateOptionsMenu(com.actionbarsherlock.view.Menu menu, com.actionbarsherlock.view.MenuInflater menuInflater) {
+	public void onCreateOptionsMenu(Menu menu, MenuInflater menuInflater) {
 		menuInflater.inflate(R.menu.select_playlist, menu);
 	}
 
 	@Override
-	public boolean onOptionsItemSelected(com.actionbarsherlock.view.MenuItem item) {
+	public boolean onOptionsItemSelected(MenuItem item) {
 		if(super.onOptionsItemSelected(item)) {
 			return true;
 		}
diff --git a/src/github/daneren2005/dsub/fragments/SelectPodcastsFragment.java b/src/github/daneren2005/dsub/fragments/SelectPodcastsFragment.java
index ee816f6c..9cd42633 100644
--- a/src/github/daneren2005/dsub/fragments/SelectPodcastsFragment.java
+++ b/src/github/daneren2005/dsub/fragments/SelectPodcastsFragment.java
@@ -27,14 +27,14 @@ import android.text.util.Linkify;
 import android.util.Log;
 import android.view.ContextMenu;
 import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.AdapterView;
 import android.widget.ListView;
 import android.widget.TextView;
-import com.actionbarsherlock.view.Menu;
-import com.actionbarsherlock.view.MenuInflater;
 import github.daneren2005.dsub.R;
 import github.daneren2005.dsub.domain.PodcastChannel;
 import github.daneren2005.dsub.service.MusicService;
@@ -89,7 +89,7 @@ public class SelectPodcastsFragment extends SubsonicFragment implements AdapterV
 	}
 	
 	@Override
-	public boolean onOptionsItemSelected(com.actionbarsherlock.view.MenuItem item) {
+	public boolean onOptionsItemSelected(MenuItem item) {
 		if(super.onOptionsItemSelected(item)) {
 			return true;
 		}
diff --git a/src/github/daneren2005/dsub/fragments/SubsonicFragment.java b/src/github/daneren2005/dsub/fragments/SubsonicFragment.java
index 577d40d3..0d79ceda 100644
--- a/src/github/daneren2005/dsub/fragments/SubsonicFragment.java
+++ b/src/github/daneren2005/dsub/fragments/SubsonicFragment.java
@@ -29,6 +29,7 @@ import android.content.pm.ResolveInfo;
 import android.media.MediaMetadataRetriever;
 import android.net.Uri;
 import android.os.Bundle;
+import android.support.v4.app.Fragment;
 import android.util.Log;
 import android.view.ContextMenu;
 import android.view.MenuInflater;
@@ -38,7 +39,6 @@ import android.widget.Button;
 import android.widget.CheckBox;
 import android.widget.EditText;
 import android.widget.TextView;
-import com.actionbarsherlock.app.SherlockFragment;
 import github.daneren2005.dsub.R;
 import github.daneren2005.dsub.activity.DownloadActivity;
 import github.daneren2005.dsub.activity.HelpActivity;
@@ -74,7 +74,7 @@ import java.util.List;
 import java.util.Random;
 import java.util.concurrent.atomic.AtomicInteger;
 
-public class SubsonicFragment extends SherlockFragment {
+public class SubsonicFragment extends Fragment {
 	private static final String TAG = SubsonicFragment.class.getSimpleName();
 	private static final AtomicInteger nextGeneratedId = new AtomicInteger(1);
 	private static int TAG_INC = 10;
@@ -115,7 +115,7 @@ public class SubsonicFragment extends SherlockFragment {
 	}
 
 	@Override
-	public boolean onOptionsItemSelected(com.actionbarsherlock.view.MenuItem item) {
+	public boolean onOptionsItemSelected(MenuItem item) {
 		switch (item.getItemId()) {
 			case R.id.menu_refresh:
 				refresh(true);
-- 
cgit v1.2.3