Merge branch 'master' into feature/duck-on-notification
This commit is contained in:
commit
eca9d4a00a
25 files changed
+70
-114
No files matched your search
@@ -23,6 +23,8 @@ THE SOFTWARE.
|
||||
<ch.blinkenlights.android.vanilla.ActionBarControls
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:background="?android:attr/selectableItemBackground"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="fill_parent"
|
||||
android:clickable="true">
|
||||
<ImageView
|
||||
android:id="@+id/cover"
|
||||
|
||||
@@ -52,7 +52,6 @@ THE SOFTWARE.
|
||||
/>
|
||||
|
||||
<ListView
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:id="@+id/list"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
|
||||
@@ -38,6 +38,7 @@ THE SOFTWARE.
|
||||
android:layout_gravity="bottom|left">
|
||||
<LinearLayout
|
||||
android:id="@+id/limiter_layout"
|
||||
android:orientation="horizontal"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="fill_parent" />
|
||||
</HorizontalScrollView>
|
||||
|
||||
@@ -1,70 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!--
|
||||
Copyright (C) 2010, 2011 Christopher Eby <kreed@kreed.org>
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
of this software and associated documentation files (the "Software"), to deal
|
||||
in the Software without restriction, including without limitation the rights
|
||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
copies of the Software, and to permit persons to whom the Software is
|
||||
furnished to do so, subject to the following conditions:
|
||||
|
||||
The above copyright notice and this permission notice shall be included in
|
||||
all copies or substantial portions of the Software.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||
THE SOFTWARE.
|
||||
-->
|
||||
<LinearLayout
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:id="@+id/controls"
|
||||
android:background="@drawable/music_bottom_playback_bg"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="80dip">
|
||||
<TextView
|
||||
android:id="@+id/empty_queue"
|
||||
android:gravity="center"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="fill_parent"
|
||||
android:text="@string/empty_queue"
|
||||
android:visibility="gone" />
|
||||
<ImageView
|
||||
android:id="@+id/cover"
|
||||
android:scaleType="fitCenter"
|
||||
android:layout_width="80dip"
|
||||
android:layout_height="fill_parent"
|
||||
android:layout_gravity="center"
|
||||
android:contentDescription="@string/cover_art" />
|
||||
<LinearLayout
|
||||
android:layout_height="fill_parent"
|
||||
android:layout_width="fill_parent"
|
||||
android:orientation="vertical">
|
||||
<TextView
|
||||
android:id="@+id/title"
|
||||
android:textSize="14sp"
|
||||
android:singleLine="true"
|
||||
android:ellipsize="marquee"
|
||||
android:gravity="center"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content" />
|
||||
<TextView
|
||||
android:id="@+id/artist"
|
||||
android:textSize="12sp"
|
||||
android:singleLine="true"
|
||||
android:ellipsize="marquee"
|
||||
android:gravity="center"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content" />
|
||||
<LinearLayout
|
||||
android:orientation="horizontal"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="fill_parent">
|
||||
<include layout="@layout/controls" />
|
||||
</LinearLayout>
|
||||
</LinearLayout>
|
||||
</LinearLayout>
|
||||
@@ -22,6 +22,8 @@ THE SOFTWARE.
|
||||
-->
|
||||
<LinearLayout
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="horizontal">
|
||||
<ch.blinkenlights.android.vanilla.LazyCoverView
|
||||
android:id="@+id/cover"
|
||||
|
||||
@@ -193,7 +193,7 @@
|
||||
<string name="double_tap_title">Double Tap Widget</string>
|
||||
<string name="double_tap_summary">Dvojité ťuknutí na 1x1 widget otevře přehrávač. Zpoždění odpovědi widgetu na akci je 400ms.</string>
|
||||
<string name="scrobble_title">Použít ScrobbleDroid API</string>
|
||||
<string name="scrobble_summary">Informovat Last.FM přes ScrobbleDroid nebo jiný Last.FM scrobbler</string>
|
||||
<string name="scrobble_summary">Informovat Last.fm přes ScrobbleDroid nebo jiný Last.fm scrobbler</string>
|
||||
<string name="stock_broadcast_title">Emulovat výchozí upozornění</string>
|
||||
<string name="stock_broadcast_summary">Posílat upozornění jako to dělá výchozí přehrávač hudby, pro zajištění funkčnosti modulů, ovládání uzamčené obrazovky, atd. poskytovaných třetími stranami.</string>
|
||||
<string name="media_scan">Obnovit sbírku</string>
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
<string name="stop_current_song">Nach aktuellem Titel stoppen</string>
|
||||
<string name="random">Zufallswiedergabe</string>
|
||||
<string name="random_enabling">Zufallswiedergabe aktiviert</string>
|
||||
<string name="song_load_failed">Titel %s konnte nicht geladen werden. Er ist möglicherweise beschädigt oder fehlt.</string>
|
||||
<string name="song_load_failed">Titel %s konnte nicht geladen werden. Möglicherweise ist er beschädigt oder fehlt.</string>
|
||||
<string name="queue_cleared">Warteschlange geleert.</string>
|
||||
<string name="cover_art">Cover</string>
|
||||
<string name="close_notification">Benachrichtigung beim Schließen</string>
|
||||
@@ -72,9 +72,9 @@
|
||||
<item quantity="other">%d Titel gelöscht.</item>
|
||||
</plurals>
|
||||
<string name="delete_file_failed">Löschen von %s fehlgeschlagen.</string>
|
||||
<string name="deleted_item">\"%s\" wurde gelöscht.</string>
|
||||
<string name="delete_item">\"%s\" löschen?</string>
|
||||
<string name="delete_file">Datei \"%s\" löschen?</string>
|
||||
<string name="deleted_item">„%s“ wurde gelöscht.</string>
|
||||
<string name="delete_item">„%s“ löschen?</string>
|
||||
<string name="delete_file">Datei „%s“ löschen?</string>
|
||||
<string name="artists">Interpreten</string>
|
||||
<string name="albums">Alben</string>
|
||||
<string name="songs">Titel</string>
|
||||
@@ -138,7 +138,7 @@
|
||||
<string name="replaygain_untagged_debump_title">Titel ohne Replay Gain-Information</string>
|
||||
<string name="replaygain_untagged_debump_summary">Lautstärke senken um: </string>
|
||||
<string name="readahead">Datei vorauslesen</string>
|
||||
<string name="readahead_summary">Liest den momentan abgespielten Titel im Voraus ein (löst Probleme mit langsamen SD-Karten).</string>
|
||||
<string name="readahead_summary">Aktuell abgespielten Titel im Voraus einlesen (löst Probleme mit langsamen SD-Karten)</string>
|
||||
<string name="equalizer">Equalizer</string>
|
||||
<string name="cycle_continuous_shuffling">Dauerzufallswiedergabe</string>
|
||||
<string name="cycle_continuous_shuffling_summary">Titel werden fortlaufend neu durchgemischt</string>
|
||||
@@ -148,7 +148,7 @@
|
||||
<string name="notification_invert_color_title">Farbe der Benachrichtigung umkehren</string>
|
||||
<string name="notification_invert_color_summary">Text weiß statt schwarz anzeigen</string>
|
||||
<string name="notification_nag">Auffällige Benachrichtigung</string>
|
||||
<string name="notification_nag_summary">Titelwechsel als \"Heads-Up\"-Benachrichtigung anzeigen</string>
|
||||
<string name="notification_nag_summary">Titelwechsel als „Heads-Up“-Benachrichtigung anzeigen</string>
|
||||
<string name="playback_screen">Wiedergabeansicht</string>
|
||||
<string name="playback_on_startup_title">Beim Start öffnen</string>
|
||||
<string name="playback_on_startup_summary">Wiedergabeansicht beim Start öffnen</string>
|
||||
@@ -164,29 +164,29 @@
|
||||
<string name="default_playlist_action_title">Wiedergabelisten-Standardaktion</string>
|
||||
<string name="accelerometer_shake">Schütteln</string>
|
||||
<string name="enable_shake_title">Schütteln aktivieren</string>
|
||||
<string name="enable_shake_summary">Ist nur während abgespielter Musik aktiv. Funktioniert auf einigen Geräten nicht bei ausgeschaltetem Bildschirm.</string>
|
||||
<string name="enable_shake_summary">Nur während abgespielter Musik aktiv. Funktioniert auf einigen Geräten nicht bei ausgeschaltetem Bildschirm.</string>
|
||||
<string name="shake_action_title">Aktion beim Schütteln</string>
|
||||
<string name="shake_threshold_title">Schwellwert beim Schütteln</string>
|
||||
<string name="misc_features">Sonstige Funktionen</string>
|
||||
<string name="use_dark_theme_title">Dunkles Design verwenden</string>
|
||||
<string name="use_dark_theme_summary">Aktiviert das dunkle \"Material\"-Design</string>
|
||||
<string name="use_dark_theme_summary">Aktiviert das dunkle „Material“-Design</string>
|
||||
<string name="disable_lockscreen_title">Bildschirmsperre deaktivieren</string>
|
||||
<string name="disable_lockscreen_summary">Bildschirmsperre verhindern, wenn Bibliothek- oder Wiedergabeansicht aktiv</string>
|
||||
<string name="disable_lockscreen_summary">Bildschirmsperre verhindern, wenn Bibliotheks- oder Wiedergabeansicht aktiv</string>
|
||||
<string name="use_idle_timeout_title">Inaktivitätszeitabschaltung aktivieren</string>
|
||||
<string name="use_idle_timeout_summary">Falls aktiviert, wird die Wiedergabe nach der angegebenen Inaktivität beendet</string>
|
||||
<string name="idle_timeout_title">Inaktivitätszeitabschaltung</string>
|
||||
<string name="disable_cover_art_title">Cover-Darstellung deaktivieren</string>
|
||||
<string name="disable_cover_art_summary">Jegliches Laden von Albumcovern vermeiden</string>
|
||||
<string name="coverloader_android_title">Albumcover von Android verwenden</string>
|
||||
<string name="coverloader_android_summary">Androids interne Mediendatenbank verwenden, um Albumcover zu laden</string>
|
||||
<string name="coverloader_android_summary">Androids interne Mediendatenbank für Albumcover verwenden</string>
|
||||
<string name="coverloader_vanilla_title">Cover aus Ordner laden</string>
|
||||
<string name="coverloader_vanilla_summary">Nach Dateien mit den Namen cover.jpg, album.jpg oder artwork.jpg suchen und diese als Albumcover anzeigen</string>
|
||||
<string name="coverloader_shadow_title">Cover aus verstecktem Ordner laden</string>
|
||||
<string name="coverloader_shadow_summary">Albumcover von \"/sdcard/Music/.vanilla/ARTIST/ALBUM.jpg\" laden, falls möglich.</string>
|
||||
<string name="coverloader_shadow_summary">Albumcover von „/sdcard/Music/.vanilla/ARTIST/ALBUM.jpg“ laden, falls möglich.</string>
|
||||
<string name="double_tap_title">Widget-Doppelantippen</string>
|
||||
<string name="double_tap_summary">Doppeltes Antippen des 1x1-Widgets öffnet die Wiedergabeansicht. Verursacht eine Verzögerung von 400 ms bevor das Widget auf Aktionen reagiert.</string>
|
||||
<string name="double_tap_summary">Doppeltes Antippen des 1x1-Widgets öffnet die Wiedergabeansicht. Verursacht eine Verzögerung von 400 ms, bevor das Widget auf Aktionen reagiert.</string>
|
||||
<string name="scrobble_title">ScrobbleDroid-API verwenden</string>
|
||||
<string name="scrobble_summary">Zu Last.FM scrobbeln mithilfe von ScrobbleDroid oder Simple Last.FM Scrobbler</string>
|
||||
<string name="scrobble_summary">Zu Last.fm scrobbeln mithilfe von ScrobbleDroid oder Simple Last.fm Scrobbler</string>
|
||||
<string name="stock_broadcast_title">Standardplayer-Benachrichtigungen emulieren</string>
|
||||
<string name="stock_broadcast_summary">Benachrichtigungen senden, welche den normalen Standardplayer emulieren, um mit externen Bildschirmsperre-Steuerelementen, Widgets etc. kompatibel zu sein.</string>
|
||||
<string name="media_scan">Bibliothek aktualisieren</string>
|
||||
@@ -195,7 +195,7 @@
|
||||
<string name="finished_scanning">Durchsuchen abgeschlossen. Für erneute Suche antippen.</string>
|
||||
<string name="about">Über</string>
|
||||
<string name="tabs">Tab-Reihenfolge</string>
|
||||
<string name="customize_tab_order">Anpassen der Reihenfolge und Sichtbarkeit der Bibliothek-Tabs</string>
|
||||
<string name="customize_tab_order">Reihenfolge und Sichtbarkeit der Bibliotheks-Tabs anpassen</string>
|
||||
<string name="restore_default">Standard wiederherstellen</string>
|
||||
<!--The following are for the list preferences-->
|
||||
<string name="last_used_action">Zuletzt verwendete Aktion</string>
|
||||
|
||||
@@ -182,7 +182,7 @@
|
||||
<string name="double_tap_title">Διπλό χτύπημα γραφικου στοιχείου</string>
|
||||
<string name="double_tap_summary">Διπλό χτύπημα στο γραφικό στοιχείο 1x1 θα ανοίξει το πρόγραμμα αναπαραγωγής. Διατρέχει 400μδευ καθυστέρηση πριν το γραφικό στοιχείο ανταποκριθει στις ενέργειες.</string>
|
||||
<string name="scrobble_title">Χρήση του ScrobbleDroid API</string>
|
||||
<string name="scrobble_summary">Scrobble στο Last.FM μέσω ScrobbleDroid ή Απλό Last.FM Scrobbler</string>
|
||||
<string name="scrobble_summary">Scrobble στο Last.fm μέσω ScrobbleDroid ή Απλό Last.fm Scrobbler</string>
|
||||
<string name="stock_broadcast_title">Εξομοίωση εκπομπων απο την μνημη</string>
|
||||
<string name="stock_broadcast_summary">Αποστολή εκπομπων απο την μνημη για να συνεργαστουν με τους ελέγχους lockscreen 3τρίτου κόμματος, γραφικά στοιχεία, κ.λπ.</string>
|
||||
<string name="media_scan">Ανανέωση βιβλιοθήκης</string>
|
||||
|
||||
@@ -186,7 +186,7 @@
|
||||
<string name="double_tap_title">Widgetin kaksoisnapautus</string>
|
||||
<string name="double_tap_summary">1x1-widgetin kaksoisnapautus avaa soittimen. Asettaa 400 ms viiveen, ennen kuin widget vastaa toimintoon.</string>
|
||||
<string name="scrobble_title">Käytä ScrobbleDroid API:a</string>
|
||||
<string name="scrobble_summary">Lähetä scrobblaustiedot Last.FM:ään ScrobbleDroidin tai Simple Last.FM Scrobblerin kautta</string>
|
||||
<string name="scrobble_summary">Lähetä toistotiedot Last.fm:ään käyttäen ScrobbleDroidia tai Simple Last.fm Scrobbleria</string>
|
||||
<string name="stock_broadcast_title">Emuloi vakioita yleislähetyksiä</string>
|
||||
<string name="stock_broadcast_summary">Lähetä vakiosoitinta emuloivia yleislähetyksiä. Auttaa kolmansien osapuolten lukitusnäyttöohjainten, widgettien yms. toimivuuden kanssa.</string>
|
||||
<string name="media_scan">Päivitä kirjasto</string>
|
||||
|
||||
@@ -178,7 +178,7 @@
|
||||
<string name="double_tap_title">Widget \"Double Tap\"</string>
|
||||
<string name="double_tap_summary">Toucher deux fois le widget 1x1 pour ouvrir le lecteur. Implique un délai de 400ms avant que le widget réponde aux actions.</string>
|
||||
<string name="scrobble_title">Utiliser l\'API ScrobbleDroid</string>
|
||||
<string name="scrobble_summary">Envoyer l\'information de scrobble à Last.FM grâce à ScrobbleDroid ou SimpleLast.FM Scrobbler</string>
|
||||
<string name="scrobble_summary">Envoyer l\'information de scrobble à Last.fm grâce à ScrobbleDroid ou SimpleLast.fm Scrobbler</string>
|
||||
<string name="stock_broadcast_title">Émuler la diffusion d\'origine</string>
|
||||
<string name="stock_broadcast_summary">Envoyer les messages de diffusion émulant ceux envoyés par le lecteur d\'origine pour fonctionner avec des contrôles d\'écran de verrouillage tiers, widgets, etc.</string>
|
||||
<string name="media_scan">Rafraîchir la bibliothèque</string>
|
||||
|
||||
@@ -179,7 +179,7 @@
|
||||
<string name="double_tap_title">ダブルタップ ウィジェット</string>
|
||||
<string name="double_tap_summary">1x1 のウィジェットをダブルタップするとプレーヤーを開きます。ウィジェットが操作に応答する前に 400ms の遅延が発生します。</string>
|
||||
<string name="scrobble_title">ScrobbleDroid API を使用する</string>
|
||||
<string name="scrobble_summary">ScrobbleDroid または Simple Last.FM Scrobbler 経由で Last.FM にスクローブルします</string>
|
||||
<string name="scrobble_summary">ScrobbleDroid または Simple Last.fm Scrobbler 経由で Last.fm にスクローブルします</string>
|
||||
<string name="stock_broadcast_title">既存のブロードキャストをエミュレートする</string>
|
||||
<string name="stock_broadcast_summary">サードパーティ製のロック画面コントロール、ウィジェットなどで動作するように、既存の音楽プレーヤーから送信されるブロードキャストをエミュレートして送信します</string>
|
||||
<string name="media_scan">ライブラリーをリフレッシュ</string>
|
||||
@@ -215,7 +215,7 @@
|
||||
<string name="enqueue_current_artist">アーチストをキューに入れる</string>
|
||||
<string name="enqueue_current_genre">ジャンルをキューに入れる</string>
|
||||
<string name="clear_queue">キューをクリア</string>
|
||||
<string name="empty_the_queue">空のキュー</string>
|
||||
<string name="empty_the_queue">キューを空にする</string>
|
||||
<string name="show_queue">キューを表示</string>
|
||||
<string name="dequeue_rest">残りをキューから消す</string>
|
||||
<string name="queue">キュー</string>
|
||||
|
||||
@@ -179,7 +179,7 @@
|
||||
<string name="double_tap_title">위젯을 두번 탭</string>
|
||||
<string name="double_tap_summary">1x1위젯을 두번 탭하면 플레이어가 열림. 위젯을 400ms이하로 탭해야 반응함.</string>
|
||||
<string name="scrobble_title">ScrobbleDroid API 사용</string>
|
||||
<string name="scrobble_summary">ScrobbleDroid 이나 간단한 Last.FM Scrobbler를 통하여 Last.FM을 Scrobble 함</string>
|
||||
<string name="scrobble_summary">ScrobbleDroid 이나 간단한 Last.fm Scrobbler를 통하여 Last.fm을 Scrobble 함</string>
|
||||
<string name="stock_broadcast_title">Stock Broadcasts를 에뮬레이트 함</string>
|
||||
<string name="stock_broadcast_summary">서드파티 잠금화면 컨트롤, 위젯등과 내장 음악 플레이어로 전송된 broadcasts 에뮬레이팅을 전송함</string>
|
||||
<string name="media_scan">라이브러리 새로 고침</string>
|
||||
|
||||
@@ -193,7 +193,7 @@
|
||||
<string name="double_tap_title">Dubultpieskāriena sīklietotne</string>
|
||||
<string name="double_tap_summary">Izdarot dubultpieskārienu 1x1 izmēra sīkrīkam, tiks atvērts atskaņotājs. Rada 400 ms aizturi, pirms sīkrīks atbildēs uz darbībām.</string>
|
||||
<string name="scrobble_title">Lietot ScrobbleDroid API</string>
|
||||
<string name="scrobble_summary">Sūtīt atskaņojumus uz Last.FM caur ScrobbleDroid vai Simple Last.FM atskaņojumu sūtītāju</string>
|
||||
<string name="scrobble_summary">Nosūtīt atskaņojumus servisam Last.fm, izmantojot ScrobbleDroid vai Simple Last.fm Scrobbler</string>
|
||||
<string name="stock_broadcast_title">Emulēt pamata raidījumus</string>
|
||||
<string name="stock_broadcast_summary">Sūtīt raidījumus, tādējādi emulējot noklusētā mūzikas atskaņotāja sūtītos, lai būtu iespējama trešo pušu slēgekrānu vadīklu, sīkrīku, u.t.t., kontrole.</string>
|
||||
<string name="media_scan">Atsvaidzināt bibliotēku</string>
|
||||
|
||||
@@ -186,7 +186,7 @@
|
||||
<string name="double_tap_title">Duplo clique no widget</string>
|
||||
<string name="double_tap_summary">Ao clicar duas vezes no widget 1x1, abre o reprodutor. Tem um atraso de 400 ms antes de responder às ações.</string>
|
||||
<string name="scrobble_title">Usar API ScrobbleDroid</string>
|
||||
<string name="scrobble_summary">Enviar faixas para a Last.FM através de ScrobbleDroid ou Simple Last.FM Scrobbler</string>
|
||||
<string name="scrobble_summary">Enviar faixas para a Last.fm através de ScrobbleDroid ou Simple Last.fm Scrobbler</string>
|
||||
<string name="stock_broadcast_title">Emular comunicações</string>
|
||||
<string name="stock_broadcast_summary">Enviar emissões emulando as enviadas pelo reprodutor do Android para poder funcionar com controlos e widgets de terceiros</string>
|
||||
<string name="media_scan">Atualizar coleção</string>
|
||||
|
||||
@@ -186,7 +186,7 @@
|
||||
<string name="double_tap_title">Widget\'a iki kez bas</string>
|
||||
<string name="double_tap_summary">1x1 widget\'a iki kez basmak oynatıcıyı açar. 400ms\'lik bir gecikme ile çalışır.</string>
|
||||
<string name="scrobble_title">ScrobbleDroid API\'sini kullan</string>
|
||||
<string name="scrobble_summary">Last.FM\'e ScrobbleDroid veya Simple Last.FM Scrobbler ile iskropla.</string>
|
||||
<string name="scrobble_summary">Last.fm\'e ScrobbleDroid veya Simple Last.fm Scrobbler ile iskropla.</string>
|
||||
<string name="stock_broadcast_title">Varsayılan yayınları öykün</string>
|
||||
<string name="stock_broadcast_summary">Varsayılan müzik oynatıcısı tarafından üçüncü parti kilit ekranı denetimleri ve widgetlar ile çalışması için gönderilen yayınları öykün.</string>
|
||||
<string name="media_scan">Arşivi yenile</string>
|
||||
|
||||
@@ -179,7 +179,7 @@
|
||||
<string name="double_tap_title">双击小工具</string>
|
||||
<string name="double_tap_summary">双击 1 x 1 的小工具将会打开播放器。小工具做出响应之前会有 400 毫秒延迟。</string>
|
||||
<string name="scrobble_title">使用 ScrobbleDroid API</string>
|
||||
<string name="scrobble_summary">Scrobble 透过 ScrobbleDroid 到 Last.FM 或只是 Last.FM Scrobbler</string>
|
||||
<string name="scrobble_summary">Scrobble 透过 ScrobbleDroid 到 Last.fm 或只是 Last.fm Scrobbler</string>
|
||||
<string name="stock_broadcast_title">模拟原生应用广播</string>
|
||||
<string name="stock_broadcast_summary">发送广播以模拟那些由本地原生播放器而产生的效果,例如第三方锁屏控制,小工具等等。</string>
|
||||
<string name="media_scan">刷新媒体库</string>
|
||||
|
||||
@@ -179,7 +179,7 @@
|
||||
<string name="double_tap_title">雙點擊小工具</string>
|
||||
<string name="double_tap_summary">雙點擊 1 x 1 小工具將打開播放機。小工具的操作做出回應之前,會引起400ms的延遲。</string>
|
||||
<string name="scrobble_title">使用 ScrobbleDroid 的 API</string>
|
||||
<string name="scrobble_summary">Scrobble 透過 ScrobbleDroid 到 Last.FM或單純的 Last.FM Scrobbler</string>
|
||||
<string name="scrobble_summary">Scrobble 透過 ScrobbleDroid 到 Last.fm或單純的 Last.fm Scrobbler</string>
|
||||
<string name="stock_broadcast_title">模擬股票廣播</string>
|
||||
<string name="stock_broadcast_summary">放送廣播,模擬那些放送股票音樂播放的工作與第三方螢幕鎖控制、小工具等。</string>
|
||||
<string name="media_scan">更新媒體庫</string>
|
||||
|
||||
@@ -175,7 +175,7 @@ public class CoverCache {
|
||||
* Creates a new in-memory LRU cache
|
||||
*
|
||||
* @param context the application context
|
||||
* @param int the lru cache size in bytes
|
||||
* @param size the lru cache size in bytes
|
||||
*/
|
||||
public BitmapLruCache(Context context, int size) {
|
||||
super(size);
|
||||
|
||||
@@ -644,7 +644,7 @@ public class FullPlaybackActivity extends PlaybackActivity
|
||||
*/
|
||||
private static final int MSG_UPDATE_POSITION = 17;
|
||||
/**
|
||||
* Calls {@link #seekToProgress()}.
|
||||
* Calls {@link PlaybackService#seekToProgress(int)}.
|
||||
*/
|
||||
private static final int MSG_SEEK_TO_PROGRESS = 18;
|
||||
|
||||
@@ -710,13 +710,14 @@ public class FullPlaybackActivity extends PlaybackActivity
|
||||
mSeekBarTracking = false;
|
||||
}
|
||||
|
||||
public void performAction(Action action)
|
||||
@Override
|
||||
protected void performAction(Action action)
|
||||
{
|
||||
if (action == Action.ToggleControls) {
|
||||
setControlsVisible(!mControlsVisible);
|
||||
mHandler.sendEmptyMessage(MSG_SAVE_CONTROLS);
|
||||
} else {
|
||||
PlaybackService.get(this).performAction(action, this);
|
||||
super.performAction(action);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -191,7 +191,7 @@ public class LazyCoverView extends ImageView
|
||||
* Updates the view with a cached bitmap
|
||||
* A fallback image will be used on cache miss
|
||||
*
|
||||
* @param payload The cover message containing the cache key and view to use
|
||||
* @param key The cover message containing the cache key and view to use
|
||||
*/
|
||||
public boolean drawFromCache(CoverCache.CoverKey key, boolean fadeIn) {
|
||||
boolean cacheHit = true;
|
||||
|
||||
@@ -77,7 +77,6 @@ public class NewPlaylistDialog extends Dialog implements TextWatcher, View.OnCli
|
||||
* disabled when the EditText contains this text.
|
||||
* @param actionText A string resource describing the default positive
|
||||
* action (e.g. "Create").
|
||||
* @param intent An optional intent to store with the dialog.
|
||||
*/
|
||||
public NewPlaylistDialog(Context context, String initialText, int actionText, PlaylistTask playlistTask)
|
||||
{
|
||||
|
||||
@@ -540,13 +540,18 @@ public abstract class PlaybackActivity extends Activity
|
||||
@Override
|
||||
public void upSwipe()
|
||||
{
|
||||
PlaybackService.get(this).performAction(mUpAction, this);
|
||||
performAction(mUpAction);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void downSwipe()
|
||||
{
|
||||
PlaybackService.get(this).performAction(mDownAction, this);
|
||||
performAction(mDownAction);
|
||||
}
|
||||
|
||||
protected void performAction(Action action)
|
||||
{
|
||||
PlaybackService.get(this).performAction(action, this);
|
||||
}
|
||||
|
||||
private static final int GROUP_SHUFFLE = 100;
|
||||
|
||||
@@ -200,7 +200,7 @@ public class Playlist {
|
||||
* Copy content from one playlist to another
|
||||
*
|
||||
* @param resolver A ContentResolver to use.
|
||||
* @param sourceid The Media.Audio.Playlists id of the source playlist
|
||||
* @param sourceId The Media.Audio.Playlists id of the source playlist
|
||||
* @param destinationId The Media.Audio.Playlists id of the destination playlist
|
||||
*/
|
||||
private static void _copyToPlaylist(ContentResolver resolver, long sourceId, long destinationId) {
|
||||
|
||||
@@ -19,8 +19,9 @@ package ch.blinkenlights.android.vanilla;
|
||||
|
||||
import java.util.ArrayList;
|
||||
|
||||
import android.app.Activity;
|
||||
import android.annotation.SuppressLint;
|
||||
import android.content.DialogInterface;
|
||||
import android.os.Build;
|
||||
import android.os.Bundle;
|
||||
import android.os.Message;
|
||||
import android.view.View;
|
||||
@@ -29,7 +30,6 @@ import android.view.MenuItem;
|
||||
import android.widget.AdapterView;
|
||||
import android.widget.AdapterView.OnItemClickListener;
|
||||
import android.widget.AdapterView.OnItemLongClickListener;
|
||||
import android.widget.ListView;
|
||||
import com.mobeta.android.dslv.DragSortListView;
|
||||
|
||||
public class ShowQueueActivity extends PlaybackActivity
|
||||
@@ -41,7 +41,7 @@ public class ShowQueueActivity extends PlaybackActivity
|
||||
private ShowQueueAdapter listAdapter;
|
||||
private PlaybackService mService;
|
||||
|
||||
@Override
|
||||
@Override
|
||||
public void onCreate(Bundle savedInstanceState) {
|
||||
ThemeHelper.setTheme(this, R.style.BackActionBar);
|
||||
super.onCreate(savedInstanceState);
|
||||
@@ -84,7 +84,7 @@ public class ShowQueueActivity extends PlaybackActivity
|
||||
|
||||
/**
|
||||
* Called after the user selected an action from the ActionBar
|
||||
*
|
||||
*
|
||||
* @param item The selected menu item
|
||||
*/
|
||||
@Override
|
||||
@@ -208,12 +208,25 @@ public class ShowQueueActivity extends PlaybackActivity
|
||||
listAdapter.add(mService.getSongByQueuePosition(i));
|
||||
}
|
||||
|
||||
if (scroll == true)
|
||||
mListView.setSelectionFromTop(spos, 0); /* scroll to currently playing song */
|
||||
if(scroll)
|
||||
scrollToCurrentSong(spos);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* Scrolls to the current song<br/>
|
||||
* We suppress the new api lint check as lint thinks
|
||||
* {@link android.widget.AbsListView#setSelectionFromTop(int, int)} was only added in
|
||||
* {@link Build.VERSION_CODES#JELLY_BEAN}, but it was actually added in API
|
||||
* level 1<br/>
|
||||
* <a href="https://developer.android.com/reference/android/widget/AbsListView.html#setSelectionFromTop%28int,%20int%29">
|
||||
* Android reference: AbsListView.setSelectionFromTop()</a>
|
||||
* @param currentSongPosition The position in {@link #mListView} of the current song
|
||||
*/
|
||||
@SuppressLint("NewApi")
|
||||
private void scrollToCurrentSong(int currentSongPosition){
|
||||
mListView.setSelectionFromTop(currentSongPosition, 0); /* scroll to currently playing song */
|
||||
}
|
||||
|
||||
}
|
||||
@@ -18,10 +18,13 @@
|
||||
|
||||
package ch.blinkenlights.android.vanilla;
|
||||
|
||||
import android.annotation.TargetApi;
|
||||
import android.content.Context;
|
||||
import android.content.Intent;
|
||||
import android.media.MediaPlayer;
|
||||
import android.media.audiofx.AudioEffect;
|
||||
import android.os.Build;
|
||||
|
||||
import java.io.IOException;
|
||||
|
||||
public class VanillaMediaPlayer extends MediaPlayer {
|
||||
@@ -77,6 +80,7 @@ public class VanillaMediaPlayer extends MediaPlayer {
|
||||
/**
|
||||
* Sets the next media player data source
|
||||
*/
|
||||
@TargetApi(Build.VERSION_CODES.JELLY_BEAN)
|
||||
public void setNextMediaPlayer(VanillaMediaPlayer next) {
|
||||
super.setNextMediaPlayer(next);
|
||||
mHasNextMediaPlayer = (next != null);
|
||||
|
||||
Reference in new issue
Block a user