Merge branch 'master' into album-actions

This commit is contained in:
Eugene Cheung 2017-07-07 18:08:19 -04:00 committed by GitHub
commit 9e69136b1d
178 changed files with 628 additions and 514 deletions

View file

@ -4,10 +4,15 @@
tools:context="com.kabouzeid.gramophone.ui.activities.AlbumDetailActivity">
<item
android:icon="@drawable/ic_shuffle_white_24dp"
android:id="@+id/action_shuffle_album"
android:icon="@drawable/ic_shuffle_white_24dp"
android:title="@string/action_shuffle_album"
app:showAsAction="ifRoom" />
<item
android:id="@+id/action_wiki"
android:title="@string/wiki"
app:showAsAction="never" />
<item
android:id="@+id/action_play_next"