Merge branch 'album-actions' of https://github.com/arkon/Phonograph into arkon-album-actions

This commit is contained in:
Karim Abou Zeid 2017-07-24 19:40:50 +02:00
commit ad038732e6
4 changed files with 71 additions and 4 deletions

View file

@ -8,12 +8,27 @@
android:icon="@drawable/ic_shuffle_white_24dp"
android:title="@string/action_shuffle_album"
app:showAsAction="ifRoom" />
<item
<item
android:id="@+id/action_wiki"
android:title="@string/wiki"
app:showAsAction="never" />
<item
android:id="@+id/action_play_next"
android:title="@string/action_play_next"
app:showAsAction="never" />
<item
android:id="@+id/action_add_to_current_playing"
android:title="@string/action_add_to_playing_queue"
app:showAsAction="never" />
<item
android:id="@+id/action_add_to_playlist"
android:title="@string/action_add_to_playlist"
app:showAsAction="never" />
<item
android:id="@+id/action_go_to_artist"
android:title="@string/action_go_to_artist"
@ -24,6 +39,11 @@
android:title="@string/action_tag_editor"
app:showAsAction="never" />
<item
android:id="@+id/action_delete_from_device"
android:title="@string/action_delete_from_device"
app:showAsAction="never" />
<item
android:id="@+id/action_sleep_timer"
android:title="@string/action_sleep_timer"

View file

@ -9,6 +9,21 @@
android:title="@string/action_shuffle_artist"
app:showAsAction="ifRoom" />
<item
android:id="@+id/action_play_next"
android:title="@string/action_play_next"
app:showAsAction="never" />
<item
android:id="@+id/action_add_to_current_playing"
android:title="@string/action_add_to_playing_queue"
app:showAsAction="never" />
<item
android:id="@+id/action_add_to_playlist"
android:title="@string/action_add_to_playlist"
app:showAsAction="never" />
<item
android:id="@+id/action_biography"
android:title="@string/biography"