From 1b56144d2b18f7330c0d79e847b52ceafdf53de6 Mon Sep 17 00:00:00 2001
From: Scott Jackson <daneren2005@gmail.com>
Date: Sat, 8 Sep 2012 21:44:56 -0700
Subject: Revert "Revert "Started to work on move to ActionBarSherlock""

This reverts commit 00646f4aacd09c24d13170fe78bb144f1a98c4f6.
---
 subsonic-android/res/layout/main.xml            |  6 ----
 subsonic-android/res/layout/select_album.xml    |  2 --
 subsonic-android/res/layout/select_artist.xml   |  2 --
 subsonic-android/res/layout/select_playlist.xml |  2 --
 subsonic-android/res/menu/main.xml              | 38 +++++++++++++++----------
 subsonic-android/res/menu/select_album.xml      | 30 +++++++++++++++++++
 subsonic-android/res/menu/select_artist.xml     | 30 +++++++++++++++++++
 subsonic-android/res/menu/select_playlist.xml   | 24 ++++++++++++++++
 subsonic-android/res/values/strings.xml         |  4 +++
 9 files changed, 111 insertions(+), 27 deletions(-)
 create mode 100644 subsonic-android/res/menu/select_album.xml
 create mode 100644 subsonic-android/res/menu/select_artist.xml
 create mode 100644 subsonic-android/res/menu/select_playlist.xml

(limited to 'subsonic-android/res')

diff --git a/subsonic-android/res/layout/main.xml b/subsonic-android/res/layout/main.xml
index e151f319..56b013fe 100644
--- a/subsonic-android/res/layout/main.xml
+++ b/subsonic-android/res/layout/main.xml
@@ -4,12 +4,6 @@
               android:layout_width="fill_parent"
               android:layout_height="fill_parent">
 
-    <include 
-            layout="@layout/action_bar"
-            android:layout_width="fill_parent"
-            android:layout_height="45dp"
-            />
-
     <View
             android:layout_width="fill_parent"
             android:layout_height="1px"
diff --git a/subsonic-android/res/layout/select_album.xml b/subsonic-android/res/layout/select_album.xml
index 2c9a00aa..d5a4d0d1 100644
--- a/subsonic-android/res/layout/select_album.xml
+++ b/subsonic-android/res/layout/select_album.xml
@@ -4,8 +4,6 @@
               android:layout_width="fill_parent"
               android:layout_height="fill_parent">
 
-    <include layout="@layout/action_bar"/>
-
     <View
             android:layout_width="fill_parent"
             android:layout_height="1px"
diff --git a/subsonic-android/res/layout/select_artist.xml b/subsonic-android/res/layout/select_artist.xml
index 7cf6fc77..bebfdec4 100644
--- a/subsonic-android/res/layout/select_artist.xml
+++ b/subsonic-android/res/layout/select_artist.xml
@@ -4,8 +4,6 @@
               android:layout_width="fill_parent"
               android:layout_height="fill_parent">
 
-    <include layout="@layout/action_bar"/>
-
     <View
             android:layout_width="fill_parent"
             android:layout_height="1px"
diff --git a/subsonic-android/res/layout/select_playlist.xml b/subsonic-android/res/layout/select_playlist.xml
index c23e764b..2555687d 100644
--- a/subsonic-android/res/layout/select_playlist.xml
+++ b/subsonic-android/res/layout/select_playlist.xml
@@ -4,8 +4,6 @@
               android:layout_width="fill_parent"
               android:layout_height="fill_parent">
 
-    <include layout="@layout/action_bar"/>
-
     <View
             android:layout_width="fill_parent"
             android:layout_height="1px"
diff --git a/subsonic-android/res/menu/main.xml b/subsonic-android/res/menu/main.xml
index 27698f81..af6a5a7d 100644
--- a/subsonic-android/res/menu/main.xml
+++ b/subsonic-android/res/menu/main.xml
@@ -1,22 +1,30 @@
 <?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_shuffle"
+		android:icon="@drawable/action_shuffle"
+		android:title="@string/menu.shuffle"
+		android:showAsAction="ifRoom|withText"/>
 
-    <item 
-            android:id="@+id/menu_exit"
-            android:icon="@drawable/ic_menu_exit"
-            android:title="@string/menu.exit"
-            />
+	<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_settings"
+		android:icon="@drawable/ic_menu_settings"
+		android:title="@string/menu.settings"/>
 
-    <item 
-            android:id="@+id/menu_help"
-            android:icon="@drawable/ic_menu_help"
-            android:title="@string/menu.help"
-            />
+	<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
new file mode 100644
index 00000000..a5f2a3a9
--- /dev/null
+++ b/subsonic-android/res/menu/select_album.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">		
+	<item 
+		android:id="@+id/menu_play_all"
+		android:icon="@drawable/action_play_all"
+		android:title="@string/menu.play"
+		android:showAsAction="ifRoom|withText"/>
+	
+	<item 
+		android:id="@+id/menu_refresh"
+		android:icon="@drawable/action_refresh"
+		android:title="@string/menu.refresh"
+		android:showAsAction="ifRoom|withText"/>
+
+	<item 
+		android:id="@+id/menu_help"
+		android:icon="@drawable/action_help"
+		android:title="@string/menu.help"/>
+
+	<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/ic_menu_exit"
+		android:title="@string/menu.exit"/>
+
+</menu>
diff --git a/subsonic-android/res/menu/select_artist.xml b/subsonic-android/res/menu/select_artist.xml
new file mode 100644
index 00000000..42916622
--- /dev/null
+++ b/subsonic-android/res/menu/select_artist.xml
@@ -0,0 +1,30 @@
+<?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="ifRoom|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_help"
+		android:icon="@drawable/action_help"
+		android:title="@string/menu.help"/>
+
+	<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/ic_menu_exit"
+		android:title="@string/menu.exit"/>
+
+</menu>
diff --git a/subsonic-android/res/menu/select_playlist.xml b/subsonic-android/res/menu/select_playlist.xml
new file mode 100644
index 00000000..46d863cd
--- /dev/null
+++ b/subsonic-android/res/menu/select_playlist.xml
@@ -0,0 +1,24 @@
+<?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="ifRoom|withText"/>
+
+	<item 
+		android:id="@+id/menu_help"
+		android:icon="@drawable/action_help"
+		android:title="@string/menu.help"/>
+
+	<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/ic_menu_exit"
+		android:title="@string/menu.exit"/>
+
+</menu>
diff --git a/subsonic-android/res/values/strings.xml b/subsonic-android/res/values/strings.xml
index 7f9f6728..ea926fd9 100644
--- a/subsonic-android/res/values/strings.xml
+++ b/subsonic-android/res/values/strings.xml
@@ -33,6 +33,10 @@
     <string name="main.albums_highest">Top rated</string>
     <string name="main.albums_random">Random</string>
 
+	<string name="menu.search">Search</string>
+	<string name="menu.shuffle">Shuffle</string>
+	<string name="menu.refresh">Refresh</string>
+	<string name="menu.play">Play</string>
     <string name="menu.exit">Exit</string>
     <string name="menu.settings">Settings</string>
     <string name="menu.help">Help</string>
-- 
cgit v1.2.3