Removed dedicated search tab

2 files changed, 0 insertions, 22 deletions

diff --git a/subsonic-android/res/layout/button_bar.xml b/subsonic-android/res/layout/button_bar.xml
index 59b18437..1d576775 100644
--- a/subsonic-android/res/layout/button_bar.xml
+++ b/subsonic-android/res/layout/button_bar.xml
@@ -32,14 +32,6 @@
                      android:layout_width="0dp"

                      android:layout_height="wrap_content"/>

 

-        <ImageButton android:id="@+id/button_bar_search"

-                     android:src="@drawable/menu_search"

-                     android:contentDescription="@string/button_bar.search"

-                     android:background="@drawable/menubar_button"

-                     android:layout_weight="1"

-                     android:layout_width="0dp"

-                     android:layout_height="wrap_content"/>

-

         <ImageButton android:id="@+id/button_bar_playlists"

                      android:src="@drawable/menu_playlists"

                      android:contentDescription="@string/button_bar.playlists"

diff --git a/subsonic-android/src/github/daneren2005/subphonic/activity/SubsonicTabActivity.java b/subsonic-android/src/github/daneren2005/subphonic/activity/SubsonicTabActivity.java
index 81145264..f682dba8 100644
--- a/subsonic-android/src/github/daneren2005/subphonic/activity/SubsonicTabActivity.java
+++ b/subsonic-android/src/github/daneren2005/subphonic/activity/SubsonicTabActivity.java
@@ -62,7 +62,6 @@ public class SubsonicTabActivity extends Activity {
     private boolean destroyed;
     private View homeButton;
     private View musicButton;
-    private View searchButton;
     private View playlistButton;
     private View nowPlayingButton;
 
@@ -100,16 +99,6 @@ public class SubsonicTabActivity extends Activity {
             }
         });
 
-        searchButton = findViewById(R.id.button_bar_search);
-        searchButton.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                Intent intent = new Intent(SubsonicTabActivity.this, SearchActivity.class);
-                intent.putExtra(Constants.INTENT_EXTRA_REQUEST_SEARCH, true);
-                Util.startActivityWithoutTransition(SubsonicTabActivity.this, intent);
-            }
-        });
-
         playlistButton = findViewById(R.id.button_bar_playlists);
         playlistButton.setOnClickListener(new View.OnClickListener() {
             @Override
@@ -132,8 +121,6 @@ public class SubsonicTabActivity extends Activity {
             homeButton.setEnabled(false);
         } else if (this instanceof SelectAlbumActivity || this instanceof SelectArtistActivity) {
             musicButton.setEnabled(false);
-        } else if (this instanceof SearchActivity) {
-            searchButton.setEnabled(false);
         } else if (this instanceof SelectPlaylistActivity) {
             playlistButton.setEnabled(false);
         } else if (this instanceof DownloadActivity || this instanceof LyricsActivity) {
@@ -239,7 +226,6 @@ public class SubsonicTabActivity extends Activity {
 
     private void updateButtonVisibility() {
         int visibility = Util.isOffline(this) ? View.GONE : View.VISIBLE;
-        searchButton.setVisibility(visibility);
     }
 
     public void setProgressVisible(boolean visible) {