Removed Option Menu on post 3.x devices, added Settings and Help buttons instead of option menu, changed icon for server selection

res/layout/action_bar.xml

@@ -45,19 +45,43 @@
         a:id="@+id/action_button_3"
         a:layout_width="wrap_content"
         a:layout_height="match_parent"
+        a:layout_alignParentTop="true"
+        a:layout_toLeftOf="@+id/action_button_4"
+        a:background="@drawable/list_selector_holo_dark"
+        a:padding="5dp"
+        a:scaleType="center"
+        a:showAsAction="ifRoom|withText"
+        a:src="@drawable/ic_menu_help" />
+
+    <ImageButton
+        a:id="@+id/action_button_4"
+        a:layout_width="wrap_content"
+        a:layout_height="match_parent"
         a:layout_alignParentBottom="true"
         a:layout_alignParentRight="true"
         a:background="@drawable/list_selector_holo_dark"
         a:padding="5dp"
         a:scaleType="center"
         a:showAsAction="ifRoom|withText"
-        a:src="@drawable/ic_menu_moreoverflow" />
+        a:src="@drawable/ic_menu_settings" />
 
     <ImageButton
         a:id="@+id/action_button_1"
         a:layout_width="wrap_content"
         a:layout_height="match_parent"
         a:layout_alignParentTop="true"
+        a:layout_toLeftOf="@+id/action_button_2"
+        a:background="@drawable/list_selector_holo_dark"
+        a:padding="5dp"
+        a:scaleType="center"
+        a:showAsAction="ifRoom|withText"
+        a:src="@drawable/ic_menu_search" />
+
+    <ImageButton
+        a:id="@+id/action_button_2"
+        a:layout_width="wrap_content"
+        a:layout_height="match_parent"
+        a:layout_alignParentTop="true"
         a:layout_toLeftOf="@+id/action_button_3"
         a:background="@drawable/list_selector_holo_dark"
         a:padding="5dp"
@@ -65,16 +89,4 @@
         a:showAsAction="ifRoom|withText"
         a:src="@drawable/ic_menu_shuffle" />
 
-    <ImageButton
-        a:id="@+id/action_button_2"
-        a:layout_width="wrap_content"
-        a:layout_height="match_parent"
-        a:layout_alignParentTop="true"
-        a:layout_toLeftOf="@+id/action_button_1"
-        a:background="@drawable/list_selector_holo_dark"
-        a:padding="5dp"
-        a:scaleType="center"
-        a:showAsAction="ifRoom|withText"
-        a:src="@drawable/ic_menu_search" />
-
 </RelativeLayout>

res/layout/main_buttons.xml

@@ -15,10 +15,10 @@
             a:minHeight="?android:attr/listPreferredItemHeight">
 
         <ImageView
-                a:src="@drawable/ic_menu_compass"
-                a:layout_gravity="center_vertical"
             a:layout_width="wrap_content"
-                a:layout_height="wrap_content"/>
+            a:layout_height="wrap_content"
+            a:layout_gravity="center_vertical"
+            a:src="@drawable/ic_menu_select_artist_folder" />
 
         <LinearLayout
                 a:orientation="vertical"

src/net/sourceforge/subsonic/androidapp/activity/MainActivity.java

@@ -36,6 +36,7 @@ import android.view.ContextMenu;
 import android.view.LayoutInflater;
 import android.view.MenuItem;
 import android.view.View;
+import android.view.Window;
 import android.widget.AdapterView;
 import android.widget.ImageButton;
 import android.widget.ListView;
@@ -117,20 +118,8 @@ public class MainActivity extends SubsonicTabActivity {
         // Title: Subsonic
         setTitle(R.string.common_appname);
 
-        // Button 1: shuffle
+        // Button 1: search
-        ImageButton actionShuffleButton = (ImageButton)findViewById(R.id.action_button_1);
+        ImageButton actionSearchButton = (ImageButton)findViewById(R.id.action_button_1);
-        actionShuffleButton.setImageResource(R.drawable.ic_menu_shuffle);
-        actionShuffleButton.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                Intent intent = new Intent(MainActivity.this, DownloadActivity.class);
-                intent.putExtra(Constants.INTENT_EXTRA_NAME_SHUFFLE, true);
-                Util.startActivityWithoutTransition(MainActivity.this, intent);
-            }
-        });
-
-        // Button 2: search
-        ImageButton actionSearchButton = (ImageButton)findViewById(R.id.action_button_2);
         actionSearchButton.setImageResource(R.drawable.ic_menu_search);
         actionSearchButton.setOnClickListener(new View.OnClickListener() {
             @Override
@@ -141,13 +130,35 @@ public class MainActivity extends SubsonicTabActivity {
             }
         });
         
-        // Button 3: menu
+        // Button 2: shuffle
-        ImageButton actionMenuButton = (ImageButton)findViewById(R.id.action_button_3);
+        ImageButton actionShuffleButton = (ImageButton)findViewById(R.id.action_button_2);
-        actionMenuButton.setImageResource(R.drawable.ic_menu_moreoverflow);
+        actionShuffleButton.setImageResource(R.drawable.ic_menu_shuffle);
-        actionMenuButton.setOnClickListener(new View.OnClickListener() {
+        actionShuffleButton.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-            	openOptionsMenu(); 
+                Intent intent = new Intent(MainActivity.this, DownloadActivity.class);
+                intent.putExtra(Constants.INTENT_EXTRA_NAME_SHUFFLE, true);
+                Util.startActivityWithoutTransition(MainActivity.this, intent);
+            }
+        });
+
+        // Button 3: help
+        ImageButton actionHelpButton = (ImageButton)findViewById(R.id.action_button_3);
+        actionHelpButton.setImageResource(R.drawable.ic_menu_help);
+        actionHelpButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+            	startActivity(new Intent(MainActivity.this, HelpActivity.class));
+            }
+        });
+
+        // Button 4: settings
+        ImageButton actionSettingsButton = (ImageButton)findViewById(R.id.action_button_4);
+        actionSettingsButton.setImageResource(R.drawable.ic_menu_settings);
+        actionSettingsButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+            	startActivity(new Intent(MainActivity.this, SettingsActivity.class));
             }
         });
         

src/net/sourceforge/subsonic/androidapp/activity/SearchActivity.java

@@ -148,6 +148,26 @@ public class SearchActivity extends SubsonicTabActivity {
             }
         });
         
+        // Button 3: help
+        ImageButton actionHelpButton = (ImageButton)findViewById(R.id.action_button_3);
+        actionHelpButton.setImageResource(R.drawable.ic_menu_help);
+        actionHelpButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+            	startActivity(new Intent(SearchActivity.this, HelpActivity.class));
+            }
+        });
+
+        // Button 4: settings
+        ImageButton actionSettingsButton = (ImageButton)findViewById(R.id.action_button_4);
+        actionSettingsButton.setImageResource(R.drawable.ic_menu_settings);
+        actionSettingsButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+            	startActivity(new Intent(SearchActivity.this, SettingsActivity.class));
+            }
+        });
+
         onNewIntent(getIntent());
     }
 

src/net/sourceforge/subsonic/androidapp/activity/SelectAlbumActivity.java

@@ -190,6 +190,26 @@ public class SelectAlbumActivity extends SubsonicTabActivity {
                 refresh();
             }
         });
+        
+        // Button 3: help
+        ImageButton actionHelpButton = (ImageButton)findViewById(R.id.action_button_3);
+        actionHelpButton.setImageResource(R.drawable.ic_menu_help);
+        actionHelpButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+            	startActivity(new Intent(SelectAlbumActivity.this, HelpActivity.class));
+            }
+        });
+
+        // Button 4: settings
+        ImageButton actionSettingsButton = (ImageButton)findViewById(R.id.action_button_4);
+        actionSettingsButton.setImageResource(R.drawable.ic_menu_settings);
+        actionSettingsButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+            	startActivity(new Intent(SelectAlbumActivity.this, SettingsActivity.class));
+            }
+        });
     }
 
     private void playAll() {

src/net/sourceforge/subsonic/androidapp/activity/SelectArtistActivity.java

@@ -98,6 +98,26 @@ public class SelectArtistActivity extends SubsonicTabActivity implements Adapter
             }
         });
         
+        // Button 3: help
+        ImageButton actionHelpButton = (ImageButton)findViewById(R.id.action_button_3);
+        actionHelpButton.setImageResource(R.drawable.ic_menu_help);
+        actionHelpButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+            	startActivity(new Intent(SelectArtistActivity.this, HelpActivity.class));
+            }
+        });
+
+        // Button 4: settings
+        ImageButton actionSettingsButton = (ImageButton)findViewById(R.id.action_button_4);
+        actionSettingsButton.setImageResource(R.drawable.ic_menu_settings);
+        actionSettingsButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+            	startActivity(new Intent(SelectArtistActivity.this, SettingsActivity.class));
+            }
+        });
+
         musicFolders = null;
         load();
     }

src/net/sourceforge/subsonic/androidapp/activity/SelectPlaylistActivity.java

@@ -74,6 +74,26 @@ public class SelectPlaylistActivity extends SubsonicTabActivity implements Adapt
 			}
 		});
 		
+        // Button 3: help
+        ImageButton actionHelpButton = (ImageButton)findViewById(R.id.action_button_3);
+        actionHelpButton.setImageResource(R.drawable.ic_menu_help);
+        actionHelpButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+            	startActivity(new Intent(SelectPlaylistActivity.this, HelpActivity.class));
+            }
+        });
+
+        // Button 4: settings
+        ImageButton actionSettingsButton = (ImageButton)findViewById(R.id.action_button_4);
+        actionSettingsButton.setImageResource(R.drawable.ic_menu_settings);
+        actionSettingsButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+            	startActivity(new Intent(SelectPlaylistActivity.this, SettingsActivity.class));
+            }
+        });
+
         load();
     }
 

src/net/sourceforge/subsonic/androidapp/activity/SubsonicTabActivity.java

@@ -151,8 +151,10 @@ public class SubsonicTabActivity extends Activity {
 
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
+    	if (android.os.Build.VERSION.SDK_INT < 11) {
     		MenuInflater inflater = getMenuInflater();
     		inflater.inflate(R.menu.main, menu);
+    	}
         return true;
     }