Skip to content

Commit

Permalink
Album add to playlist and queue working
Browse files Browse the repository at this point in the history
(cherry picked from commit 099aaa7)
  • Loading branch information
EthanArmbrust committed Jan 8, 2018
1 parent db31468 commit 94a6b60
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 0 deletions.
4 changes: 4 additions & 0 deletions app/src/main/java/com/naman14/timber/MusicPlayer.java
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@

package com.naman14.timber;

import android.Manifest;
import android.app.Activity;
import android.content.ComponentName;
import android.content.ContentResolver;
Expand All @@ -24,6 +25,7 @@
import android.content.ContextWrapper;
import android.content.Intent;
import android.content.ServiceConnection;
import android.content.pm.PackageManager;
import android.database.Cursor;
import android.net.Uri;
import android.os.IBinder;
Expand All @@ -39,6 +41,8 @@
import java.util.Arrays;
import java.util.WeakHashMap;

import static android.support.v4.content.PermissionChecker.checkSelfPermission;

public class MusicPlayer {

private static final WeakHashMap<Context, ServiceBinder> mConnectionMap;
Expand Down
6 changes: 6 additions & 0 deletions app/src/main/res/menu/album_detail.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,12 @@
<item
android:id="@+id/menu_go_to_artist"
android:title="@string/go_to_artist" />
<item
android:id="@+id/popup_song_addto_queue"
android:title="@string/add_to_queue" />
<item
android:id="@+id/popup_song_addto_playlist"
android:title="@string/add_to_playlist" />
<item
android:id="@+id/menu_sort_by"
android:showAsAction="never"
Expand Down
9 changes: 9 additions & 0 deletions app/src/main/res/menu/artist_detail.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android" >
<item
android:id="@+id/popup_song_addto_queue"
android:title="@string/add_to_queue" />
<item
android:id="@+id/popup_song_addto_playlist"
android:title="@string/add_to_playlist"/>
</menu>

0 comments on commit 94a6b60

Please sign in to comment.