From 4801e6422a59e7ae254b9efb2dd348bc39092bf6 Mon Sep 17 00:00:00 2001 From: Karim Abou Zeid Date: Sun, 26 Apr 2015 16:10:41 +0200 Subject: [PATCH] Hotfix: compiler error --- .../gramophone/ui/activities/AlbumDetailActivity.java | 3 --- .../gramophone/ui/activities/ArtistDetailActivity.java | 3 --- .../gramophone/ui/activities/MusicControllerActivity.java | 4 ---- .../gramophone/ui/activities/PlaylistDetailActivity.java | 2 -- .../kabouzeid/gramophone/ui/activities/SearchActivity.java | 6 ------ 5 files changed, 18 deletions(-) diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/AlbumDetailActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/AlbumDetailActivity.java index 230de915..26c0bafa 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/AlbumDetailActivity.java +++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/AlbumDetailActivity.java @@ -326,9 +326,6 @@ public class AlbumDetailActivity extends AbsFabActivity implements PaletteColorH case R.id.action_playing_queue: NavigationUtil.openPlayingQueueDialog(this); return true; - case R.id.action_settings: - startActivity(new Intent(this, SettingsActivity.class)); - return true; case R.id.action_current_playing: NavigationUtil.openCurrentPlayingIfPossible(this, getSharedViewsWithFab(null)); return true; diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/ArtistDetailActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/ArtistDetailActivity.java index c3fec718..8f6b893f 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/ArtistDetailActivity.java +++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/ArtistDetailActivity.java @@ -388,9 +388,6 @@ public class ArtistDetailActivity extends AbsFabActivity implements PaletteColor Toast.makeText(ArtistDetailActivity.this, getResources().getString(R.string.updating), Toast.LENGTH_SHORT).show(); setUpArtistImageAndApplyPalette(true); return true; - case R.id.action_settings: - Toast.makeText(this, "This feature is not available yet", Toast.LENGTH_SHORT).show(); - return true; case R.id.action_current_playing: NavigationUtil.openCurrentPlayingIfPossible(this, getSharedViewsWithFab(null)); return true; diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/MusicControllerActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/MusicControllerActivity.java index 6325c9c8..b0cb94d4 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/MusicControllerActivity.java +++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/MusicControllerActivity.java @@ -19,7 +19,6 @@ import android.widget.ImageView; import android.widget.RelativeLayout; import android.widget.SeekBar; import android.widget.TextView; -import android.widget.Toast; import com.afollestad.materialdialogs.ThemeSingleton; import com.afollestad.materialdialogs.util.DialogUtils; @@ -483,9 +482,6 @@ public class MusicControllerActivity extends AbsFabActivity { case R.id.action_shuffle_all: MusicPlayerRemote.shuffleAllSongs(this); return true; - case R.id.action_settings: - Toast.makeText(this, "This feature is not available yet", Toast.LENGTH_SHORT).show(); - return true; case R.id.action_add_to_playlist: AddToPlaylistDialog.create(song).show(getSupportFragmentManager(), "ADD_PLAYLIST"); return true; diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/PlaylistDetailActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/PlaylistDetailActivity.java index 9e7894cb..7eacb053 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/PlaylistDetailActivity.java +++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/PlaylistDetailActivity.java @@ -114,8 +114,6 @@ public class PlaylistDetailActivity extends AbsFabActivity { case android.R.id.home: super.onBackPressed(); return true; - case R.id.action_settings: - return true; case R.id.action_current_playing: NavigationUtil.openCurrentPlayingIfPossible(this, getSharedViewsWithFab(null)); return true; diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/SearchActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/SearchActivity.java index 46734515..da7a2d5e 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/SearchActivity.java +++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/SearchActivity.java @@ -145,12 +145,6 @@ public class SearchActivity extends AbsBaseActivity { return true; } - @Override - public boolean onOptionsItemSelected(MenuItem item) { - int id = item.getItemId(); - return id == R.id.action_settings || super.onOptionsItemSelected(item); - } - private void search(String query) { if (searchAdapter != null) searchAdapter.search(query);