Merge change 23119 into eclair
* changes:
modified: tests/src/com/android/music/MusicPlayerFunctionalTestRunner.java new file: tests/src/com/android/music/MusicPlayerStability.java Add the test case for power measurment. The test case is simple play the mp3 thorough the music player for 30 seconds. It also check wehter there is any song in the song list.
diff --git a/res/drawable-hdpi-finger/album_border_large.9.png b/res/drawable-hdpi-finger/album_border_large.9.png
new file mode 100644
index 0000000..d31cce9
--- /dev/null
+++ b/res/drawable-hdpi-finger/album_border_large.9.png
Binary files differ
diff --git a/res/drawable-hdpi-finger/albumart_mp_unknown.png b/res/drawable-hdpi-finger/albumart_mp_unknown.png
new file mode 100644
index 0000000..ab88184
--- /dev/null
+++ b/res/drawable-hdpi-finger/albumart_mp_unknown.png
Binary files differ
diff --git a/res/drawable-hdpi-finger/albumart_mp_unknown_list.png b/res/drawable-hdpi-finger/albumart_mp_unknown_list.png
new file mode 100644
index 0000000..5c3a380
--- /dev/null
+++ b/res/drawable-hdpi-finger/albumart_mp_unknown_list.png
Binary files differ
diff --git a/res/drawable-hdpi-finger/appwidget_bg.9.png b/res/drawable-hdpi-finger/appwidget_bg.9.png
new file mode 100644
index 0000000..d0c67c0
--- /dev/null
+++ b/res/drawable-hdpi-finger/appwidget_bg.9.png
Binary files differ
diff --git a/res/drawable-hdpi-finger/appwidget_inner.9.png b/res/drawable-hdpi-finger/appwidget_inner.9.png
new file mode 100644
index 0000000..625ee46
--- /dev/null
+++ b/res/drawable-hdpi-finger/appwidget_inner.9.png
Binary files differ
diff --git a/res/drawable-hdpi-finger/appwidget_next_focused.png b/res/drawable-hdpi-finger/appwidget_next_focused.png
new file mode 100644
index 0000000..cc9d9df
--- /dev/null
+++ b/res/drawable-hdpi-finger/appwidget_next_focused.png
Binary files differ
diff --git a/res/drawable-hdpi-finger/appwidget_next_normal.png b/res/drawable-hdpi-finger/appwidget_next_normal.png
new file mode 100644
index 0000000..658f4f2
--- /dev/null
+++ b/res/drawable-hdpi-finger/appwidget_next_normal.png
Binary files differ
diff --git a/res/drawable-hdpi-finger/appwidget_next_pressed.png b/res/drawable-hdpi-finger/appwidget_next_pressed.png
new file mode 100644
index 0000000..4110ac3
--- /dev/null
+++ b/res/drawable-hdpi-finger/appwidget_next_pressed.png
Binary files differ
diff --git a/res/drawable-hdpi-finger/appwidget_pause_focused.png b/res/drawable-hdpi-finger/appwidget_pause_focused.png
new file mode 100644
index 0000000..4fb8cb6
--- /dev/null
+++ b/res/drawable-hdpi-finger/appwidget_pause_focused.png
Binary files differ
diff --git a/res/drawable-hdpi-finger/appwidget_pause_normal.png b/res/drawable-hdpi-finger/appwidget_pause_normal.png
new file mode 100644
index 0000000..610aa3b
--- /dev/null
+++ b/res/drawable-hdpi-finger/appwidget_pause_normal.png
Binary files differ
diff --git a/res/drawable-hdpi-finger/appwidget_pause_pressed.png b/res/drawable-hdpi-finger/appwidget_pause_pressed.png
new file mode 100644
index 0000000..7e1d55a
--- /dev/null
+++ b/res/drawable-hdpi-finger/appwidget_pause_pressed.png
Binary files differ
diff --git a/res/drawable-hdpi-finger/appwidget_play_focused.png b/res/drawable-hdpi-finger/appwidget_play_focused.png
new file mode 100644
index 0000000..79c6b61
--- /dev/null
+++ b/res/drawable-hdpi-finger/appwidget_play_focused.png
Binary files differ
diff --git a/res/drawable-hdpi-finger/appwidget_play_normal.png b/res/drawable-hdpi-finger/appwidget_play_normal.png
new file mode 100644
index 0000000..75622b8
--- /dev/null
+++ b/res/drawable-hdpi-finger/appwidget_play_normal.png
Binary files differ
diff --git a/res/drawable-hdpi-finger/appwidget_play_pressed.png b/res/drawable-hdpi-finger/appwidget_play_pressed.png
new file mode 100644
index 0000000..1a8d227
--- /dev/null
+++ b/res/drawable-hdpi-finger/appwidget_play_pressed.png
Binary files differ
diff --git a/res/drawable-hdpi-finger/btn_music_highlight.9.png b/res/drawable-hdpi-finger/btn_music_highlight.9.png
new file mode 100644
index 0000000..31ef51b
--- /dev/null
+++ b/res/drawable-hdpi-finger/btn_music_highlight.9.png
Binary files differ
diff --git a/res/drawable-hdpi-finger/btn_music_normal.9.png b/res/drawable-hdpi-finger/btn_music_normal.9.png
new file mode 100644
index 0000000..48eec8b
--- /dev/null
+++ b/res/drawable-hdpi-finger/btn_music_normal.9.png
Binary files differ
diff --git a/res/drawable-hdpi-finger/btn_music_pressed.9.png b/res/drawable-hdpi-finger/btn_music_pressed.9.png
new file mode 100644
index 0000000..755c525
--- /dev/null
+++ b/res/drawable-hdpi-finger/btn_music_pressed.9.png
Binary files differ
diff --git a/res/drawable-hdpi-finger/ic_menu_delete.png b/res/drawable-hdpi-finger/ic_menu_delete.png
new file mode 100644
index 0000000..13fe5e4
--- /dev/null
+++ b/res/drawable-hdpi-finger/ic_menu_delete.png
Binary files differ
diff --git a/res/drawable-hdpi-finger/ic_menu_music_library.png b/res/drawable-hdpi-finger/ic_menu_music_library.png
new file mode 100644
index 0000000..70a5915
--- /dev/null
+++ b/res/drawable-hdpi-finger/ic_menu_music_library.png
Binary files differ
diff --git a/res/drawable-hdpi-finger/ic_menu_party_shuffle.png b/res/drawable-hdpi-finger/ic_menu_party_shuffle.png
new file mode 100644
index 0000000..08bb20a
--- /dev/null
+++ b/res/drawable-hdpi-finger/ic_menu_party_shuffle.png
Binary files differ
diff --git a/res/drawable-hdpi-finger/ic_menu_playback.png b/res/drawable-hdpi-finger/ic_menu_playback.png
new file mode 100644
index 0000000..10af07f
--- /dev/null
+++ b/res/drawable-hdpi-finger/ic_menu_playback.png
Binary files differ
diff --git a/res/drawable-hdpi-finger/ic_menu_set_as_ringtone.png b/res/drawable-hdpi-finger/ic_menu_set_as_ringtone.png
new file mode 100644
index 0000000..6e4530d
--- /dev/null
+++ b/res/drawable-hdpi-finger/ic_menu_set_as_ringtone.png
Binary files differ
diff --git a/res/drawable-hdpi-finger/ic_menu_shuffle.png b/res/drawable-hdpi-finger/ic_menu_shuffle.png
new file mode 100644
index 0000000..22ee1d5
--- /dev/null
+++ b/res/drawable-hdpi-finger/ic_menu_shuffle.png
Binary files differ
diff --git a/res/drawable-hdpi-finger/ic_mp_album_playback.png b/res/drawable-hdpi-finger/ic_mp_album_playback.png
new file mode 100644
index 0000000..bcdb405
--- /dev/null
+++ b/res/drawable-hdpi-finger/ic_mp_album_playback.png
Binary files differ
diff --git a/res/drawable-hdpi-finger/ic_mp_artist_list.png b/res/drawable-hdpi-finger/ic_mp_artist_list.png
new file mode 100644
index 0000000..6b82c3d
--- /dev/null
+++ b/res/drawable-hdpi-finger/ic_mp_artist_list.png
Binary files differ
diff --git a/res/drawable-hdpi-finger/ic_mp_artist_playback.png b/res/drawable-hdpi-finger/ic_mp_artist_playback.png
new file mode 100644
index 0000000..a90f03a
--- /dev/null
+++ b/res/drawable-hdpi-finger/ic_mp_artist_playback.png
Binary files differ
diff --git a/res/drawable-hdpi-finger/ic_mp_current_playlist_btn.png b/res/drawable-hdpi-finger/ic_mp_current_playlist_btn.png
new file mode 100644
index 0000000..b4353f5
--- /dev/null
+++ b/res/drawable-hdpi-finger/ic_mp_current_playlist_btn.png
Binary files differ
diff --git a/res/drawable-hdpi-finger/ic_mp_move.png b/res/drawable-hdpi-finger/ic_mp_move.png
new file mode 100644
index 0000000..ee9034b
--- /dev/null
+++ b/res/drawable-hdpi-finger/ic_mp_move.png
Binary files differ
diff --git a/res/drawable-hdpi-finger/ic_mp_partyshuffle_on_btn.png b/res/drawable-hdpi-finger/ic_mp_partyshuffle_on_btn.png
new file mode 100644
index 0000000..4370a24
--- /dev/null
+++ b/res/drawable-hdpi-finger/ic_mp_partyshuffle_on_btn.png
Binary files differ
diff --git a/res/drawable-hdpi-finger/ic_mp_playlist_list.png b/res/drawable-hdpi-finger/ic_mp_playlist_list.png
new file mode 100644
index 0000000..94dadf1
--- /dev/null
+++ b/res/drawable-hdpi-finger/ic_mp_playlist_list.png
Binary files differ
diff --git a/res/drawable-hdpi-finger/ic_mp_playlist_recently_added_list.png b/res/drawable-hdpi-finger/ic_mp_playlist_recently_added_list.png
new file mode 100644
index 0000000..3082e15
--- /dev/null
+++ b/res/drawable-hdpi-finger/ic_mp_playlist_recently_added_list.png
Binary files differ
diff --git a/res/drawable-hdpi-finger/ic_mp_repeat_all_btn.png b/res/drawable-hdpi-finger/ic_mp_repeat_all_btn.png
new file mode 100644
index 0000000..c2eb837
--- /dev/null
+++ b/res/drawable-hdpi-finger/ic_mp_repeat_all_btn.png
Binary files differ
diff --git a/res/drawable-hdpi-finger/ic_mp_repeat_off_btn.png b/res/drawable-hdpi-finger/ic_mp_repeat_off_btn.png
new file mode 100644
index 0000000..df41013
--- /dev/null
+++ b/res/drawable-hdpi-finger/ic_mp_repeat_off_btn.png
Binary files differ
diff --git a/res/drawable-hdpi-finger/ic_mp_repeat_once_btn.png b/res/drawable-hdpi-finger/ic_mp_repeat_once_btn.png
new file mode 100644
index 0000000..819eda2
--- /dev/null
+++ b/res/drawable-hdpi-finger/ic_mp_repeat_once_btn.png
Binary files differ
diff --git a/res/drawable-hdpi-finger/ic_mp_screen_albums.png b/res/drawable-hdpi-finger/ic_mp_screen_albums.png
new file mode 100644
index 0000000..c22c0fd
--- /dev/null
+++ b/res/drawable-hdpi-finger/ic_mp_screen_albums.png
Binary files differ
diff --git a/res/drawable-hdpi-finger/ic_mp_screen_artists.png b/res/drawable-hdpi-finger/ic_mp_screen_artists.png
new file mode 100644
index 0000000..1a3deef
--- /dev/null
+++ b/res/drawable-hdpi-finger/ic_mp_screen_artists.png
Binary files differ
diff --git a/res/drawable-hdpi-finger/ic_mp_screen_playlists.png b/res/drawable-hdpi-finger/ic_mp_screen_playlists.png
new file mode 100644
index 0000000..4cbe083
--- /dev/null
+++ b/res/drawable-hdpi-finger/ic_mp_screen_playlists.png
Binary files differ
diff --git a/res/drawable-hdpi-finger/ic_mp_screen_tracks.png b/res/drawable-hdpi-finger/ic_mp_screen_tracks.png
new file mode 100644
index 0000000..ebfa00c
--- /dev/null
+++ b/res/drawable-hdpi-finger/ic_mp_screen_tracks.png
Binary files differ
diff --git a/res/drawable-hdpi-finger/ic_mp_sd_card.png b/res/drawable-hdpi-finger/ic_mp_sd_card.png
new file mode 100644
index 0000000..fa05320
--- /dev/null
+++ b/res/drawable-hdpi-finger/ic_mp_sd_card.png
Binary files differ
diff --git a/res/drawable-hdpi-finger/ic_mp_shuffle_off_btn.png b/res/drawable-hdpi-finger/ic_mp_shuffle_off_btn.png
new file mode 100644
index 0000000..2ec500e
--- /dev/null
+++ b/res/drawable-hdpi-finger/ic_mp_shuffle_off_btn.png
Binary files differ
diff --git a/res/drawable-hdpi-finger/ic_mp_shuffle_on_btn.png b/res/drawable-hdpi-finger/ic_mp_shuffle_on_btn.png
new file mode 100644
index 0000000..c9ec3bf
--- /dev/null
+++ b/res/drawable-hdpi-finger/ic_mp_shuffle_on_btn.png
Binary files differ
diff --git a/res/drawable-hdpi-finger/ic_mp_song_list.png b/res/drawable-hdpi-finger/ic_mp_song_list.png
new file mode 100644
index 0000000..e86fdf3
--- /dev/null
+++ b/res/drawable-hdpi-finger/ic_mp_song_list.png
Binary files differ
diff --git a/res/drawable-hdpi-finger/ic_mp_song_playback.png b/res/drawable-hdpi-finger/ic_mp_song_playback.png
new file mode 100644
index 0000000..3a609ca
--- /dev/null
+++ b/res/drawable-hdpi-finger/ic_mp_song_playback.png
Binary files differ
diff --git a/res/drawable-hdpi-finger/ic_search_category_music_song.png b/res/drawable-hdpi-finger/ic_search_category_music_song.png
new file mode 100644
index 0000000..182ac6a
--- /dev/null
+++ b/res/drawable-hdpi-finger/ic_search_category_music_song.png
Binary files differ
diff --git a/res/drawable-hdpi-finger/ic_slide_keyboard.png b/res/drawable-hdpi-finger/ic_slide_keyboard.png
new file mode 100644
index 0000000..fc75cff
--- /dev/null
+++ b/res/drawable-hdpi-finger/ic_slide_keyboard.png
Binary files differ
diff --git a/res/drawable-hdpi-finger/indicator_ic_mp_playing_large.png b/res/drawable-hdpi-finger/indicator_ic_mp_playing_large.png
new file mode 100644
index 0000000..4867510
--- /dev/null
+++ b/res/drawable-hdpi-finger/indicator_ic_mp_playing_large.png
Binary files differ
diff --git a/res/drawable-hdpi-finger/indicator_ic_mp_playing_list.png b/res/drawable-hdpi-finger/indicator_ic_mp_playing_list.png
new file mode 100644
index 0000000..683c9ea
--- /dev/null
+++ b/res/drawable-hdpi-finger/indicator_ic_mp_playing_list.png
Binary files differ
diff --git a/res/drawable-hdpi-finger/stat_notify_musicplayer.png b/res/drawable-hdpi-finger/stat_notify_musicplayer.png
new file mode 100644
index 0000000..bfd3e6a
--- /dev/null
+++ b/res/drawable-hdpi-finger/stat_notify_musicplayer.png
Binary files differ
diff --git a/res/drawable-hdpi/app_music.png b/res/drawable-hdpi/app_music.png
new file mode 100644
index 0000000..1baac35
--- /dev/null
+++ b/res/drawable-hdpi/app_music.png
Binary files differ
diff --git a/res/drawable-hdpi/app_video.png b/res/drawable-hdpi/app_video.png
new file mode 100644
index 0000000..6249d61
--- /dev/null
+++ b/res/drawable-hdpi/app_video.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_launcher_shortcut_music_playlist.png b/res/drawable-hdpi/ic_launcher_shortcut_music_playlist.png
new file mode 100644
index 0000000..4083c3a
--- /dev/null
+++ b/res/drawable-hdpi/ic_launcher_shortcut_music_playlist.png
Binary files differ
diff --git a/res/drawable-hdpi/midi.png b/res/drawable-hdpi/midi.png
new file mode 100644
index 0000000..9d3bf5b
--- /dev/null
+++ b/res/drawable-hdpi/midi.png
Binary files differ
diff --git a/res/drawable-hdpi/movie.png b/res/drawable-hdpi/movie.png
new file mode 100644
index 0000000..85a8a62
--- /dev/null
+++ b/res/drawable-hdpi/movie.png
Binary files differ
diff --git a/res/drawable-land-hdpi-finger/albumart_mp_unknown.png b/res/drawable-land-hdpi-finger/albumart_mp_unknown.png
new file mode 100644
index 0000000..8d1e861
--- /dev/null
+++ b/res/drawable-land-hdpi-finger/albumart_mp_unknown.png
Binary files differ
diff --git a/res/drawable-land-hdpi-finger/btn_music_highlight.9.png b/res/drawable-land-hdpi-finger/btn_music_highlight.9.png
new file mode 100644
index 0000000..fa12c42
--- /dev/null
+++ b/res/drawable-land-hdpi-finger/btn_music_highlight.9.png
Binary files differ
diff --git a/res/drawable-land-hdpi-finger/btn_music_normal.9.png b/res/drawable-land-hdpi-finger/btn_music_normal.9.png
new file mode 100644
index 0000000..4be02e6
--- /dev/null
+++ b/res/drawable-land-hdpi-finger/btn_music_normal.9.png
Binary files differ
diff --git a/res/drawable-land-hdpi-finger/btn_music_pressed.9.png b/res/drawable-land-hdpi-finger/btn_music_pressed.9.png
new file mode 100644
index 0000000..3cf8813
--- /dev/null
+++ b/res/drawable-land-hdpi-finger/btn_music_pressed.9.png
Binary files differ
diff --git a/res/drawable-land-finger/albumart_mp_unknown.png b/res/drawable-land-mdpi-finger/albumart_mp_unknown.png
similarity index 100%
rename from res/drawable-land-finger/albumart_mp_unknown.png
rename to res/drawable-land-mdpi-finger/albumart_mp_unknown.png
Binary files differ
diff --git a/res/drawable-land-finger/btn_music_highlight.9.png b/res/drawable-land-mdpi-finger/btn_music_highlight.9.png
similarity index 100%
rename from res/drawable-land-finger/btn_music_highlight.9.png
rename to res/drawable-land-mdpi-finger/btn_music_highlight.9.png
Binary files differ
diff --git a/res/drawable-land-finger/btn_music_normal.9.png b/res/drawable-land-mdpi-finger/btn_music_normal.9.png
similarity index 100%
rename from res/drawable-land-finger/btn_music_normal.9.png
rename to res/drawable-land-mdpi-finger/btn_music_normal.9.png
Binary files differ
diff --git a/res/drawable-land-finger/btn_music_pressed.9.png b/res/drawable-land-mdpi-finger/btn_music_pressed.9.png
similarity index 100%
rename from res/drawable-land-finger/btn_music_pressed.9.png
rename to res/drawable-land-mdpi-finger/btn_music_pressed.9.png
Binary files differ
diff --git a/res/drawable-finger/album_border_large.9.png b/res/drawable-mdpi-finger/album_border_large.9.png
similarity index 100%
rename from res/drawable-finger/album_border_large.9.png
rename to res/drawable-mdpi-finger/album_border_large.9.png
Binary files differ
diff --git a/res/drawable-finger/albumart_mp_unknown.png b/res/drawable-mdpi-finger/albumart_mp_unknown.png
similarity index 100%
rename from res/drawable-finger/albumart_mp_unknown.png
rename to res/drawable-mdpi-finger/albumart_mp_unknown.png
Binary files differ
diff --git a/res/drawable-finger/albumart_mp_unknown_list.png b/res/drawable-mdpi-finger/albumart_mp_unknown_list.png
similarity index 100%
rename from res/drawable-finger/albumart_mp_unknown_list.png
rename to res/drawable-mdpi-finger/albumart_mp_unknown_list.png
Binary files differ
diff --git a/res/drawable-finger/appwidget_bg.9.png b/res/drawable-mdpi-finger/appwidget_bg.9.png
similarity index 100%
rename from res/drawable-finger/appwidget_bg.9.png
rename to res/drawable-mdpi-finger/appwidget_bg.9.png
Binary files differ
diff --git a/res/drawable-finger/appwidget_inner.9.png b/res/drawable-mdpi-finger/appwidget_inner.9.png
similarity index 100%
rename from res/drawable-finger/appwidget_inner.9.png
rename to res/drawable-mdpi-finger/appwidget_inner.9.png
Binary files differ
diff --git a/res/drawable-finger/appwidget_next_focused.png b/res/drawable-mdpi-finger/appwidget_next_focused.png
similarity index 100%
rename from res/drawable-finger/appwidget_next_focused.png
rename to res/drawable-mdpi-finger/appwidget_next_focused.png
Binary files differ
diff --git a/res/drawable-finger/appwidget_next_normal.png b/res/drawable-mdpi-finger/appwidget_next_normal.png
similarity index 100%
rename from res/drawable-finger/appwidget_next_normal.png
rename to res/drawable-mdpi-finger/appwidget_next_normal.png
Binary files differ
diff --git a/res/drawable-finger/appwidget_next_pressed.png b/res/drawable-mdpi-finger/appwidget_next_pressed.png
similarity index 100%
rename from res/drawable-finger/appwidget_next_pressed.png
rename to res/drawable-mdpi-finger/appwidget_next_pressed.png
Binary files differ
diff --git a/res/drawable-finger/appwidget_pause_focused.png b/res/drawable-mdpi-finger/appwidget_pause_focused.png
similarity index 100%
rename from res/drawable-finger/appwidget_pause_focused.png
rename to res/drawable-mdpi-finger/appwidget_pause_focused.png
Binary files differ
diff --git a/res/drawable-finger/appwidget_pause_normal.png b/res/drawable-mdpi-finger/appwidget_pause_normal.png
similarity index 100%
rename from res/drawable-finger/appwidget_pause_normal.png
rename to res/drawable-mdpi-finger/appwidget_pause_normal.png
Binary files differ
diff --git a/res/drawable-finger/appwidget_pause_pressed.png b/res/drawable-mdpi-finger/appwidget_pause_pressed.png
similarity index 100%
rename from res/drawable-finger/appwidget_pause_pressed.png
rename to res/drawable-mdpi-finger/appwidget_pause_pressed.png
Binary files differ
diff --git a/res/drawable-finger/appwidget_play_focused.png b/res/drawable-mdpi-finger/appwidget_play_focused.png
similarity index 100%
rename from res/drawable-finger/appwidget_play_focused.png
rename to res/drawable-mdpi-finger/appwidget_play_focused.png
Binary files differ
diff --git a/res/drawable-finger/appwidget_play_normal.png b/res/drawable-mdpi-finger/appwidget_play_normal.png
similarity index 100%
rename from res/drawable-finger/appwidget_play_normal.png
rename to res/drawable-mdpi-finger/appwidget_play_normal.png
Binary files differ
diff --git a/res/drawable-finger/appwidget_play_pressed.png b/res/drawable-mdpi-finger/appwidget_play_pressed.png
similarity index 100%
rename from res/drawable-finger/appwidget_play_pressed.png
rename to res/drawable-mdpi-finger/appwidget_play_pressed.png
Binary files differ
diff --git a/res/drawable-finger/btn_music_highlight.9.png b/res/drawable-mdpi-finger/btn_music_highlight.9.png
similarity index 100%
rename from res/drawable-finger/btn_music_highlight.9.png
rename to res/drawable-mdpi-finger/btn_music_highlight.9.png
Binary files differ
diff --git a/res/drawable-finger/btn_music_normal.9.png b/res/drawable-mdpi-finger/btn_music_normal.9.png
similarity index 100%
rename from res/drawable-finger/btn_music_normal.9.png
rename to res/drawable-mdpi-finger/btn_music_normal.9.png
Binary files differ
diff --git a/res/drawable-finger/btn_music_pressed.9.png b/res/drawable-mdpi-finger/btn_music_pressed.9.png
similarity index 100%
rename from res/drawable-finger/btn_music_pressed.9.png
rename to res/drawable-mdpi-finger/btn_music_pressed.9.png
Binary files differ
diff --git a/res/drawable-finger/ic_menu_delete.png b/res/drawable-mdpi-finger/ic_menu_delete.png
similarity index 100%
rename from res/drawable-finger/ic_menu_delete.png
rename to res/drawable-mdpi-finger/ic_menu_delete.png
Binary files differ
diff --git a/res/drawable-finger/ic_menu_music_library.png b/res/drawable-mdpi-finger/ic_menu_music_library.png
similarity index 100%
rename from res/drawable-finger/ic_menu_music_library.png
rename to res/drawable-mdpi-finger/ic_menu_music_library.png
Binary files differ
diff --git a/res/drawable-finger/ic_menu_party_shuffle.png b/res/drawable-mdpi-finger/ic_menu_party_shuffle.png
similarity index 100%
rename from res/drawable-finger/ic_menu_party_shuffle.png
rename to res/drawable-mdpi-finger/ic_menu_party_shuffle.png
Binary files differ
diff --git a/res/drawable-finger/ic_menu_playback.png b/res/drawable-mdpi-finger/ic_menu_playback.png
similarity index 100%
rename from res/drawable-finger/ic_menu_playback.png
rename to res/drawable-mdpi-finger/ic_menu_playback.png
Binary files differ
diff --git a/res/drawable-finger/ic_menu_set_as_ringtone.png b/res/drawable-mdpi-finger/ic_menu_set_as_ringtone.png
similarity index 100%
rename from res/drawable-finger/ic_menu_set_as_ringtone.png
rename to res/drawable-mdpi-finger/ic_menu_set_as_ringtone.png
Binary files differ
diff --git a/res/drawable-finger/ic_menu_shuffle.png b/res/drawable-mdpi-finger/ic_menu_shuffle.png
similarity index 100%
rename from res/drawable-finger/ic_menu_shuffle.png
rename to res/drawable-mdpi-finger/ic_menu_shuffle.png
Binary files differ
diff --git a/res/drawable-finger/ic_mp_album_playback.png b/res/drawable-mdpi-finger/ic_mp_album_playback.png
similarity index 100%
rename from res/drawable-finger/ic_mp_album_playback.png
rename to res/drawable-mdpi-finger/ic_mp_album_playback.png
Binary files differ
diff --git a/res/drawable-finger/ic_mp_artist_list.png b/res/drawable-mdpi-finger/ic_mp_artist_list.png
similarity index 100%
rename from res/drawable-finger/ic_mp_artist_list.png
rename to res/drawable-mdpi-finger/ic_mp_artist_list.png
Binary files differ
diff --git a/res/drawable-finger/ic_mp_artist_playback.png b/res/drawable-mdpi-finger/ic_mp_artist_playback.png
similarity index 100%
rename from res/drawable-finger/ic_mp_artist_playback.png
rename to res/drawable-mdpi-finger/ic_mp_artist_playback.png
Binary files differ
diff --git a/res/drawable-finger/ic_mp_current_playlist_btn.png b/res/drawable-mdpi-finger/ic_mp_current_playlist_btn.png
similarity index 100%
rename from res/drawable-finger/ic_mp_current_playlist_btn.png
rename to res/drawable-mdpi-finger/ic_mp_current_playlist_btn.png
Binary files differ
diff --git a/res/drawable-finger/ic_mp_move.png b/res/drawable-mdpi-finger/ic_mp_move.png
similarity index 100%
rename from res/drawable-finger/ic_mp_move.png
rename to res/drawable-mdpi-finger/ic_mp_move.png
Binary files differ
diff --git a/res/drawable-finger/ic_mp_partyshuffle_on_btn.png b/res/drawable-mdpi-finger/ic_mp_partyshuffle_on_btn.png
similarity index 100%
rename from res/drawable-finger/ic_mp_partyshuffle_on_btn.png
rename to res/drawable-mdpi-finger/ic_mp_partyshuffle_on_btn.png
Binary files differ
diff --git a/res/drawable-finger/ic_mp_playlist_list.png b/res/drawable-mdpi-finger/ic_mp_playlist_list.png
similarity index 100%
rename from res/drawable-finger/ic_mp_playlist_list.png
rename to res/drawable-mdpi-finger/ic_mp_playlist_list.png
Binary files differ
diff --git a/res/drawable-finger/ic_mp_playlist_recently_added_list.png b/res/drawable-mdpi-finger/ic_mp_playlist_recently_added_list.png
similarity index 100%
rename from res/drawable-finger/ic_mp_playlist_recently_added_list.png
rename to res/drawable-mdpi-finger/ic_mp_playlist_recently_added_list.png
Binary files differ
diff --git a/res/drawable-finger/ic_mp_repeat_all_btn.png b/res/drawable-mdpi-finger/ic_mp_repeat_all_btn.png
similarity index 100%
rename from res/drawable-finger/ic_mp_repeat_all_btn.png
rename to res/drawable-mdpi-finger/ic_mp_repeat_all_btn.png
Binary files differ
diff --git a/res/drawable-finger/ic_mp_repeat_off_btn.png b/res/drawable-mdpi-finger/ic_mp_repeat_off_btn.png
similarity index 100%
rename from res/drawable-finger/ic_mp_repeat_off_btn.png
rename to res/drawable-mdpi-finger/ic_mp_repeat_off_btn.png
Binary files differ
diff --git a/res/drawable-finger/ic_mp_repeat_once_btn.png b/res/drawable-mdpi-finger/ic_mp_repeat_once_btn.png
similarity index 100%
rename from res/drawable-finger/ic_mp_repeat_once_btn.png
rename to res/drawable-mdpi-finger/ic_mp_repeat_once_btn.png
Binary files differ
diff --git a/res/drawable-finger/ic_mp_screen_albums.png b/res/drawable-mdpi-finger/ic_mp_screen_albums.png
similarity index 100%
rename from res/drawable-finger/ic_mp_screen_albums.png
rename to res/drawable-mdpi-finger/ic_mp_screen_albums.png
Binary files differ
diff --git a/res/drawable-finger/ic_mp_screen_artists.png b/res/drawable-mdpi-finger/ic_mp_screen_artists.png
similarity index 100%
rename from res/drawable-finger/ic_mp_screen_artists.png
rename to res/drawable-mdpi-finger/ic_mp_screen_artists.png
Binary files differ
diff --git a/res/drawable-finger/ic_mp_screen_playlists.png b/res/drawable-mdpi-finger/ic_mp_screen_playlists.png
similarity index 100%
rename from res/drawable-finger/ic_mp_screen_playlists.png
rename to res/drawable-mdpi-finger/ic_mp_screen_playlists.png
Binary files differ
diff --git a/res/drawable-finger/ic_mp_screen_tracks.png b/res/drawable-mdpi-finger/ic_mp_screen_tracks.png
similarity index 100%
rename from res/drawable-finger/ic_mp_screen_tracks.png
rename to res/drawable-mdpi-finger/ic_mp_screen_tracks.png
Binary files differ
diff --git a/res/drawable-finger/ic_mp_sd_card.png b/res/drawable-mdpi-finger/ic_mp_sd_card.png
similarity index 100%
rename from res/drawable-finger/ic_mp_sd_card.png
rename to res/drawable-mdpi-finger/ic_mp_sd_card.png
Binary files differ
diff --git a/res/drawable-finger/ic_mp_shuffle_off_btn.png b/res/drawable-mdpi-finger/ic_mp_shuffle_off_btn.png
similarity index 100%
rename from res/drawable-finger/ic_mp_shuffle_off_btn.png
rename to res/drawable-mdpi-finger/ic_mp_shuffle_off_btn.png
Binary files differ
diff --git a/res/drawable-finger/ic_mp_shuffle_on_btn.png b/res/drawable-mdpi-finger/ic_mp_shuffle_on_btn.png
similarity index 100%
rename from res/drawable-finger/ic_mp_shuffle_on_btn.png
rename to res/drawable-mdpi-finger/ic_mp_shuffle_on_btn.png
Binary files differ
diff --git a/res/drawable-finger/ic_mp_song_list.png b/res/drawable-mdpi-finger/ic_mp_song_list.png
similarity index 100%
rename from res/drawable-finger/ic_mp_song_list.png
rename to res/drawable-mdpi-finger/ic_mp_song_list.png
Binary files differ
diff --git a/res/drawable-finger/ic_mp_song_playback.png b/res/drawable-mdpi-finger/ic_mp_song_playback.png
similarity index 100%
rename from res/drawable-finger/ic_mp_song_playback.png
rename to res/drawable-mdpi-finger/ic_mp_song_playback.png
Binary files differ
diff --git a/res/drawable-finger/ic_search_category_music_song.png b/res/drawable-mdpi-finger/ic_search_category_music_song.png
similarity index 100%
rename from res/drawable-finger/ic_search_category_music_song.png
rename to res/drawable-mdpi-finger/ic_search_category_music_song.png
Binary files differ
diff --git a/res/drawable-finger/ic_slide_keyboard.png b/res/drawable-mdpi-finger/ic_slide_keyboard.png
similarity index 100%
rename from res/drawable-finger/ic_slide_keyboard.png
rename to res/drawable-mdpi-finger/ic_slide_keyboard.png
Binary files differ
diff --git a/res/drawable-finger/indicator_ic_mp_playing_large.png b/res/drawable-mdpi-finger/indicator_ic_mp_playing_large.png
similarity index 100%
rename from res/drawable-finger/indicator_ic_mp_playing_large.png
rename to res/drawable-mdpi-finger/indicator_ic_mp_playing_large.png
Binary files differ
diff --git a/res/drawable-finger/indicator_ic_mp_playing_list.png b/res/drawable-mdpi-finger/indicator_ic_mp_playing_list.png
similarity index 100%
rename from res/drawable-finger/indicator_ic_mp_playing_list.png
rename to res/drawable-mdpi-finger/indicator_ic_mp_playing_list.png
Binary files differ
diff --git a/res/drawable-finger/stat_notify_musicplayer.png b/res/drawable-mdpi-finger/stat_notify_musicplayer.png
similarity index 100%
rename from res/drawable-finger/stat_notify_musicplayer.png
rename to res/drawable-mdpi-finger/stat_notify_musicplayer.png
Binary files differ
diff --git a/res/drawable/app_music.png b/res/drawable-mdpi/app_music.png
similarity index 100%
rename from res/drawable/app_music.png
rename to res/drawable-mdpi/app_music.png
Binary files differ
diff --git a/res/drawable/app_video.png b/res/drawable-mdpi/app_video.png
similarity index 100%
rename from res/drawable/app_video.png
rename to res/drawable-mdpi/app_video.png
Binary files differ
diff --git a/res/drawable/ic_launcher_shortcut_music_playlist.png b/res/drawable-mdpi/ic_launcher_shortcut_music_playlist.png
similarity index 100%
rename from res/drawable/ic_launcher_shortcut_music_playlist.png
rename to res/drawable-mdpi/ic_launcher_shortcut_music_playlist.png
Binary files differ
diff --git a/res/drawable/midi.png b/res/drawable-mdpi/midi.png
similarity index 100%
rename from res/drawable/midi.png
rename to res/drawable-mdpi/midi.png
Binary files differ
diff --git a/res/drawable/movie.png b/res/drawable-mdpi/movie.png
similarity index 100%
rename from res/drawable/movie.png
rename to res/drawable-mdpi/movie.png
Binary files differ
diff --git a/res/values-keyshidden/strings.xml b/res/values-keyshidden/strings.xml
index b086fd0..bf01724 100644
--- a/res/values-keyshidden/strings.xml
+++ b/res/values-keyshidden/strings.xml
@@ -19,11 +19,11 @@
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<!-- Prompt in dialog when creating a playlist and the keyboard is closed. -->
- <string name="create_playlist_create_text_prompt">Open the keyboard to give your new Playlist a name, or select Save to name it \"%s\".</string>
+ <string name="create_playlist_create_text_prompt">Open the keyboard to give your new Playlist a name, or select Save to name it \"<xliff:g id="playlist" example="Favorite Songs">%s</xliff:g>\".</string>
<!-- Prompt in dialog when renaming a playlist, and the entered name is the same as the old one. -->
<string name="rename_playlist_same_prompt">Open the keyboard to give playlist \"<xliff:g id="playlist">%s</xliff:g>\" a new name.</string>
<!-- Prompt in dialog when renaming a playlist, and the entered name is different from the old one. -->
- <string name="rename_playlist_diff_prompt">Open the keyboard to give playlist \"<xliff:g id="playlist">%s</xliff:g>\" a new name, or select Save to name it \"%s\".</string>
+ <string name="rename_playlist_diff_prompt">Open the keyboard to give playlist \"<xliff:g id="playlist">%1$s</xliff:g>\" a new name, or select Save to name it \"<xliff:g id="name" example="Favorite Songs">%2$s</xliff:g>\".</string>
</resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index c51e37b..f5e509c 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -171,7 +171,7 @@
<!-- Menu item -->
<string name="ringtone_menu_short">Use as ringtone</string>
<!-- Toast after setting a song as phone ringtone -->
- <string name="ringtone_set">\"%s\" set as phone ringtone.</string>
+ <string name="ringtone_set">\"<xliff:g id="name" example="Alarm Bell">%s</xliff:g>\" set as phone ringtone.</string>
<!-- Context menu item -->
<string name="play_selection">Play</string>
<!-- Context menu item -->
@@ -187,7 +187,7 @@
<!-- message shown when one song was added -->
<item quantity="one">1 song added to playlist.</item>
<!-- message shown when zero or more than one song was added -->
- <item quantity="other">%d songs added to playlist.</item>
+ <item quantity="other"><xliff:g id="number" example="27">%d</xliff:g> songs added to playlist.</item>
</plurals>
<!-- Toast after selecting an empty playlist -->
<string name="emptyplaylist">Selected playlist is empty.</string>
@@ -255,7 +255,7 @@
<string name="streamloadingtext">Connecting to <xliff:g id="host">%s</xliff:g></string>
<!-- title of contextual music search menu -->
- <string name="mediasearch">Search for %s using:</string>
+ <string name="mediasearch">Search for <xliff:g id="term" example="Beethoven">%s</xliff:g> using:</string>
<!-- Shown in the title bar while the list of artists is being retrieved in the background -->
<string name="working_artists">Artists\u2026</string>
