tenkuma/jamfish
tenkuma/jamfish
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into album-actions

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

7
app/src/main/res/menu/menu_album_detail.xml
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"

2
app/src/main/res/menu/menu_artist_detail.xml
View file

@ -38,7 +38,7 @@
android:id="@+id/action_colored_footers"
android:checkable="true"
android:title="@string/colored_footers"
app:showAsAction="never"/>
app:showAsAction="never" />
<item
android:id="@+id/action_sleep_timer"

4
app/src/main/res/menu/menu_search.xml
View file

@ -5,6 +5,6 @@
android:id="@+id/search"
android:icon="@drawable/ic_search_white_24dp"
android:title="@string/action_search"
app:showAsAction="ifRoom|collapseActionView"
app:actionViewClass="android.support.v7.widget.SearchView" />
app:actionViewClass="android.support.v7.widget.SearchView"
app:showAsAction="ifRoom|collapseActionView" />
</menu>