From 00646f4aacd09c24d13170fe78bb144f1a98c4f6 Mon Sep 17 00:00:00 2001
From: Scott Jackson <daneren2005@gmail.com>
Date: Sat, 8 Sep 2012 17:27:12 -0700
Subject: Revert "Started to work on move to ActionBarSherlock"

This reverts commit 9398f1b61396bb8c8859a6c1367a09cafcc2cd03.
---
 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, 27 insertions(+), 111 deletions(-)
 delete mode 100644 subsonic-android/res/menu/select_album.xml
 delete mode 100644 subsonic-android/res/menu/select_artist.xml
 delete 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 56b013fe..e151f319 100644
--- a/subsonic-android/res/layout/main.xml
+++ b/subsonic-android/res/layout/main.xml
@@ -4,6 +4,12 @@
               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 d5a4d0d1..2c9a00aa 100644
--- a/subsonic-android/res/layout/select_album.xml
+++ b/subsonic-android/res/layout/select_album.xml
@@ -4,6 +4,8 @@
               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 bebfdec4..7cf6fc77 100644
--- a/subsonic-android/res/layout/select_artist.xml
+++ b/subsonic-android/res/layout/select_artist.xml
@@ -4,6 +4,8 @@
               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 2555687d..c23e764b 100644
--- a/subsonic-android/res/layout/select_playlist.xml
+++ b/subsonic-android/res/layout/select_playlist.xml
@@ -4,6 +4,8 @@
               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 af6a5a7d..27698f81 100644
--- a/subsonic-android/res/menu/main.xml
+++ b/subsonic-android/res/menu/main.xml
@@ -1,30 +1,22 @@
 <?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_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"
+            />
 
-	<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_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"
+            />
 
 </menu>
diff --git a/subsonic-android/res/menu/select_album.xml b/subsonic-android/res/menu/select_album.xml
deleted file mode 100644
index a5f2a3a9..00000000
--- a/subsonic-android/res/menu/select_album.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_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
deleted file mode 100644
index 42916622..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="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
deleted file mode 100644
index 46d863cd..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="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 ea926fd9..7f9f6728 100644
--- a/subsonic-android/res/values/strings.xml
+++ b/subsonic-android/res/values/strings.xml
@@ -33,10 +33,6 @@
     <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