norohind/vanilla
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

implement play_or_enqueue and enqueue_as_next for playlist-default-actions

Browse Source
This commit is contained in:
Adrian Ulrich 2016-05-14 08:54:40 +02:00
parent b90e0eb712
commit 99ac2cb98a
3 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
res/values/untranslatable.xml
View File

@ -76,14 +76,30 @@ THE SOFTWARE.
<item>@string/seek_10s_forward</item> <item>@string/seek_10s_forward</item>
<item>@string/seek_10s_backward</item> <item>@string/seek_10s_backward</item>
</string-array> </string-array>
<!-- START playlist action entries definition -->
<string-array name="default_playlist_action_entries"> <string-array name="default_playlist_action_entries">
<item>@string/play</item> <item>@string/play</item>
<item>@string/enqueue</item> <item>@string/enqueue</item>
<item>@string/last_used_action</item> <item>@string/last_used_action</item>
<item>@string/play_all</item> <item>@string/play_all</item>
<item>@string/enqueue_all</item> <item>@string/enqueue_all</item>
<item>@string/play_or_enqueue</item>
<item>@string/enqueue_as_next</item>
<item>@string/do_nothing</item> <item>@string/do_nothing</item>
</string-array> </string-array>
<string-array name="default_playlist_action_entry_values">
<item>0</item> <!-- play -->
<item>1</item> <!-- enqueue -->
<item>2</item> <!-- last_actin_used -->
<item>3</item> <!-- play_all -->
<item>4</item> <!-- enqueue_all -->
<item>7</item> <!-- play_or_enqueue -->
<item>8</item> <!-- enqueue_as_ next -->
<item>5</item> <!-- do_nothing -->
</string-array>
<!-- END playlist action entries definition -->
<string-array name="default_action_entries"> <string-array name="default_action_entries">
<item>@string/play</item> <item>@string/play</item>
<item>@string/enqueue</item> <item>@string/enqueue</item>

2
res/xml/preference_library.xml
View File

@ -40,7 +40,7 @@ THE SOFTWARE.
android:key="default_playlist_action" android:key="default_playlist_action"
android:title="@string/default_playlist_action_title" android:title="@string/default_playlist_action_title"
android:entries="@array/default_playlist_action_entries" android:entries="@array/default_playlist_action_entries"
android:entryValues="@array/entry_values" android:entryValues="@array/default_playlist_action_entry_values"
android:defaultValue="0" /> android:defaultValue="0" />
<PreferenceScreen <PreferenceScreen
android:title="@string/filebrowser_start" android:title="@string/filebrowser_start"

3
src/ch/blinkenlights/android/vanilla/PlaylistActivity.java
View File

@ -233,6 +233,9 @@ public class PlaylistActivity extends Activity
*/ */
private void performAction(int action, int position, long audioId) private void performAction(int action, int position, long audioId)
{ {
if (action == LibraryActivity.ACTION_PLAY_OR_ENQUEUE)
action = (PlaybackService.get(this).isPlaying() ? LibraryActivity.ACTION_ENQUEUE : LibraryActivity.ACTION_PLAY);
if (action == LibraryActivity.ACTION_LAST_USED) if (action == LibraryActivity.ACTION_LAST_USED)
action = mLastAction; action = mLastAction;