aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScott Jackson <daneren2005@gmail.com>2013-01-01 21:56:42 -0800
committerScott Jackson <daneren2005@gmail.com>2013-01-01 21:56:42 -0800
commit878f1d58b9800ef3c1bbf1af9970cbb2e36da8a8 (patch)
treed244ab15cfafaf77af4fadab673522e64f037ad7
parentdc8afd5dbc1606be50b694c876c85df6eb57992d (diff)
downloaddsub-878f1d58b9800ef3c1bbf1af9970cbb2e36da8a8.tar.gz
dsub-878f1d58b9800ef3c1bbf1af9970cbb2e36da8a8.tar.bz2
dsub-878f1d58b9800ef3c1bbf1af9970cbb2e36da8a8.zip
Added search actions to artist tab + playlist tab
-rw-r--r--subsonic-android/res/menu/select_artist.xml6
-rw-r--r--subsonic-android/res/menu/select_playlist.xml6
-rw-r--r--subsonic-android/src/github/daneren2005/dsub/activity/SelectArtistActivity.java3
-rw-r--r--subsonic-android/src/github/daneren2005/dsub/activity/SelectPlaylistActivity.java3
4 files changed, 18 insertions, 0 deletions
diff --git a/subsonic-android/res/menu/select_artist.xml b/subsonic-android/res/menu/select_artist.xml
index b5d0fd41..a7b988a5 100644
--- a/subsonic-android/res/menu/select_artist.xml
+++ b/subsonic-android/res/menu/select_artist.xml
@@ -11,6 +11,12 @@
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"
diff --git a/subsonic-android/res/menu/select_playlist.xml b/subsonic-android/res/menu/select_playlist.xml
index 2a4b6496..a68e6da0 100644
--- a/subsonic-android/res/menu/select_playlist.xml
+++ b/subsonic-android/res/menu/select_playlist.xml
@@ -5,6 +5,12 @@
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"
diff --git a/subsonic-android/src/github/daneren2005/dsub/activity/SelectArtistActivity.java b/subsonic-android/src/github/daneren2005/dsub/activity/SelectArtistActivity.java
index 59aec73c..225b70ee 100644
--- a/subsonic-android/src/github/daneren2005/dsub/activity/SelectArtistActivity.java
+++ b/subsonic-android/src/github/daneren2005/dsub/activity/SelectArtistActivity.java
@@ -108,6 +108,9 @@ public class SelectArtistActivity extends SubsonicTabActivity implements Adapter
case R.id.menu_help:
startActivity(new Intent(this, HelpActivity.class));
return true;
+ case R.id.menu_search:
+ onSearchRequested();
+ return true;
}
return false;
diff --git a/subsonic-android/src/github/daneren2005/dsub/activity/SelectPlaylistActivity.java b/subsonic-android/src/github/daneren2005/dsub/activity/SelectPlaylistActivity.java
index 70904ff7..90808a2e 100644
--- a/subsonic-android/src/github/daneren2005/dsub/activity/SelectPlaylistActivity.java
+++ b/subsonic-android/src/github/daneren2005/dsub/activity/SelectPlaylistActivity.java
@@ -85,6 +85,9 @@ public class SelectPlaylistActivity extends SubsonicTabActivity implements Adapt
case R.id.menu_help:
startActivity(new Intent(this, HelpActivity.class));
return true;
+ case R.id.menu_search:
+ onSearchRequested();
+ return true;
}
return false;