Merge "Automatic translation import" into cm-13.0
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index b499ded..ca66b2e 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -16,12 +16,12 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.cyanogenmod.eleven"
- android:versionCode="2"
- android:versionName="2.0" >
+ android:versionCode="3"
+ android:versionName="3.0" >
<uses-sdk
- android:minSdkVersion="21"
- android:targetSdkVersion="21" />
+ android:minSdkVersion="22"
+ android:targetSdkVersion="22" />
<!-- Used for caching and creating new playlists -->
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
diff --git a/assets/RobotoLight.ttf b/assets/RobotoLight.ttf
deleted file mode 100644
index d43e943..0000000
--- a/assets/RobotoLight.ttf
+++ /dev/null
Binary files differ
diff --git a/assets/RobotoThin.ttf b/assets/RobotoThin.ttf
deleted file mode 100644
index 861d63a..0000000
--- a/assets/RobotoThin.ttf
+++ /dev/null
Binary files differ
diff --git a/assets/licenses.html b/assets/licenses.html
index e238ddc..53d4128 100644
--- a/assets/licenses.html
+++ b/assets/licenses.html
@@ -1,4 +1,4 @@
-<html><head><style> body { font-family: sans-serif; } pre { background-color: #eeeeee; padding: 1em; white-space: pre-wrap; } </style></head><body>
+<html><head><style> body { } pre { background-color: #eeeeee; padding: 1em; white-space: pre-wrap; } </style></head><body>
<h3>Notices for files:</h3>
<ul>
<li>ActionBarSherlock</li>
diff --git a/res/color/tab_text_color.xml b/res/color/tab_text_color.xml
index c22b81d..ae8d73c 100644
--- a/res/color/tab_text_color.xml
+++ b/res/color/tab_text_color.xml
@@ -16,6 +16,6 @@
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:color="@color/white" android:state_selected="true"/>
+ <item android:color="@color/header_action_bar_text_color_active" android:state_selected="true"/>
<item android:color="@color/header_action_bar_text_color" />
</selector>
diff --git a/res/drawable-hdpi/appwidget_bg.9.png b/res/drawable-hdpi/appwidget_bg.9.png
deleted file mode 100644
index 6bacc7f..0000000
--- a/res/drawable-hdpi/appwidget_bg.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/bg_stripes_dark.png b/res/drawable-hdpi/bg_stripes_dark.png
deleted file mode 100644
index 4b61fb2..0000000
--- a/res/drawable-hdpi/bg_stripes_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/btn_add_to_playlist.png b/res/drawable-hdpi/btn_add_to_playlist.png
deleted file mode 100644
index 4eefbf7..0000000
--- a/res/drawable-hdpi/btn_add_to_playlist.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/btn_header_collapse.png b/res/drawable-hdpi/btn_header_collapse.png
deleted file mode 100644
index 73ff888..0000000
--- a/res/drawable-hdpi/btn_header_collapse.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/btn_notification_collapse.png b/res/drawable-hdpi/btn_notification_collapse.png
deleted file mode 100644
index 5b04d33..0000000
--- a/res/drawable-hdpi/btn_notification_collapse.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/btn_playback_browse.png b/res/drawable-hdpi/btn_playback_browse.png
deleted file mode 100644
index 7acd76e..0000000
--- a/res/drawable-hdpi/btn_playback_browse.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/btn_playback_icon.png b/res/drawable-hdpi/btn_playback_icon.png
deleted file mode 100644
index bd7af90..0000000
--- a/res/drawable-hdpi/btn_playback_icon.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/btn_playback_next.png b/res/drawable-hdpi/btn_playback_next.png
deleted file mode 100644
index 2312786..0000000
--- a/res/drawable-hdpi/btn_playback_next.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/btn_playback_pause.png b/res/drawable-hdpi/btn_playback_pause.png
deleted file mode 100755
index 649d1fb..0000000
--- a/res/drawable-hdpi/btn_playback_pause.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/btn_playback_play.png b/res/drawable-hdpi/btn_playback_play.png
deleted file mode 100644
index 77e6208..0000000
--- a/res/drawable-hdpi/btn_playback_play.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/btn_playback_previous.png b/res/drawable-hdpi/btn_playback_previous.png
deleted file mode 100644
index 70a00bd..0000000
--- a/res/drawable-hdpi/btn_playback_previous.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/btn_playback_repeat_all.png b/res/drawable-hdpi/btn_playback_repeat_all.png
deleted file mode 100644
index c735255..0000000
--- a/res/drawable-hdpi/btn_playback_repeat_all.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/btn_playback_repeat_one.png b/res/drawable-hdpi/btn_playback_repeat_one.png
deleted file mode 100644
index 8969c3c..0000000
--- a/res/drawable-hdpi/btn_playback_repeat_one.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/btn_playback_shuffle_all.png b/res/drawable-hdpi/btn_playback_shuffle_all.png
deleted file mode 100644
index b4a0481..0000000
--- a/res/drawable-hdpi/btn_playback_shuffle_all.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/btn_queue_icon.png b/res/drawable-hdpi/btn_queue_icon.png
deleted file mode 100644
index d03d043..0000000
--- a/res/drawable-hdpi/btn_queue_icon.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/default_artwork.png b/res/drawable-hdpi/default_artwork.png
index 18c2167..ce6cd65 100755
--- a/res/drawable-hdpi/default_artwork.png
+++ b/res/drawable-hdpi/default_artwork.png
Binary files differ
diff --git a/res/drawable-hdpi/drag_indicator.png b/res/drawable-hdpi/drag_indicator.png
deleted file mode 100644
index 891c247..0000000
--- a/res/drawable-hdpi/drag_indicator.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/gripper.png b/res/drawable-hdpi/gripper.png
deleted file mode 100644
index f790d6c..0000000
--- a/res/drawable-hdpi/gripper.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/gripper_light.png b/res/drawable-hdpi/gripper_light.png
deleted file mode 100644
index e4aa20a..0000000
--- a/res/drawable-hdpi/gripper_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/history_icon.png b/res/drawable-hdpi/history_icon.png
deleted file mode 100644
index ec76e2c..0000000
--- a/res/drawable-hdpi/history_icon.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_action_search.png b/res/drawable-hdpi/ic_action_search.png
deleted file mode 100644
index b0ff737..0000000
--- a/res/drawable-hdpi/ic_action_search.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_album.png b/res/drawable-hdpi/ic_album.png
index 3d2c389..c059733 100644
--- a/res/drawable-hdpi/ic_album.png
+++ b/res/drawable-hdpi/ic_album.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_album_lg.png b/res/drawable-hdpi/ic_album_lg.png
index 989d0b6..3d34a6f 100644
--- a/res/drawable-hdpi/ic_album_lg.png
+++ b/res/drawable-hdpi/ic_album_lg.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_artist.png b/res/drawable-hdpi/ic_artist.png
index b839a8b..4a84573 100644
--- a/res/drawable-hdpi/ic_artist.png
+++ b/res/drawable-hdpi/ic_artist.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_artist_lg.png b/res/drawable-hdpi/ic_artist_lg.png
index ef38a96..3931106 100644
--- a/res/drawable-hdpi/ic_artist_lg.png
+++ b/res/drawable-hdpi/ic_artist_lg.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_playlist.png b/res/drawable-hdpi/ic_playlist.png
index 74876fa..d5798de 100644
--- a/res/drawable-hdpi/ic_playlist.png
+++ b/res/drawable-hdpi/ic_playlist.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_playlist_lg.png b/res/drawable-hdpi/ic_playlist_lg.png
index bb9a734..3a4be49 100644
--- a/res/drawable-hdpi/ic_playlist_lg.png
+++ b/res/drawable-hdpi/ic_playlist_lg.png
Binary files differ
diff --git a/res/drawable-hdpi/menu_background.9.png b/res/drawable-hdpi/menu_background.9.png
deleted file mode 100755
index 0ce0f0c..0000000
--- a/res/drawable-hdpi/menu_background.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/menu_button.png b/res/drawable-hdpi/menu_button.png
deleted file mode 100644
index e00063e..0000000
--- a/res/drawable-hdpi/menu_button.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/menu_button_light.png b/res/drawable-hdpi/menu_button_light.png
deleted file mode 100644
index c640606..0000000
--- a/res/drawable-hdpi/menu_button_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/now_playing_icon.png b/res/drawable-hdpi/now_playing_icon.png
deleted file mode 100644
index 120ad41..0000000
--- a/res/drawable-hdpi/now_playing_icon.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/playlist_icon.png b/res/drawable-hdpi/playlist_icon.png
deleted file mode 100644
index 3ddc5c1..0000000
--- a/res/drawable-hdpi/playlist_icon.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/playlist_tile_normal.9.png b/res/drawable-hdpi/playlist_tile_normal.9.png
deleted file mode 100644
index c6726bc..0000000
--- a/res/drawable-hdpi/playlist_tile_normal.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/recent_icon.png b/res/drawable-hdpi/recent_icon.png
deleted file mode 100644
index 4597a39..0000000
--- a/res/drawable-hdpi/recent_icon.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/recently_added.png b/res/drawable-hdpi/recently_added.png
deleted file mode 100644
index a93350a..0000000
--- a/res/drawable-hdpi/recently_added.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/scrubber_primary_holo.9.png b/res/drawable-hdpi/scrubber_primary_holo.9.png
deleted file mode 100644
index eb8b3ab..0000000
--- a/res/drawable-hdpi/scrubber_primary_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/scrubber_secondary_holo.9.png b/res/drawable-hdpi/scrubber_secondary_holo.9.png
deleted file mode 100644
index 3a0ca29..0000000
--- a/res/drawable-hdpi/scrubber_secondary_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/scrubber_track_holo_dark.9.png b/res/drawable-hdpi/scrubber_track_holo_dark.9.png
deleted file mode 100644
index 0c0ccda..0000000
--- a/res/drawable-hdpi/scrubber_track_holo_dark.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/stopwatch_icon_small_grey.png b/res/drawable-hdpi/stopwatch_icon_small_grey.png
deleted file mode 100644
index ab2aa7e..0000000
--- a/res/drawable-hdpi/stopwatch_icon_small_grey.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/stopwatch_icon_white.png b/res/drawable-hdpi/stopwatch_icon_white.png
deleted file mode 100644
index 2f58d01..0000000
--- a/res/drawable-hdpi/stopwatch_icon_white.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/top_tracks_icon.png b/res/drawable-hdpi/top_tracks_icon.png
deleted file mode 100644
index 6f2ce18..0000000
--- a/res/drawable-hdpi/top_tracks_icon.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/view_pager_background_texture.png b/res/drawable-hdpi/view_pager_background_texture.png
deleted file mode 100644
index e8cd304..0000000
--- a/res/drawable-hdpi/view_pager_background_texture.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/white_note.png b/res/drawable-hdpi/white_note.png
deleted file mode 100644
index 57a8351..0000000
--- a/res/drawable-hdpi/white_note.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/appwidget_bg.9.png b/res/drawable-mdpi/appwidget_bg.9.png
deleted file mode 100644
index 09309a9..0000000
--- a/res/drawable-mdpi/appwidget_bg.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/bg_stripes_dark.png b/res/drawable-mdpi/bg_stripes_dark.png
deleted file mode 100644
index 4b61fb2..0000000
--- a/res/drawable-mdpi/bg_stripes_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/btn_add_to_playlist.png b/res/drawable-mdpi/btn_add_to_playlist.png
deleted file mode 100644
index cbd99df..0000000
--- a/res/drawable-mdpi/btn_add_to_playlist.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/btn_header_collapse.png b/res/drawable-mdpi/btn_header_collapse.png
deleted file mode 100644
index f2d899c..0000000
--- a/res/drawable-mdpi/btn_header_collapse.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/btn_notification_collapse.png b/res/drawable-mdpi/btn_notification_collapse.png
deleted file mode 100644
index 1b4c46f..0000000
--- a/res/drawable-mdpi/btn_notification_collapse.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/btn_playback_browse.png b/res/drawable-mdpi/btn_playback_browse.png
deleted file mode 100644
index 7e9cfa9..0000000
--- a/res/drawable-mdpi/btn_playback_browse.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/btn_playback_icon.png b/res/drawable-mdpi/btn_playback_icon.png
deleted file mode 100644
index 0fedf6a..0000000
--- a/res/drawable-mdpi/btn_playback_icon.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/btn_playback_next.png b/res/drawable-mdpi/btn_playback_next.png
deleted file mode 100644
index 74cd2f8..0000000
--- a/res/drawable-mdpi/btn_playback_next.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/btn_playback_pause.png b/res/drawable-mdpi/btn_playback_pause.png
deleted file mode 100755
index 7920931..0000000
--- a/res/drawable-mdpi/btn_playback_pause.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/btn_playback_play.png b/res/drawable-mdpi/btn_playback_play.png
deleted file mode 100644
index 6a0e7e8..0000000
--- a/res/drawable-mdpi/btn_playback_play.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/btn_playback_previous.png b/res/drawable-mdpi/btn_playback_previous.png
deleted file mode 100644
index 6f3a2f8..0000000
--- a/res/drawable-mdpi/btn_playback_previous.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/btn_playback_repeat_all.png b/res/drawable-mdpi/btn_playback_repeat_all.png
deleted file mode 100644
index 91e657f..0000000
--- a/res/drawable-mdpi/btn_playback_repeat_all.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/btn_playback_repeat_one.png b/res/drawable-mdpi/btn_playback_repeat_one.png
deleted file mode 100644
index f1713df..0000000
--- a/res/drawable-mdpi/btn_playback_repeat_one.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/btn_playback_shuffle_all.png b/res/drawable-mdpi/btn_playback_shuffle_all.png
deleted file mode 100644
index 3b0dd98..0000000
--- a/res/drawable-mdpi/btn_playback_shuffle_all.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/btn_queue_icon.png b/res/drawable-mdpi/btn_queue_icon.png
deleted file mode 100644
index 4325090..0000000
--- a/res/drawable-mdpi/btn_queue_icon.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/drag_indicator.png b/res/drawable-mdpi/drag_indicator.png
deleted file mode 100644
index 66ef352..0000000
--- a/res/drawable-mdpi/drag_indicator.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/gripper.png b/res/drawable-mdpi/gripper.png
deleted file mode 100644
index f31ce11..0000000
--- a/res/drawable-mdpi/gripper.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/gripper_light.png b/res/drawable-mdpi/gripper_light.png
deleted file mode 100644
index 47ac1ed..0000000
--- a/res/drawable-mdpi/gripper_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/history_icon.png b/res/drawable-mdpi/history_icon.png
deleted file mode 100644
index 808c72e..0000000
--- a/res/drawable-mdpi/history_icon.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_action_search.png b/res/drawable-mdpi/ic_action_search.png
deleted file mode 100644
index ade1a01..0000000
--- a/res/drawable-mdpi/ic_action_search.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/menu_background.9.png b/res/drawable-mdpi/menu_background.9.png
deleted file mode 100755
index dd82e40..0000000
--- a/res/drawable-mdpi/menu_background.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/menu_button.png b/res/drawable-mdpi/menu_button.png
deleted file mode 100644
index 6757f90..0000000
--- a/res/drawable-mdpi/menu_button.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/menu_button_light.png b/res/drawable-mdpi/menu_button_light.png
deleted file mode 100644
index 9d63177..0000000
--- a/res/drawable-mdpi/menu_button_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/now_playing_icon.png b/res/drawable-mdpi/now_playing_icon.png
deleted file mode 100644
index 6982e4e..0000000
--- a/res/drawable-mdpi/now_playing_icon.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/playlist_icon.png b/res/drawable-mdpi/playlist_icon.png
deleted file mode 100644
index cbcfa6c..0000000
--- a/res/drawable-mdpi/playlist_icon.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/playlist_tile_normal.9.png b/res/drawable-mdpi/playlist_tile_normal.9.png
deleted file mode 100644
index 3d2cebf..0000000
--- a/res/drawable-mdpi/playlist_tile_normal.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/recent_icon.png b/res/drawable-mdpi/recent_icon.png
deleted file mode 100644
index da40947..0000000
--- a/res/drawable-mdpi/recent_icon.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/recently_added.png b/res/drawable-mdpi/recently_added.png
deleted file mode 100644
index ac679b0..0000000
--- a/res/drawable-mdpi/recently_added.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/scrubber_primary_holo.9.png b/res/drawable-mdpi/scrubber_primary_holo.9.png
deleted file mode 100644
index aa2e382..0000000
--- a/res/drawable-mdpi/scrubber_primary_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/scrubber_secondary_holo.9.png b/res/drawable-mdpi/scrubber_secondary_holo.9.png
deleted file mode 100644
index 9a2f058..0000000
--- a/res/drawable-mdpi/scrubber_secondary_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/scrubber_track_holo_dark.9.png b/res/drawable-mdpi/scrubber_track_holo_dark.9.png
deleted file mode 100644
index b91a4ee..0000000
--- a/res/drawable-mdpi/scrubber_track_holo_dark.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/stopwatch_icon_small_grey.png b/res/drawable-mdpi/stopwatch_icon_small_grey.png
deleted file mode 100644
index e3cf1f4..0000000
--- a/res/drawable-mdpi/stopwatch_icon_small_grey.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/stopwatch_icon_white.png b/res/drawable-mdpi/stopwatch_icon_white.png
deleted file mode 100644
index a1a81f2..0000000
--- a/res/drawable-mdpi/stopwatch_icon_white.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/top_tracks_icon.png b/res/drawable-mdpi/top_tracks_icon.png
deleted file mode 100644
index 5d18561..0000000
--- a/res/drawable-mdpi/top_tracks_icon.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/view_pager_background_texture.png b/res/drawable-mdpi/view_pager_background_texture.png
deleted file mode 100644
index 60bbbba..0000000
--- a/res/drawable-mdpi/view_pager_background_texture.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/white_note.png b/res/drawable-mdpi/white_note.png
deleted file mode 100644
index c00b08b..0000000
--- a/res/drawable-mdpi/white_note.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-nodpi/app_widget_large.png b/res/drawable-nodpi/app_widget_large.png
deleted file mode 100644
index 21bc085..0000000
--- a/res/drawable-nodpi/app_widget_large.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-nodpi/app_widget_large_alternate.png b/res/drawable-nodpi/app_widget_large_alternate.png
deleted file mode 100644
index 8aad5a3..0000000
--- a/res/drawable-nodpi/app_widget_large_alternate.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-nodpi/app_widget_recents.png b/res/drawable-nodpi/app_widget_recents.png
deleted file mode 100644
index ecf7be1..0000000
--- a/res/drawable-nodpi/app_widget_recents.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-nodpi/app_widget_recents_stack_preview.png b/res/drawable-nodpi/app_widget_recents_stack_preview.png
deleted file mode 100644
index a8f7af7..0000000
--- a/res/drawable-nodpi/app_widget_recents_stack_preview.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-nodpi/app_widget_small.png b/res/drawable-nodpi/app_widget_small.png
deleted file mode 100644
index ad45f05..0000000
--- a/res/drawable-nodpi/app_widget_small.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-nodpi/background_holo_dark.png b/res/drawable-nodpi/background_holo_dark.png
deleted file mode 100644
index 85bd6f7..0000000
--- a/res/drawable-nodpi/background_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-nodpi/theme_preview.png b/res/drawable-nodpi/theme_preview.png
deleted file mode 100644
index d94bb0b..0000000
--- a/res/drawable-nodpi/theme_preview.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/appwidget_bg.9.png b/res/drawable-xhdpi/appwidget_bg.9.png
deleted file mode 100644
index 900859c..0000000
--- a/res/drawable-xhdpi/appwidget_bg.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/bg_stripes_dark.png b/res/drawable-xhdpi/bg_stripes_dark.png
deleted file mode 100644
index 76aab7c..0000000
--- a/res/drawable-xhdpi/bg_stripes_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/btn_add_to_playlist.png b/res/drawable-xhdpi/btn_add_to_playlist.png
deleted file mode 100644
index 7c3a5ab..0000000
--- a/res/drawable-xhdpi/btn_add_to_playlist.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/btn_header_collapse.png b/res/drawable-xhdpi/btn_header_collapse.png
deleted file mode 100644
index 2eeb27f..0000000
--- a/res/drawable-xhdpi/btn_header_collapse.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/btn_notification_collapse.png b/res/drawable-xhdpi/btn_notification_collapse.png
deleted file mode 100644
index 5dfcf1c..0000000
--- a/res/drawable-xhdpi/btn_notification_collapse.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/btn_playback_browse.png b/res/drawable-xhdpi/btn_playback_browse.png
deleted file mode 100644
index 6bbad2a..0000000
--- a/res/drawable-xhdpi/btn_playback_browse.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/btn_playback_icon.png b/res/drawable-xhdpi/btn_playback_icon.png
deleted file mode 100644
index efa95bb..0000000
--- a/res/drawable-xhdpi/btn_playback_icon.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/btn_playback_next.png b/res/drawable-xhdpi/btn_playback_next.png
deleted file mode 100644
index 9c1e0ec..0000000
--- a/res/drawable-xhdpi/btn_playback_next.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/btn_playback_pause.png b/res/drawable-xhdpi/btn_playback_pause.png
deleted file mode 100755
index 8dd321d..0000000
--- a/res/drawable-xhdpi/btn_playback_pause.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/btn_playback_play.png b/res/drawable-xhdpi/btn_playback_play.png
deleted file mode 100644
index 4488d4b..0000000
--- a/res/drawable-xhdpi/btn_playback_play.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/btn_playback_previous.png b/res/drawable-xhdpi/btn_playback_previous.png
deleted file mode 100644
index aded11f..0000000
--- a/res/drawable-xhdpi/btn_playback_previous.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/btn_playback_repeat_all.png b/res/drawable-xhdpi/btn_playback_repeat_all.png
deleted file mode 100644
index f4cef56..0000000
--- a/res/drawable-xhdpi/btn_playback_repeat_all.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/btn_playback_repeat_one.png b/res/drawable-xhdpi/btn_playback_repeat_one.png
deleted file mode 100644
index 8048b4e..0000000
--- a/res/drawable-xhdpi/btn_playback_repeat_one.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/btn_playback_shuffle_all.png b/res/drawable-xhdpi/btn_playback_shuffle_all.png
deleted file mode 100644
index 0ff91ab..0000000
--- a/res/drawable-xhdpi/btn_playback_shuffle_all.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/btn_queue_icon.png b/res/drawable-xhdpi/btn_queue_icon.png
deleted file mode 100644
index d5a0fd2..0000000
--- a/res/drawable-xhdpi/btn_queue_icon.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/default_artwork.png b/res/drawable-xhdpi/default_artwork.png
index 482afe4..d68d94f 100755
--- a/res/drawable-xhdpi/default_artwork.png
+++ b/res/drawable-xhdpi/default_artwork.png
Binary files differ
diff --git a/res/drawable-xhdpi/drag_indicator.png b/res/drawable-xhdpi/drag_indicator.png
deleted file mode 100644
index 509864f..0000000
--- a/res/drawable-xhdpi/drag_indicator.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/gripper.png b/res/drawable-xhdpi/gripper.png
deleted file mode 100644
index a175e45..0000000
--- a/res/drawable-xhdpi/gripper.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/gripper_light.png b/res/drawable-xhdpi/gripper_light.png
deleted file mode 100644
index 90e4529..0000000
--- a/res/drawable-xhdpi/gripper_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/history_icon.png b/res/drawable-xhdpi/history_icon.png
deleted file mode 100644
index 700b172..0000000
--- a/res/drawable-xhdpi/history_icon.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_action_search.png b/res/drawable-xhdpi/ic_action_search.png
deleted file mode 100644
index cc03f6d..0000000
--- a/res/drawable-xhdpi/ic_action_search.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_album.png b/res/drawable-xhdpi/ic_album.png
index 7e259f7..d7025cf 100644
--- a/res/drawable-xhdpi/ic_album.png
+++ b/res/drawable-xhdpi/ic_album.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_album_lg.png b/res/drawable-xhdpi/ic_album_lg.png
index 68cb298..1b50d84 100644
--- a/res/drawable-xhdpi/ic_album_lg.png
+++ b/res/drawable-xhdpi/ic_album_lg.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_artist.png b/res/drawable-xhdpi/ic_artist.png
index 43a3e43..7232871 100644
--- a/res/drawable-xhdpi/ic_artist.png
+++ b/res/drawable-xhdpi/ic_artist.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_artist_lg.png b/res/drawable-xhdpi/ic_artist_lg.png
index 849957e..4429a35 100644
--- a/res/drawable-xhdpi/ic_artist_lg.png
+++ b/res/drawable-xhdpi/ic_artist_lg.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_playlist.png b/res/drawable-xhdpi/ic_playlist.png
index 22defcc..e72ce31 100644
--- a/res/drawable-xhdpi/ic_playlist.png
+++ b/res/drawable-xhdpi/ic_playlist.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_playlist_lg.png b/res/drawable-xhdpi/ic_playlist_lg.png
index d1ccedd..4da86c1 100644
--- a/res/drawable-xhdpi/ic_playlist_lg.png
+++ b/res/drawable-xhdpi/ic_playlist_lg.png
Binary files differ
diff --git a/res/drawable-xhdpi/menu_background.9.png b/res/drawable-xhdpi/menu_background.9.png
deleted file mode 100755
index 8e9d515..0000000
--- a/res/drawable-xhdpi/menu_background.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/menu_button.png b/res/drawable-xhdpi/menu_button.png
deleted file mode 100644
index 7970331..0000000
--- a/res/drawable-xhdpi/menu_button.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/menu_button_light.png b/res/drawable-xhdpi/menu_button_light.png
deleted file mode 100644
index 67fdc8c..0000000
--- a/res/drawable-xhdpi/menu_button_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/now_playing_icon.png b/res/drawable-xhdpi/now_playing_icon.png
deleted file mode 100644
index ed409dc..0000000
--- a/res/drawable-xhdpi/now_playing_icon.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/playlist_icon.png b/res/drawable-xhdpi/playlist_icon.png
deleted file mode 100644
index 8f018dc..0000000
--- a/res/drawable-xhdpi/playlist_icon.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/playlist_tile_normal.9.png b/res/drawable-xhdpi/playlist_tile_normal.9.png
deleted file mode 100644
index 296399c..0000000
--- a/res/drawable-xhdpi/playlist_tile_normal.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/recent_icon.png b/res/drawable-xhdpi/recent_icon.png
deleted file mode 100644
index 7c59430..0000000
--- a/res/drawable-xhdpi/recent_icon.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/recently_added.png b/res/drawable-xhdpi/recently_added.png
deleted file mode 100644
index 7fdef13..0000000
--- a/res/drawable-xhdpi/recently_added.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/scrubber_primary_holo.9.png b/res/drawable-xhdpi/scrubber_primary_holo.9.png
deleted file mode 100644
index 0fc5305..0000000
--- a/res/drawable-xhdpi/scrubber_primary_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/scrubber_secondary_holo.9.png b/res/drawable-xhdpi/scrubber_secondary_holo.9.png
deleted file mode 100644
index 1c356da..0000000
--- a/res/drawable-xhdpi/scrubber_secondary_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/scrubber_track_holo_dark.9.png b/res/drawable-xhdpi/scrubber_track_holo_dark.9.png
deleted file mode 100644
index bfb2048..0000000
--- a/res/drawable-xhdpi/scrubber_track_holo_dark.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/stopwatch_icon_small_grey.png b/res/drawable-xhdpi/stopwatch_icon_small_grey.png
deleted file mode 100644
index 3a0d75f..0000000
--- a/res/drawable-xhdpi/stopwatch_icon_small_grey.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/stopwatch_icon_white.png b/res/drawable-xhdpi/stopwatch_icon_white.png
deleted file mode 100644
index 0cd5467..0000000
--- a/res/drawable-xhdpi/stopwatch_icon_white.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/top_tracks_icon.png b/res/drawable-xhdpi/top_tracks_icon.png
deleted file mode 100644
index 0f401d4..0000000
--- a/res/drawable-xhdpi/top_tracks_icon.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/view_pager_background_texture.png b/res/drawable-xhdpi/view_pager_background_texture.png
deleted file mode 100644
index 8b85814..0000000
--- a/res/drawable-xhdpi/view_pager_background_texture.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/white_note.png b/res/drawable-xhdpi/white_note.png
deleted file mode 100644
index 6c512be..0000000
--- a/res/drawable-xhdpi/white_note.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/btn_add_to_playlist.png b/res/drawable-xxhdpi/btn_add_to_playlist.png
deleted file mode 100644
index 8290f78..0000000
--- a/res/drawable-xxhdpi/btn_add_to_playlist.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/btn_header_collapse.png b/res/drawable-xxhdpi/btn_header_collapse.png
deleted file mode 100644
index 7f97d5f..0000000
--- a/res/drawable-xxhdpi/btn_header_collapse.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/btn_playback_browse.png b/res/drawable-xxhdpi/btn_playback_browse.png
deleted file mode 100644
index 0c5180e..0000000
--- a/res/drawable-xxhdpi/btn_playback_browse.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/btn_playback_icon.png b/res/drawable-xxhdpi/btn_playback_icon.png
deleted file mode 100644
index c8e8f73..0000000
--- a/res/drawable-xxhdpi/btn_playback_icon.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/btn_playback_next.png b/res/drawable-xxhdpi/btn_playback_next.png
deleted file mode 100644
index aa49fd0..0000000
--- a/res/drawable-xxhdpi/btn_playback_next.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/btn_playback_pause.png b/res/drawable-xxhdpi/btn_playback_pause.png
deleted file mode 100755
index 015af14..0000000
--- a/res/drawable-xxhdpi/btn_playback_pause.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/btn_playback_play.png b/res/drawable-xxhdpi/btn_playback_play.png
deleted file mode 100644
index 73f59a4..0000000
--- a/res/drawable-xxhdpi/btn_playback_play.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/btn_playback_previous.png b/res/drawable-xxhdpi/btn_playback_previous.png
deleted file mode 100644
index dcbd806..0000000
--- a/res/drawable-xxhdpi/btn_playback_previous.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/btn_playback_repeat_all.png b/res/drawable-xxhdpi/btn_playback_repeat_all.png
deleted file mode 100644
index fd43fd3..0000000
--- a/res/drawable-xxhdpi/btn_playback_repeat_all.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/btn_playback_repeat_one.png b/res/drawable-xxhdpi/btn_playback_repeat_one.png
deleted file mode 100644
index ab7f0c9..0000000
--- a/res/drawable-xxhdpi/btn_playback_repeat_one.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/btn_playback_shuffle_all.png b/res/drawable-xxhdpi/btn_playback_shuffle_all.png
deleted file mode 100644
index 08fa572..0000000
--- a/res/drawable-xxhdpi/btn_playback_shuffle_all.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/btn_queue_icon.png b/res/drawable-xxhdpi/btn_queue_icon.png
deleted file mode 100644
index 04eaa9c..0000000
--- a/res/drawable-xxhdpi/btn_queue_icon.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/default_artwork.png b/res/drawable-xxhdpi/default_artwork.png
index 3f4fa4c..72b0381 100644
--- a/res/drawable-xxhdpi/default_artwork.png
+++ b/res/drawable-xxhdpi/default_artwork.png
Binary files differ
diff --git a/res/drawable-xxhdpi/drag_indicator.png b/res/drawable-xxhdpi/drag_indicator.png
deleted file mode 100644
index 1b37242..0000000
--- a/res/drawable-xxhdpi/drag_indicator.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/gripper.png b/res/drawable-xxhdpi/gripper.png
deleted file mode 100644
index 1ebf658..0000000
--- a/res/drawable-xxhdpi/gripper.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/gripper_light.png b/res/drawable-xxhdpi/gripper_light.png
deleted file mode 100644
index 6092718..0000000
--- a/res/drawable-xxhdpi/gripper_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/history_icon.png b/res/drawable-xxhdpi/history_icon.png
deleted file mode 100644
index 6fef335..0000000
--- a/res/drawable-xxhdpi/history_icon.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_action_search.png b/res/drawable-xxhdpi/ic_action_search.png
deleted file mode 100644
index 15ee9a3..0000000
--- a/res/drawable-xxhdpi/ic_action_search.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_album.png b/res/drawable-xxhdpi/ic_album.png
index a87c660..84c5678 100644
--- a/res/drawable-xxhdpi/ic_album.png
+++ b/res/drawable-xxhdpi/ic_album.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_album_lg.png b/res/drawable-xxhdpi/ic_album_lg.png
index 022b098..1b09e9c 100644
--- a/res/drawable-xxhdpi/ic_album_lg.png
+++ b/res/drawable-xxhdpi/ic_album_lg.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_artist.png b/res/drawable-xxhdpi/ic_artist.png
index 6dc97ef..fa94bab 100644
--- a/res/drawable-xxhdpi/ic_artist.png
+++ b/res/drawable-xxhdpi/ic_artist.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_artist_lg.png b/res/drawable-xxhdpi/ic_artist_lg.png
index b3eb2fd..f232ded 100644
--- a/res/drawable-xxhdpi/ic_artist_lg.png
+++ b/res/drawable-xxhdpi/ic_artist_lg.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_playlist.png b/res/drawable-xxhdpi/ic_playlist.png
index 76280f9..ce94de0 100644
--- a/res/drawable-xxhdpi/ic_playlist.png
+++ b/res/drawable-xxhdpi/ic_playlist.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_playlist_lg.png b/res/drawable-xxhdpi/ic_playlist_lg.png
index c082480..8c83309 100644
--- a/res/drawable-xxhdpi/ic_playlist_lg.png
+++ b/res/drawable-xxhdpi/ic_playlist_lg.png
Binary files differ
diff --git a/res/drawable-xxhdpi/menu_background.9.png b/res/drawable-xxhdpi/menu_background.9.png
deleted file mode 100755
index 1693f5f..0000000
--- a/res/drawable-xxhdpi/menu_background.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/menu_button.png b/res/drawable-xxhdpi/menu_button.png
deleted file mode 100644
index 8eac8ef..0000000
--- a/res/drawable-xxhdpi/menu_button.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/now_playing_icon.png b/res/drawable-xxhdpi/now_playing_icon.png
deleted file mode 100644
index 2792c21..0000000
--- a/res/drawable-xxhdpi/now_playing_icon.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/playlist_icon.png b/res/drawable-xxhdpi/playlist_icon.png
deleted file mode 100644
index 1be226b..0000000
--- a/res/drawable-xxhdpi/playlist_icon.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/recent_icon.png b/res/drawable-xxhdpi/recent_icon.png
deleted file mode 100644
index dbe5daf..0000000
--- a/res/drawable-xxhdpi/recent_icon.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/recently_added.png b/res/drawable-xxhdpi/recently_added.png
deleted file mode 100644
index e626b05..0000000
--- a/res/drawable-xxhdpi/recently_added.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/stopwatch_icon_small_grey.png b/res/drawable-xxhdpi/stopwatch_icon_small_grey.png
deleted file mode 100644
index 9b4db72..0000000
--- a/res/drawable-xxhdpi/stopwatch_icon_small_grey.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/stopwatch_icon_white.png b/res/drawable-xxhdpi/stopwatch_icon_white.png
deleted file mode 100644
index 2f4059a..0000000
--- a/res/drawable-xxhdpi/stopwatch_icon_white.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/top_tracks_icon.png b/res/drawable-xxhdpi/top_tracks_icon.png
deleted file mode 100644
index da4e919..0000000
--- a/res/drawable-xxhdpi/top_tracks_icon.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/white_note.png b/res/drawable-xxhdpi/white_note.png
deleted file mode 100644
index a3f2792..0000000
--- a/res/drawable-xxhdpi/white_note.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable/audio_player_seekbar.xml b/res/drawable/audio_player_seekbar.xml
deleted file mode 100644
index e06eb59..0000000
--- a/res/drawable/audio_player_seekbar.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Copyright (C) 2012 Andrew Neal
- Copyright (C) 2014 The CyanogenMod Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
-
- <item
- android:id="@android:id/background"
- android:drawable="@drawable/scrubber_track_holo_dark"/>
- <item android:id="@android:id/secondaryProgress">
- <scale
- android:drawable="@drawable/scrubber_secondary_holo"
- android:scaleWidth="100%" />
- </item>
- <item android:id="@android:id/progress">
- <scale
- android:drawable="@drawable/scrubber_primary_holo"
- android:scaleWidth="100%" />
- </item>
-
-</layer-list>
\ No newline at end of file
diff --git a/res/drawable/btn_add_to_playlist.xml b/res/drawable/btn_add_to_playlist.xml
new file mode 100644
index 0000000..1907ca0
--- /dev/null
+++ b/res/drawable/btn_add_to_playlist.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:pathData="M0 0h24v24H0z" />
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M14 10H2v2h12v-2zm0-4H2v2h12V6zm4 8v-4h-2v4h-4v2h4v4h2v-4h4v-2h-4zM2
+16h8v-2H2v2z" />
+</vector>
diff --git a/res/drawable/btn_header_collapse.xml b/res/drawable/btn_header_collapse.xml
new file mode 100644
index 0000000..888af8e
--- /dev/null
+++ b/res/drawable/btn_header_collapse.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="8dp"
+ android:height="8dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:fillColor="@color/transparent"
+ android:pathData="M19 6.41l-1.41-1.41-5.59 5.59-5.59-5.59-1.41 1.41 5.59 5.59-5.59 5.59 1.41 1.41
+5.59-5.59 5.59 5.59 1.41-1.41-5.59-5.59z" />
+ <path
+ android:pathData="M0 0h24v24h-24z" />
+</vector>
diff --git a/res/drawable/btn_notification_collapse.xml b/res/drawable/btn_notification_collapse.xml
new file mode 100644
index 0000000..35b2dc7
--- /dev/null
+++ b/res/drawable/btn_notification_collapse.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M19 13H5v-2h14v2z" />
+ <path
+ android:pathData="M0 0h24v24H0z" />
+</vector>
diff --git a/res/drawable/btn_playback_browse.xml b/res/drawable/btn_playback_browse.xml
new file mode 100644
index 0000000..2602092
--- /dev/null
+++ b/res/drawable/btn_playback_browse.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:pathData="M0 0h24v24H0z" />
+ <path
+ android:fillColor="@color/black"
+ android:pathData="M20 2H8c-1.1 0-2 .9-2 2v12c0 1.1 .9 2 2 2h12c1.1 0 2-.9 2-2V4c0-1.1-.9-2-2-2zm-2
+5h-3v5.5c0 1.38-1.12 2.5-2.5 2.5S10 13.88 10 12.5s1.12-2.5 2.5-2.5c.57 0 1.08
+.19 1.5 .51 V5h4v2zM4 6H2v14c0 1.1 .9 2 2 2h14v-2H4V6z" />
+</vector>
diff --git a/res/drawable/btn_playback_icon.xml b/res/drawable/btn_playback_icon.xml
new file mode 100644
index 0000000..b3aaacb
--- /dev/null
+++ b/res/drawable/btn_playback_icon.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:pathData="M0 0h24v24h-24z" />
+ <path
+ android:fillColor="@color/black"
+ android:pathData="M12 3v9.28c-.47-.17-.97-.28-1.5-.28-2.49 0-4.5 2.01-4.5 4.5s2.01 4.5 4.5
+4.5c2.31 0 4.2-1.75 4.45-4h.05v-11h4v-3h-7z" />
+</vector>
diff --git a/res/drawable/btn_playback_next.xml b/res/drawable/btn_playback_next.xml
new file mode 100644
index 0000000..6551b5e
--- /dev/null
+++ b/res/drawable/btn_playback_next.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M4 18l8.5-6L4 6v12zm9-12v12l8.5-6L13 6z" />
+</vector>
diff --git a/res/drawable/btn_playback_pause.xml b/res/drawable/btn_playback_pause.xml
new file mode 100644
index 0000000..b593b24
--- /dev/null
+++ b/res/drawable/btn_playback_pause.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M6 19h4V5H6v14zm8-14v14h4V5h-4z" />
+</vector>
diff --git a/res/drawable/btn_playback_play.xml b/res/drawable/btn_playback_play.xml
new file mode 100644
index 0000000..48333e8
--- /dev/null
+++ b/res/drawable/btn_playback_play.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M8 5v14l11-7z" />
+</vector>
diff --git a/res/drawable/btn_playback_previous.xml b/res/drawable/btn_playback_previous.xml
new file mode 100644
index 0000000..aaf506e
--- /dev/null
+++ b/res/drawable/btn_playback_previous.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M11 18V6l-8.5 6 8.5 6zm.5-6l8.5 6V6l-8.5 6z" />
+</vector>
diff --git a/res/drawable/btn_playback_repeat_all.xml b/res/drawable/btn_playback_repeat_all.xml
new file mode 100644
index 0000000..1d98d0d
--- /dev/null
+++ b/res/drawable/btn_playback_repeat_all.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M7 7h10v3l4-4-4-4v3H5v6h2V7zm10 10H7v-3l-4 4 4 4v-3h12v-6h-2v4z" />
+</vector>
diff --git a/res/drawable/btn_playback_repeat_one.xml b/res/drawable/btn_playback_repeat_one.xml
new file mode 100644
index 0000000..dcd085f
--- /dev/null
+++ b/res/drawable/btn_playback_repeat_one.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M7 7h10v3l4-4-4-4v3H5v6h2V7zm10 10H7v-3l-4 4 4 4v-3h12v-6h-2v4zm-4-2V9h-1l-2
+1v1h1.5v4H13z" />
+</vector>
diff --git a/res/drawable/btn_playback_shuffle_all.xml b/res/drawable/btn_playback_shuffle_all.xml
new file mode 100644
index 0000000..3694d25
--- /dev/null
+++ b/res/drawable/btn_playback_shuffle_all.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M10.59 9.17L5.41 4 4 5.41l5.17 5.17 1.42-1.41zM14.5 4l2.04 2.04L4 18.59 5.41 20
+17.96 7.46 20 9.5V4h-5.5zm.33 9.41l-1.41 1.41 3.13 3.13L14.5 20H20v-5.5l-2.04
+2.04-3.13-3.13z" />
+</vector>
diff --git a/res/drawable/btn_queue_icon.xml b/res/drawable/btn_queue_icon.xml
new file mode 100644
index 0000000..bce1cf2
--- /dev/null
+++ b/res/drawable/btn_queue_icon.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:fillColor="@color/black"
+ android:pathData="M15 6H3v2h12V6zm0 4H3v2h12v-2zM3 16h8v-2H3v2zM17
+6v8.18c-.31-.11-.65-.18-1-.18-1.66 0-3 1.34-3 3s1.34 3 3 3 3-1.34 3-3V8h3V6h-5z" />
+</vector>
diff --git a/res/drawable/drag_indicator.xml b/res/drawable/drag_indicator.xml
new file mode 100644
index 0000000..4298d28
--- /dev/null
+++ b/res/drawable/drag_indicator.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24.0"
+ android:viewportHeight="24.0">
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M20,9H4v2h16V9zM4,15h16v-2H4v2z"/>
+</vector>
diff --git a/res/drawable/equalizer_background.9.png b/res/drawable/equalizer_background.9.png
deleted file mode 100644
index 255fdc3..0000000
--- a/res/drawable/equalizer_background.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable/fab_accent.xml b/res/drawable/fab_accent.xml
new file mode 100644
index 0000000..daa8182
--- /dev/null
+++ b/res/drawable/fab_accent.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2015 The CyanogenMod Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval">
+ <solid android:color="@color/accent" />
+</shape>
diff --git a/res/drawable/floating_action_button.xml b/res/drawable/floating_action_button.xml
new file mode 100644
index 0000000..d186128
--- /dev/null
+++ b/res/drawable/floating_action_button.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2015 The CyanogenMod Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+ android:color="@color/grey">
+ <item android:id="@android:id/mask">
+ <shape android:shape="oval">
+ <solid android:color="@color/accent" android:background="?android:attr/selectableItemBackground" />
+ </shape>
+ </item>
+</ripple>
diff --git a/res/drawable/gray_circle.xml b/res/drawable/gray_circle.xml
index b70490e..8a53cf3 100644
--- a/res/drawable/gray_circle.xml
+++ b/res/drawable/gray_circle.xml
@@ -15,5 +15,5 @@
limitations under the License.
-->
<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval">
- <solid android:color="#90a4ae" />
+ <solid android:color="@color/grey" />
</shape>
\ No newline at end of file
diff --git a/res/drawable/gripper.xml b/res/drawable/gripper.xml
new file mode 100644
index 0000000..a2c58d6
--- /dev/null
+++ b/res/drawable/gripper.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24.0"
+ android:viewportHeight="24.0">
+ <path
+ android:fillColor="@color/black"
+ android:pathData="M20,9H4v2h16V9zM4,15h16v-2H4v2z"/>
+</vector>
diff --git a/res/drawable/gripper_light.xml b/res/drawable/gripper_light.xml
new file mode 100644
index 0000000..4298d28
--- /dev/null
+++ b/res/drawable/gripper_light.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24.0"
+ android:viewportHeight="24.0">
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M20,9H4v2h16V9zM4,15h16v-2H4v2z"/>
+</vector>
diff --git a/res/drawable/history_icon.xml b/res/drawable/history_icon.xml
new file mode 100644
index 0000000..d472870
--- /dev/null
+++ b/res/drawable/history_icon.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:fillColor="@color/black"
+ android:fillAlpha=".9"
+ android:strokeAlpha=".9"
+ android:pathData="M13 3c-4.97 0-9 4.03-9 9H1l3.89 3.89 .07 .14L9 12H6c0-3.87 3.13-7 7-7s7 3.13 7
+7-3.13 7-7 7c-1.93 0-3.68-.79-4.94-2.06l-1.42 1.42C8.27 19.99 10.51 21 13
+21c4.97 0 9-4.03 9-9s-4.03-9-9-9zm-1 5v5l4.28 2.54 .72 -1.21-3.5-2.08V8H12z" />
+</vector>
diff --git a/res/drawable/ic_action_search.xml b/res/drawable/ic_action_search.xml
new file mode 100644
index 0000000..e23efa4
--- /dev/null
+++ b/res/drawable/ic_action_search.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M15.5 14h-.79l-.28-.27C15.41 12.59 16 11.11 16 9.5 16 5.91 13.09 3 9.5 3S3 5.91
+3 9.5 5.91 16 9.5 16c1.61 0 3.09-.59 4.23-1.57l.27 .28 v.79l5 4.99L20.49
+19l-4.99-5zm-6 0C7.01 14 5 11.99 5 9.5S7.01 5 9.5 5 14 7.01 14 9.5 11.99 14 9.5
+14z" />
+</vector>
diff --git a/res/drawable/menu_button.xml b/res/drawable/menu_button.xml
new file mode 100644
index 0000000..89a4dca
--- /dev/null
+++ b/res/drawable/menu_button.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:pathData="M0 0h24v24h-24z" />
+ <path
+ android:fillColor="@color/black"
+ android:pathData="M12 8c1.1 0 2-.9 2-2s-.9-2-2-2-2 .9-2 2 .9 2 2 2zm0 2c-1.1 0-2 .9-2 2s.9 2 2 2
+2-.9 2-2-.9-2-2-2zm0 6c-1.1 0-2 .9-2 2s.9 2 2 2 2-.9 2-2-.9-2-2-2z" />
+</vector>
diff --git a/res/drawable/menu_button_light.xml b/res/drawable/menu_button_light.xml
new file mode 100644
index 0000000..ef6f6ba
--- /dev/null
+++ b/res/drawable/menu_button_light.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:pathData="M0 0h24v24h-24z" />
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M12 8c1.1 0 2-.9 2-2s-.9-2-2-2-2 .9-2 2 .9 2 2 2zm0 2c-1.1 0-2 .9-2 2s.9 2 2 2
+2-.9 2-2-.9-2-2-2zm0 6c-1.1 0-2 .9-2 2s.9 2 2 2 2-.9 2-2-.9-2-2-2z" />
+</vector>
diff --git a/res/drawable/no_results.xml b/res/drawable/no_results.xml
new file mode 100644
index 0000000..6299d02
--- /dev/null
+++ b/res/drawable/no_results.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="96dp"
+ android:height="96dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:pathData="M0 0h24v24H0z" />
+ <path
+ android:fillColor="@color/black"
+ android:pathData="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 14.5c-2.49
+0-4.5-2.01-4.5-4.5S9.51 7.5 12 7.5s4.5 2.01 4.5 4.5-2.01 4.5-4.5 4.5zm0-5.5c-.55
+0-1 .45-1 1s.45 1 1 1 1-.45 1-1-.45-1-1-1z" />
+</vector>
diff --git a/res/drawable/now_playing_icon.xml b/res/drawable/now_playing_icon.xml
new file mode 100644
index 0000000..89d6cfe
--- /dev/null
+++ b/res/drawable/now_playing_icon.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:fillColor="@color/accent"
+ android:pathData="M14.5,21c-1.9,0-3.5-1.6-3.5-3.5v-11C11,5.7,10.3,5,9.5,5S8,5.7,8,6.5V10c0,1.7-1.3,3-3,3H3v-2
+h2c0.6,0,1-0.4,1-1V6.5C6,4.6,7.6,3,9.5,3S13,4.6,13,6.5v11c0,0.8,0.7,1.5,1.5,1.5s1.5-0.7,1.5-1.5V14c0-1.7,1.3-3,3-3h2v2h-2
+c-0.6,0-1,0.4-1,1v3.5C18,19.4,16.4,21,14.5,21Z" />
+</vector>
diff --git a/res/drawable/playlist_icon.xml b/res/drawable/playlist_icon.xml
new file mode 100644
index 0000000..454540c
--- /dev/null
+++ b/res/drawable/playlist_icon.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:pathData="M0 0h24v24H0z" />
+ <path
+ android:fillColor="@color/primary"
+ android:pathData="M15 6H3v2h12V6zm0 4H3v2h12v-2zM3 16h8v-2H3v2zM17
+6v8.18c-.31-.11-.65-.18-1-.18-1.66 0-3 1.34-3 3s1.34 3 3 3 3-1.34 3-3V8h3V6h-5z" />
+</vector>
diff --git a/res/drawable/recent_icon.xml b/res/drawable/recent_icon.xml
new file mode 100644
index 0000000..3ce486b
--- /dev/null
+++ b/res/drawable/recent_icon.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:fillColor="@color/primary"
+ android:fillAlpha=".9"
+ android:strokeAlpha=".9"
+ android:pathData="M13 3c-4.97 0-9 4.03-9 9H1l3.89 3.89 .07 .14L9 12H6c0-3.87 3.13-7 7-7s7 3.13 7
+7-3.13 7-7 7c-1.93 0-3.68-.79-4.94-2.06l-1.42 1.42C8.27 19.99 10.51 21 13
+21c4.97 0 9-4.03 9-9s-4.03-9-9-9zm-1 5v5l4.28 2.54 .72 -1.21-3.5-2.08V8H12z" />
+</vector>
diff --git a/res/drawable/recently_added.xml b/res/drawable/recently_added.xml
new file mode 100644
index 0000000..992eb2f
--- /dev/null
+++ b/res/drawable/recently_added.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:pathData="M0 0h24v24H0z" />
+ <path
+ android:fillColor="@color/primary"
+ android:pathData="M23 12l-2.44-2.78 .34 -3.68-3.61-.82-1.89-3.18L12 3 8.6 1.54 6.71 4.72l-3.61 .81
+.34 3.68L1 12l2.44 2.78-.34 3.69 3.61 .82 1.89 3.18L12 21l3.4 1.46 1.89-3.18
+3.61-.82-.34-3.68L23 12zm-10 5h-2v-2h2v2zm0-4h-2V7h2v6z" />
+</vector>
diff --git a/res/drawable/stopwatch_icon_small_grey.xml b/res/drawable/stopwatch_icon_small_grey.xml
new file mode 100644
index 0000000..d03145f
--- /dev/null
+++ b/res/drawable/stopwatch_icon_small_grey.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="18dp"
+ android:height="18dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:pathData="M0 0h24v24H0z" />
+ <path
+ android:fillColor="@color/grey"
+ android:pathData="M11 17c0 .55 .45 1 1 1s1-.45 1-1-.45-1-1-1-1 .45-1 1zm0-14v4h2V5.08c3.39 .49 6
+3.39 6 6.92 0 3.87-3.13 7-7 7s-7-3.13-7-7c0-1.68 .59 -3.22 1.58-4.42L12
+13l1.41-1.41-6.8-6.8v.02C4.42 6.45 3 9.05 3 12c0 4.97 4.02 9 9 9 4.97 0 9-4.03
+9-9s-4.03-9-9-9h-1zm7 9c0-.55-.45-1-1-1s-1 .45-1 1 .45 1 1 1 1-.45 1-1zM6 12c0
+.55 .45 1 1 1s1-.45 1-1-.45-1-1-1-1 .45-1 1z" />
+</vector>
diff --git a/res/drawable/stopwatch_icon_white.xml b/res/drawable/stopwatch_icon_white.xml
new file mode 100644
index 0000000..5255079
--- /dev/null
+++ b/res/drawable/stopwatch_icon_white.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:pathData="M0 0h24v24H0z" />
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M11 17c0 .55 .45 1 1 1s1-.45 1-1-.45-1-1-1-1 .45-1 1zm0-14v4h2V5.08c3.39 .49 6
+3.39 6 6.92 0 3.87-3.13 7-7 7s-7-3.13-7-7c0-1.68 .59 -3.22 1.58-4.42L12
+13l1.41-1.41-6.8-6.8v.02C4.42 6.45 3 9.05 3 12c0 4.97 4.02 9 9 9 4.97 0 9-4.03
+9-9s-4.03-9-9-9h-1zm7 9c0-.55-.45-1-1-1s-1 .45-1 1 .45 1 1 1 1-.45 1-1zM6 12c0
+.55 .45 1 1 1s1-.45 1-1-.45-1-1-1-1 .45-1 1z" />
+</vector>
diff --git a/res/drawable/top_tracks_icon.xml b/res/drawable/top_tracks_icon.xml
new file mode 100644
index 0000000..b843600
--- /dev/null
+++ b/res/drawable/top_tracks_icon.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:pathData="M0 0h24v24h-24z" />
+ <path
+ android:fillColor="@color/black"
+ android:pathData="M12 21.35l-1.45-1.32c-5.15-4.67-8.55-7.75-8.55-11.53 0-3.08 2.42-5.5 5.5-5.5
+1.74 0 3.41 .81 4.5 2.09 1.09-1.28 2.76-2.09 4.5-2.09 3.08 0 5.5 2.42 5.5 5.5 0
+3.78-3.4 6.86-8.55 11.54l-1.45 1.31z" />
+</vector>
diff --git a/res/layout/activity_album_detail.xml b/res/layout/activity_album_detail.xml
index e00136a..3838784 100644
--- a/res/layout/activity_album_detail.xml
+++ b/res/layout/activity_album_detail.xml
@@ -34,7 +34,6 @@
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:singleLine="true"
- android:fontFamily="sans-serif"
android:textStyle="bold"
android:textSize="@dimen/text_size_large"
android:textColor="@color/default_text_color" />
@@ -45,7 +44,6 @@
android:layout_height="wrap_content"
android:layout_below="@id/title"
android:singleLine="true"
- android:fontFamily="sans-serif-light"
android:textSize="@dimen/text_size_micro"
android:textColor="@color/default_text_color" />
@@ -56,7 +54,6 @@
android:layout_below="@id/song_count_and_year"
android:layout_marginRight="@dimen/standard_padding"
android:singleLine="true"
- android:fontFamily="sans-serif-light"
android:textSize="@dimen/text_size_micro"
android:textColor="@color/default_text_color"
android:visibility="gone"
@@ -81,7 +78,6 @@
android:layout_below="@id/song_count_and_year"
android:layout_toRightOf="@id/duration_icon"
android:singleLine="true"
- android:fontFamily="sans-serif-light"
android:textSize="@dimen/text_size_micro"
android:textColor="@color/default_text_color"
android:layout_marginTop="4dp" />
diff --git a/res/layout/app_widget_large.xml b/res/layout/app_widget_large.xml
index bda04b9..e4be97e 100644
--- a/res/layout/app_widget_large.xml
+++ b/res/layout/app_widget_large.xml
@@ -20,15 +20,15 @@
android:layout_width="match_parent"
android:layout_height="@dimen/app_widget_large_min_height"
android:columnCount="2"
- android:rowCount="3"
- android:background="@drawable/appwidget_bg"
+ android:rowCount="4"
+ android:background="@color/black"
tools:ignore="ContentDescription" >
<ImageView
android:id="@+id/app_widget_large_image"
android:layout_width="@dimen/notification_expanded_height"
android:layout_height="@dimen/notification_expanded_height"
- android:layout_rowSpan="3"
+ android:layout_rowSpan="4"
android:layout_marginBottom="@dimen/app_widget_bottom_margin"
android:scaleType="fitXY" />
@@ -51,24 +51,16 @@
android:id="@+id/app_widget_large_line_two"
style="@style/NotificationText"
android:textColor="@color/widget_text"
- android:fontFamily="sans-serif-light"
android:textSize="@dimen/text_size_small" />
<TextView
android:id="@+id/app_widget_large_line_three"
style="@style/NotificationText"
android:textColor="@color/widget_text"
- android:fontFamily="sans-serif-light"
android:textSize="@dimen/text_size_small" />
</LinearLayout>
<LinearLayout
- android:layout_gravity="fill_horizontal"
- android:layout_width="0dp"
- android:layout_height="1dp"
- android:background="@color/widget_divider" />
-
- <LinearLayout
android:id="@+id/app_widget_large_buttons"
android:layout_width="0dp"
android:layout_gravity="fill_horizontal"
diff --git a/res/layout/app_widget_large_alternate.xml b/res/layout/app_widget_large_alternate.xml
index b7790ae..d47ed79 100644
--- a/res/layout/app_widget_large_alternate.xml
+++ b/res/layout/app_widget_large_alternate.xml
@@ -19,9 +19,9 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="@dimen/app_widget_large_min_height"
- android:background="@drawable/appwidget_bg"
+ android:background="@color/black"
android:columnCount="2"
- android:rowCount="3"
+ android:rowCount="4"
tools:ignore="ContentDescription" >
<ImageView
@@ -48,25 +48,17 @@
android:id="@+id/app_widget_large_alternate_line_two"
style="@style/NotificationText"
android:textColor="@color/widget_text"
- android:fontFamily="sans-serif-light"
android:textSize="@dimen/text_size_small" />
<TextView
android:id="@+id/app_widget_large_alternate_line_three"
style="@style/NotificationText"
android:textColor="@color/widget_text"
- android:fontFamily="sans-serif-light"
android:textSize="@dimen/text_size_small" />
</LinearLayout>
<LinearLayout
- android:layout_gravity="fill_horizontal"
- android:layout_height="1dp"
- android:layout_columnSpan="2"
- android:background="@color/widget_divider" />
-
- <LinearLayout
android:id="@+id/app_widget_large_alternate_buttons"
android:layout_columnSpan="2"
android:layout_width="0dp"
diff --git a/res/layout/app_widget_small.xml b/res/layout/app_widget_small.xml
index 3020c82..1ceb7ea 100644
--- a/res/layout/app_widget_small.xml
+++ b/res/layout/app_widget_small.xml
@@ -20,8 +20,8 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:columnCount="2"
- android:rowCount="3"
- android:background="@drawable/appwidget_bg"
+ android:rowCount="4"
+ android:background="@color/black"
android:gravity="top"
android:padding="@dimen/app_widget_padding"
tools:ignore="NestedWeights" >
@@ -78,12 +78,6 @@
</LinearLayout>
<LinearLayout
- android:layout_gravity="fill_horizontal"
- android:layout_height="1dp"
- android:layout_columnSpan="2"
- android:background="@color/widget_divider" />
-
- <LinearLayout
android:id="@+id/app_widget_small_info_container"
android:layout_gravity="fill"
android:layout_columnSpan="2"
@@ -113,7 +107,6 @@
android:paddingRight="5dp"
android:singleLine="true"
android:text="@string/app_widget_text_separator"
- android:fontFamily="sans-serif-light"
android:textColor="@color/widget_text"
android:textSize="@dimen/text_size_small" />
@@ -124,7 +117,6 @@
android:ellipsize="marquee"
android:singleLine="true"
android:textColor="@color/widget_text"
- android:fontFamily="sans-serif-light"
android:textSize="@dimen/text_size_small" />
</LinearLayout>
diff --git a/res/layout/artist_detail_album.xml b/res/layout/artist_detail_album.xml
index 296ec6e..48733de 100644
--- a/res/layout/artist_detail_album.xml
+++ b/res/layout/artist_detail_album.xml
@@ -1,10 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2015 The CyanogenMod Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
<android.support.v7.widget.CardView
xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="104dp"
- android:layout_height="148dp"
+ xmlns:card_view="http://schemas.android.com/apk/res-auto"
+ android:layout_width="156dp"
+ android:layout_height="222dp"
android:layout_marginRight="8dp"
+ android:paddingBottom="8dp"
android:foreground="@drawable/selectable_background"
- android:elevation="3dp">
+ android:elevation="3dp"
+ card_view:cardElevation="4dp"
+ card_view:cardCornerRadius="2dp"
+ card_view:cardBackgroundColor="@color/cards_bg_color">
<RelativeLayout
android:layout_width="match_parent"
@@ -12,8 +33,8 @@
<ImageView
android:id="@+id/album_art"
- android:layout_width="104dp"
- android:layout_height="104dp"
+ android:layout_width="156dp"
+ android:layout_height="156dp"
android:layout_alignParentTop="true"
android:layout_alignParentLeft="true"
android:scaleType="centerCrop" />
@@ -26,7 +47,7 @@
android:layout_alignParentRight="true"
android:layout_marginBottom="1dp"
android:gravity="center_vertical"
- android:src="@drawable/menu_button" />
+ android:src="@drawable/menu_button_light" />
<LinearLayout
android:layout_width="match_parent"
@@ -43,14 +64,16 @@
style="@style/ListItemMainText.Single"
android:textSize="@dimen/text_size_micro"
android:layout_width="match_parent"
- android:layout_height="wrap_content" />
+ android:layout_height="wrap_content"
+ android:textColor="@color/cardOne" />
<TextView
android:id="@+id/year"
style="@style/ListItemSecondaryText.Single"
android:textSize="@dimen/text_size_extra_micro"
android:layout_width="match_parent"
- android:layout_height="wrap_content" />
+ android:layout_height="wrap_content"
+ android:textColor="@color/cardTwo" />
</LinearLayout>
diff --git a/res/layout/artist_detail_header.xml b/res/layout/artist_detail_header.xml
index fbbd330..25cf202 100644
--- a/res/layout/artist_detail_header.xml
+++ b/res/layout/artist_detail_header.xml
@@ -16,7 +16,6 @@
android:layout_marginLeft="@dimen/list_item_general_margin"
android:layout_below="@id/hero"
android:gravity="center_vertical"
- android:fontFamily="sans-serif-light"
android:textAllCaps="true"
android:textColor="@color/list_item_header_text_color"
android:textSize="@dimen/text_size_medium"
@@ -26,7 +25,7 @@
android:id="@+id/albums"
android:scrollbars="none"
android:layout_width="match_parent"
- android:layout_height="148dp"
+ android:layout_height="230dp"
android:layout_below="@id/albums_label" />
<TextView
@@ -36,7 +35,6 @@
android:layout_marginLeft="@dimen/list_item_general_margin"
android:layout_below="@id/albums"
android:gravity="bottom"
- android:fontFamily="sans-serif-light"
android:textAllCaps="true"
android:textColor="@color/list_item_header_text_color"
android:textSize="@dimen/text_size_medium"
diff --git a/res/layout/audio_player_header_bar.xml b/res/layout/audio_player_header_bar.xml
index 9c71788..00ac30b 100644
--- a/res/layout/audio_player_header_bar.xml
+++ b/res/layout/audio_player_header_bar.xml
@@ -90,7 +90,6 @@
android:ellipsize="end"
android:maxLines="1"
android:textAllCaps="true"
- android:fontFamily="sans-serif-light"
android:textColor="@color/header_action_bar_text_color"
android:textSize="@dimen/text_size_micro" />
</LinearLayout>
diff --git a/res/layout/colorstrip.xml b/res/layout/colorstrip.xml
index 456b5db..dcbc6fb 100644
--- a/res/layout/colorstrip.xml
+++ b/res/layout/colorstrip.xml
@@ -17,6 +17,6 @@
-->
<View xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/colorstrip"
- android:background="@color/holo_blue_light"
+ android:background="@color/accent"
android:layout_width="match_parent"
android:layout_height="@dimen/colorstrip_height"/>
\ No newline at end of file
diff --git a/res/layout/custom_toast.xml b/res/layout/custom_toast.xml
deleted file mode 100644
index 6e0d860..0000000
--- a/res/layout/custom_toast.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:orientation="vertical"
- android:id="@+id/custom_toast_root"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
- android:background="@color/holo_blue_light"
- android:padding="8dp">
-
- <TextView android:layout_width="wrap_content"
- android:layout_height="fill_parent"
- android:textColor="@color/white"
- android:id="@+id/toast_text_view"
- />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/grid_items_normal.xml b/res/layout/grid_items_normal.xml
index ebff650..fee88c1 100644
--- a/res/layout/grid_items_normal.xml
+++ b/res/layout/grid_items_normal.xml
@@ -17,9 +17,12 @@
-->
<android.support.v7.widget.CardView
xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:card_view="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:elevation="3dp">
+ card_view:cardElevation="4dp"
+ card_view:cardCornerRadius="2dp"
+ card_view:cardBackgroundColor="@color/cards_bg_color" >
<LinearLayout
android:layout_width="match_parent"
@@ -44,6 +47,7 @@
<TextView
android:id="@+id/line_one"
style="@style/ListItemMainText.Grid.Single"
+ android:textColor="@color/cardOne"
android:paddingBottom="1dp"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
@@ -51,6 +55,7 @@
<TextView
android:id="@+id/line_two"
style="@style/ListItemSecondaryText.Grid.Single"
+ android:textColor="@color/cardTwo"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
@@ -61,7 +66,7 @@
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:paddingRight="@dimen/grid_item_padding_right"
- android:src="@drawable/menu_button" />
+ android:src="@drawable/menu_button_light" />
</LinearLayout>
diff --git a/res/layout/list_base_padding.xml b/res/layout/list_base_padding.xml
index 048aa8c..3845720 100644
--- a/res/layout/list_base_padding.xml
+++ b/res/layout/list_base_padding.xml
@@ -18,7 +18,8 @@
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/list_base_container"
android:layout_width="match_parent"
- android:layout_height="match_parent">
+ android:layout_height="match_parent"
+ android:background="@color/white">
<include
layout="@layout/loading_empty_container" />
diff --git a/res/layout/list_header.xml b/res/layout/list_header.xml
index 2a0aca0..e41d28d 100644
--- a/res/layout/list_header.xml
+++ b/res/layout/list_header.xml
@@ -26,5 +26,4 @@
android:gravity="center_vertical"
android:textAllCaps="true"
android:textColor="@color/list_item_header_text_color"
- android:textSize="@dimen/list_item_header_size"
- android:fontFamily="sans-serif-light" />
+ android:textSize="@dimen/list_item_header_size" />
\ No newline at end of file
diff --git a/res/layout/list_item_smart_playlist.xml b/res/layout/list_item_smart_playlist.xml
index feb3237..dc7778c 100644
--- a/res/layout/list_item_smart_playlist.xml
+++ b/res/layout/list_item_smart_playlist.xml
@@ -19,8 +19,8 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="@dimen/item_normal_height"
- android:background="@color/smart_playlist_item_background"
android:minHeight="@dimen/item_normal_height"
+ android:elevation="2dp"
tools:ignore="ContentDescription">
<RelativeLayout
android:layout_width="match_parent"
diff --git a/res/layout/list_search_header.xml b/res/layout/list_search_header.xml
index 8f93d42..7f2e19c 100644
--- a/res/layout/list_search_header.xml
+++ b/res/layout/list_search_header.xml
@@ -30,6 +30,5 @@
android:gravity="center_vertical"
android:textAllCaps="true"
android:textColor="@color/list_item_header_text_color"
- android:textSize="@dimen/list_item_header_size"
- android:fontFamily="sans-serif-light" />
+ android:textSize="@dimen/list_item_header_size" />
</RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/main_album_flow.xml b/res/layout/main_album_flow.xml
index 5d5d543..109c782 100644
--- a/res/layout/main_album_flow.xml
+++ b/res/layout/main_album_flow.xml
@@ -25,13 +25,6 @@
android:layout_height="match_parent" />
<include layout="@layout/loading_empty_container" />
- <View
- android:id="@+id/equalizerGradient"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:background="@drawable/equalizer_background"
- android:layout_gravity="bottom"/>
-
<com.cyanogenmod.eleven.widgets.VisualizerView
android:id="@+id/visualizerView"
android:gravity="bottom"
diff --git a/res/layout/main_playback_controls.xml b/res/layout/main_playback_controls.xml
index 54385cd..cee200f 100644
--- a/res/layout/main_playback_controls.xml
+++ b/res/layout/main_playback_controls.xml
@@ -15,199 +15,130 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<RelativeLayout
+<android.support.v7.widget.CardView
xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:card_view="http://schemas.android.com/apk/res-auto"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
- android:background="@android:color/transparent" >
- <com.cyanogenmod.eleven.widgets.PlayPauseProgressButton
- android:id="@+id/playPauseProgressButton"
- android:layout_width="@dimen/audio_player_controls_main_button_width"
- android:layout_height="@dimen/audio_player_controls_main_button_height"
- android:layout_centerInParent="true" >
+ card_view:cardCornerRadius="2dp"
+ card_view:contentPadding="8dp"
+ card_view:cardElevation="4dp"
+ card_view:cardUseCompatPadding="true"
+ card_view:cardBackgroundColor="@color/semitransparent_black" >
+ <RelativeLayout
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent" >
- <!-- TODO: Figure out why scaleType: centerInside isn't properly scaling up -->
- <com.cyanogenmod.eleven.widgets.PlayPauseButton
- android:id="@+id/action_button_play"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:layout_gravity="center"
+ <include
android:contentDescription="@string/accessibility_play"
- android:focusable="true"
- android:scaleType="centerCrop"
- android:src="@drawable/btn_playback_play" />
+ android:id="@+id/playPauseProgressButton"
+ android:layout_width="@dimen/audio_player_controls_main_button_width"
+ android:layout_height="@dimen/audio_player_controls_main_button_height"
+ android:layout_centerInParent="true"
+ android:background="@drawable/fab_accent"
+ android:gravity="center_horizontal"
+ layout="@layout/play_pause_progress_button" />
- <ProgressBar
- android:id="@+id/progressBarBackground"
- style="?android:attr/progressBarStyleHorizontal"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:clickable="false"
- android:indeterminate="false"
- android:max="1000"
- android:progress="1000"
- android:progressDrawable="@drawable/now_playing_progress_background" />
+ <!-- This is the left side of the progress bar - it has the previous
+ and shuffle button and the current time text -->
+ <RelativeLayout
+ android:layout_width="wrap_content"
+ android:layout_height="fill_parent"
+ android:layout_toLeftOf="@id/playPauseProgressButton">
- <ProgressBar
- android:id="@+id/circularProgressBar"
- style="?android:attr/progressBarStyleHorizontal"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:clickable="false"
- android:indeterminate="false"
- android:max="1000"
- android:progressDrawable="@drawable/now_playing_progress" />
- </com.cyanogenmod.eleven.widgets.PlayPauseProgressButton>
+ <TextView
+ android:id="@+id/audio_player_current_time"
+ android:layout_width="52dp"
+ android:layout_height="@dimen/audio_player_controls_end_button_height"
+ android:gravity="left|center_vertical"
+ android:layout_alignParentRight="true"
+ android:layout_centerVertical="true"
+ android:paddingLeft="@dimen/audio_player_time_text_padding"
+ android:textColor="@color/white"
+ android:textSize="@dimen/audio_player_time_text_size"
+ android:textStyle="bold"/>
- <!-- TODO: Figure out why scaleType: centerInside isn't properly scaling up -->
- <!-- ANSWER: two issues (a) centerInside doesn't scale up, only down, use
- fitCenter instead. Also, ImageButtons come with built-in padding, but
- that only makes a visible difference when you are scaling the image.
- so you have to set the padding to zero in order to get the result you expect -->
- <!-- This is the left side of the progress bar - it has the previous
- and shuffle button and the current time text -->
- <RelativeLayout
- android:layout_width="wrap_content"
- android:layout_height="fill_parent"
- android:layout_toLeftOf="@id/playPauseProgressButton">
+ <com.cyanogenmod.eleven.widgets.RepeatingImageButton
+ android:id="@+id/action_button_previous"
+ android:layout_width="@dimen/audio_player_controls_end_button_width"
+ android:layout_height="@dimen/audio_player_controls_end_button_height"
+ android:layout_toLeftOf="@id/audio_player_current_time"
+ android:layout_centerVertical="true"
+ android:scaleType="fitCenter"
+ android:src="@drawable/btn_playback_previous" />
- <TextView
- android:id="@+id/audio_player_current_time"
- android:layout_width="52dp"
- android:layout_height="@dimen/audio_player_controls_end_button_height"
- android:gravity="left|center_vertical"
- android:layout_alignParentRight="true"
- android:layout_centerVertical="true"
- android:paddingLeft="@dimen/audio_player_time_text_padding"
- android:textColor="@color/audio_player_text_color"
- android:textSize="@dimen/audio_player_time_text_size"
- android:textStyle="bold"/>
+ <!-- divider -->
+ <View
+ android:id="@+id/action_button_left_bottom_divider"
+ android:layout_height="@dimen/audio_player_divider_height"
+ android:layout_width="@dimen/audio_player_divider_length"
+ android:layout_marginRight="@dimen/audio_player_divider_horizontal_offset"
+ android:layout_alignParentRight="true"
+ android:layout_below="@id/audio_player_current_time"
+ android:background="@color/now_playing_divider" />
- <com.cyanogenmod.eleven.widgets.RepeatingImageButton
- android:id="@+id/action_button_previous"
- android:layout_width="@dimen/audio_player_controls_end_button_width"
- android:layout_height="@dimen/audio_player_controls_end_button_height"
- android:layout_toLeftOf="@id/audio_player_current_time"
- android:layout_centerVertical="true"
- android:scaleType="fitCenter"
- android:src="@drawable/btn_playback_previous" />
+ <com.cyanogenmod.eleven.widgets.ShuffleButton
+ android:id="@+id/action_button_shuffle"
+ android:layout_width="@dimen/audio_player_controls_end_button_width"
+ android:layout_height="@dimen/audio_player_controls_end_button_height"
+ android:layout_below="@id/action_button_left_bottom_divider"
+ android:layout_alignLeft="@id/action_button_previous"
+ android:layout_marginLeft="@dimen/audio_player_controls_end_button_half_width"
+ android:contentDescription="@string/accessibility_shuffle"
+ android:scaleType="fitCenter"
+ android:src="@drawable/btn_playback_shuffle_all" />
+ </RelativeLayout>
- <!-- divider -->
- <View
- android:id="@+id/action_button_left_top_divider"
- android:layout_height="@dimen/audio_player_divider_height"
- android:layout_width="@dimen/audio_player_divider_length"
- android:layout_marginRight="@dimen/audio_player_divider_horizontal_offset"
- android:layout_alignParentRight="true"
- android:layout_above="@id/audio_player_current_time"
- android:background="@color/now_playing_divider" />
+ <!-- This is the right side of the progress bar - it has the next
+ and repeat button and the total time text -->
+ <RelativeLayout
+ android:layout_width="wrap_content"
+ android:layout_height="fill_parent"
+ android:layout_toRightOf="@id/playPauseProgressButton">
- <!-- divider -->
- <View
- android:id="@+id/action_button_left_bottom_divider"
- android:layout_height="@dimen/audio_player_divider_height"
- android:layout_width="@dimen/audio_player_divider_length"
- android:layout_marginRight="@dimen/audio_player_divider_horizontal_offset"
- android:layout_alignParentRight="true"
- android:layout_below="@id/audio_player_current_time"
- android:background="@color/now_playing_divider" />
+ <TextView
+ android:id="@+id/audio_player_total_time"
+ android:layout_width="52dp"
+ android:layout_height="@dimen/audio_player_controls_end_button_height"
+ android:layout_alignParentLeft="true"
+ android:layout_centerVertical="true"
+ android:paddingRight="@dimen/audio_player_time_text_padding"
+ android:gravity="right|center_vertical"
+ android:textColor="@color/white"
+ android:textSize="@dimen/audio_player_time_text_size"
+ android:textStyle="bold"/>
- <com.cyanogenmod.eleven.widgets.BrowseButton
- android:id="@+id/action_button_browse"
- android:layout_width="@dimen/audio_player_controls_end_button_width"
- android:layout_height="@dimen/audio_player_controls_end_button_height"
- android:layout_above="@id/action_button_left_top_divider"
- android:layout_alignLeft="@id/action_button_previous"
- android:layout_marginLeft="@dimen/audio_player_controls_end_button_half_width"
- android:contentDescription="@string/accessibility_browse"
- android:focusable="true"
- android:scaleType="fitCenter"
- android:src="@drawable/btn_playback_browse" />
+ <com.cyanogenmod.eleven.widgets.RepeatingImageButton
+ android:id="@+id/action_button_next"
+ android:layout_width="@dimen/audio_player_controls_end_button_width"
+ android:layout_height="@dimen/audio_player_controls_end_button_height"
+ android:layout_toRightOf="@id/audio_player_total_time"
+ android:layout_centerVertical="true"
+ android:scaleType="fitCenter"
+ android:src="@drawable/btn_playback_next" />
- <com.cyanogenmod.eleven.widgets.ShuffleButton
- android:id="@+id/action_button_shuffle"
- android:layout_width="@dimen/audio_player_controls_end_button_width"
- android:layout_height="@dimen/audio_player_controls_end_button_height"
- android:layout_below="@id/action_button_left_bottom_divider"
- android:layout_alignLeft="@id/action_button_previous"
- android:layout_marginLeft="@dimen/audio_player_controls_end_button_half_width"
- android:contentDescription="@string/accessibility_shuffle"
- android:scaleType="fitCenter"
- android:src="@drawable/btn_playback_shuffle_all" />
- </RelativeLayout>
+ <!-- divider -->
+ <View
+ android:id="@+id/action_button_right_bottom_divider"
+ android:layout_height="@dimen/audio_player_divider_height"
+ android:layout_width="@dimen/audio_player_divider_length"
+ android:layout_marginLeft="@dimen/audio_player_divider_horizontal_offset"
+ android:layout_alignParentLeft="true"
+ android:layout_below="@id/audio_player_total_time" />
- <!-- This is the right side of the progress bar - it has the next
- and repeat button and the total time text -->
- <RelativeLayout
- android:layout_width="wrap_content"
- android:layout_height="fill_parent"
- android:layout_toRightOf="@id/playPauseProgressButton">
+ <com.cyanogenmod.eleven.widgets.RepeatButton
+ android:id="@+id/action_button_repeat"
+ android:layout_width="@dimen/audio_player_controls_end_button_width"
+ android:layout_height="@dimen/audio_player_controls_end_button_height"
+ android:layout_below="@id/audio_player_total_time"
+ android:layout_alignRight="@id/action_button_next"
+ android:layout_marginRight="@dimen/audio_player_controls_end_button_half_width"
+ android:contentDescription="@string/accessibility_repeat"
+ android:focusable="true"
+ android:scaleType="fitCenter"
+ android:src="@drawable/btn_playback_repeat_all" />
- <TextView
- android:id="@+id/audio_player_total_time"
- android:layout_width="52dp"
- android:layout_height="@dimen/audio_player_controls_end_button_height"
- android:layout_alignParentLeft="true"
- android:layout_centerVertical="true"
- android:paddingRight="@dimen/audio_player_time_text_padding"
- android:gravity="right|center_vertical"
- android:textColor="@color/audio_player_text_color"
- android:textSize="@dimen/audio_player_time_text_size"
- android:textStyle="bold"/>
-
- <com.cyanogenmod.eleven.widgets.RepeatingImageButton
- android:id="@+id/action_button_next"
- android:layout_width="@dimen/audio_player_controls_end_button_width"
- android:layout_height="@dimen/audio_player_controls_end_button_height"
- android:layout_toRightOf="@id/audio_player_total_time"
- android:layout_centerVertical="true"
- android:scaleType="fitCenter"
- android:src="@drawable/btn_playback_next" />
-
- <!-- divider -->
- <View
- android:id="@+id/action_button_right_top_divider"
- android:layout_height="@dimen/audio_player_divider_height"
- android:layout_width="@dimen/audio_player_divider_length"
- android:layout_marginLeft="@dimen/audio_player_divider_horizontal_offset"
- android:layout_alignParentLeft="true"
- android:layout_above="@id/audio_player_total_time"
- android:background="@color/now_playing_divider" />
-
- <!-- divider -->
- <View
- android:id="@+id/action_button_right_bottom_divider"
- android:layout_height="@dimen/audio_player_divider_height"
- android:layout_width="@dimen/audio_player_divider_length"
- android:layout_marginLeft="@dimen/audio_player_divider_horizontal_offset"
- android:layout_alignParentLeft="true"
- android:layout_below="@id/audio_player_total_time"
- android:background="@color/now_playing_divider" />
-
- <com.cyanogenmod.eleven.widgets.QueueButton
- android:id="@+id/action_button_queue"
- android:layout_width="@dimen/audio_player_controls_end_button_width"
- android:layout_height="@dimen/audio_player_controls_end_button_height"
- android:layout_above="@id/action_button_right_top_divider"
- android:layout_alignRight="@id/action_button_next"
- android:layout_marginRight="@dimen/audio_player_controls_end_button_half_width"
- android:contentDescription="@string/accessibility_queue"
- android:focusable="true"
- android:scaleType="fitCenter"
- android:src="@drawable/btn_queue_icon" />
-
- <com.cyanogenmod.eleven.widgets.RepeatButton
- android:id="@+id/action_button_repeat"
- android:layout_width="@dimen/audio_player_controls_end_button_width"
- android:layout_height="@dimen/audio_player_controls_end_button_height"
- android:layout_below="@id/action_button_right_bottom_divider"
- android:layout_alignRight="@id/action_button_next"
- android:layout_marginRight="@dimen/audio_player_controls_end_button_half_width"
- android:contentDescription="@string/accessibility_repeat"
- android:focusable="true"
- android:scaleType="fitCenter"
- android:src="@drawable/btn_playback_repeat_all" />
+ </RelativeLayout>
</RelativeLayout>
-
-</RelativeLayout>
+</android.support.v7.widget.CardView>
diff --git a/res/layout/no_results_message.xml b/res/layout/no_results_message.xml
index f698986..07dfe91 100644
--- a/res/layout/no_results_message.xml
+++ b/res/layout/no_results_message.xml
@@ -32,7 +32,7 @@
android:layout_gravity="center_horizontal"
android:paddingBottom="@dimen/white_note_padding_bottom"
android:scaleType="centerInside"
- android:src="@drawable/white_note" />
+ android:src="@drawable/no_results" />
<LinearLayout
android:layout_width="fill_parent"
@@ -71,7 +71,6 @@
android:id="@+id/no_results_secondary_text"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
- android:fontFamily="sans-serif-light"
android:gravity="center_horizontal"
android:textColor="@color/no_results"
android:textSize="@dimen/no_results_text_secondary"
diff --git a/res/layout/play_pause_progress_button.xml b/res/layout/play_pause_progress_button.xml
index 0631cad..dabd750 100644
--- a/res/layout/play_pause_progress_button.xml
+++ b/res/layout/play_pause_progress_button.xml
@@ -30,7 +30,8 @@
android:contentDescription="@string/accessibility_play"
android:focusable="true"
android:scaleType="centerCrop"
- android:src="@drawable/btn_playback_play" />
+ android:src="@drawable/btn_playback_play"
+ android:background="@color/accent" />
<ProgressBar
android:id="@+id/progressBarBackground"
diff --git a/res/layout/playlist_detail.xml b/res/layout/playlist_detail.xml
index a09115f..3f6cbe3 100644
--- a/res/layout/playlist_detail.xml
+++ b/res/layout/playlist_detail.xml
@@ -19,9 +19,10 @@
android:layout_height="match_parent">
<include
+ layout="@layout/list_base_padding" />
+
+ <include
android:id="@+id/playlist_header"
layout="@layout/playlist_detail_header" />
- <include
- layout="@layout/list_base_padding" />
</RelativeLayout>
diff --git a/res/layout/playlist_detail_header.xml b/res/layout/playlist_detail_header.xml
index 6f8b7c6..6b7c95a 100644
--- a/res/layout/playlist_detail_header.xml
+++ b/res/layout/playlist_detail_header.xml
@@ -49,7 +49,6 @@
android:id="@+id/number_of_songs_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:fontFamily="sans-serif-light"
android:paddingRight="16dp"
android:textColor="@color/white"
android:textSize="@dimen/text_size_micro" />
@@ -64,7 +63,6 @@
android:id="@+id/duration_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:fontFamily="sans-serif-light"
android:textColor="@color/white"
android:textSize="@dimen/text_size_micro" />
</LinearLayout>
diff --git a/res/transition/explode.xml b/res/transition/explode.xml
new file mode 100644
index 0000000..ba135b2
--- /dev/null
+++ b/res/transition/explode.xml
@@ -0,0 +1,2 @@
+<explode xmlns:android="http://schemas.android.com/apk/res/android"
+ android:duration="300"/>
diff --git a/res/values/appmsg_colors.xml b/res/values/appmsg_colors.xml
index 86c6d61..5c0fe10 100644
--- a/res/values/appmsg_colors.xml
+++ b/res/values/appmsg_colors.xml
@@ -15,8 +15,8 @@
-->
<resources>
- <color name="alert">#CC0000</color>
- <color name="confirm">#FF8800</color>
- <color name="info">#669900</color>
+ <color name="alert">@color/red</color>
+ <color name="confirm">@color/orange</color>
+ <color name="info">@color/green</color>
</resources>
diff --git a/res/values/cm_colors.xml b/res/values/cm_colors.xml
index 78ca794..5239327 100644
--- a/res/values/cm_colors.xml
+++ b/res/values/cm_colors.xml
@@ -16,22 +16,22 @@
-->
<resources>
<!-- Background colors for LetterTileDrawables definitions. -->
- <color name="letter_tile_purple_color">#9C27B0</color>
- <color name="letter_tile_blue_color">#2196F3</color>
- <color name="letter_tile_indigo_color">#3F51B5</color>
- <color name="letter_tile_teal_color">#009688</color>
- <color name="letter_tile_light_green_color">#8BC34A</color>
- <color name="letter_tile_red_color">#F44336</color>
- <color name="letter_tile_grey_color">#9E9E9E</color>
- <color name="letter_tile_deep_orange_color">#FF5722</color>
- <color name="letter_tile_brown_color">#795548</color>
- <color name="letter_tile_purple_color_dark">#7B1FA2</color>
- <color name="letter_tile_blue_color_dark">#1976D2</color>
- <color name="letter_tile_indigo_color_dark">#303F9F</color>
- <color name="letter_tile_teal_color_dark">#00796B</color>
- <color name="letter_tile_light_green_color_dark">#689F38</color>
- <color name="letter_tile_red_color_dark">#D32F2F</color>
- <color name="letter_tile_grey_color_dark">#616161</color>
- <color name="letter_tile_deep_orange_color_dark">#E64A19</color>
- <color name="letter_tile_brown_color_dark">#5D4037</color>
+ <color name="letter_tile_purple_color">@color/purple</color>
+ <color name="letter_tile_blue_color">@color/blue</color>
+ <color name="letter_tile_indigo_color">@color/indigo</color>
+ <color name="letter_tile_teal_color">@color/teal</color>
+ <color name="letter_tile_light_green_color">@color/green</color>
+ <color name="letter_tile_red_color">@color/red</color>
+ <color name="letter_tile_grey_color">@color/grey</color>
+ <color name="letter_tile_deep_orange_color">@color/orange</color>
+ <color name="letter_tile_brown_color">@color/brown</color>
+ <color name="letter_tile_purple_color_dark">@color/purple_dark</color>
+ <color name="letter_tile_blue_color_dark">@color/blue_dark</color>
+ <color name="letter_tile_indigo_color_dark">@color/indigo_dark</color>
+ <color name="letter_tile_teal_color_dark">@color/teal_dark</color>
+ <color name="letter_tile_light_green_color_dark">@color/green_dark</color>
+ <color name="letter_tile_red_color_dark">@color/red_dark</color>
+ <color name="letter_tile_grey_color_dark">@color/grey_dark</color>
+ <color name="letter_tile_deep_orange_color_dark">@color/orange_dark</color>
+ <color name="letter_tile_brown_color_dark">@color/brown_dark</color>
</resources>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index a12a6f5..481e8b3 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -16,112 +16,107 @@
-->
<resources>
<!-- Material -->
- <color name="primary">#607D8B</color>
- <color name="primary_dark">#455A64</color>
- <color name="primary_light">#78909C</color>
- <color name="accent">#3f51b5</color>
+ <color name="primary">#333333</color>
+ <color name="primary_dark">#282828</color>
+ <color name="primary_light">#444444</color>
+ <color name="accent">#009688</color>
- <!-- light color -->
- <color name="background_color">#ffe4e9ed</color>
-
- <!-- See through -->
- <color name="transparent">#00000000</color>
-
- <!-- Black -->
- <color name="black">#212121</color>
-
- <!-- White -->
+ <!-- Main colors -->
+ <color name="black">#333333</color>
+ <color name="semitransparent_black">#a0333333</color>
<color name="white">#fafafa</color>
+ <color name="grey">#9e9e9e</color>
+ <color name="grey_dark">#616161</color>
+ <color name="purple">#9C27B0</color>
+ <color name="indigo">#673AB7</color>
+ <color name="green">#4CAF50</color>
+ <color name="red">#F44336</color>
+ <color name="orange">#FF5722</color>
+ <color name="brown">#795548</color>
+ <color name="teal">#009688</color>
+ <color name="blue">#3F51B5</color>
+ <color name="purple_dark">#7B1FA2</color>
+ <color name="indigo_dark">#512DA8</color>
+ <color name="green_dark">#388E3C</color>
+ <color name="red_dark">#D32F2F</color>
+ <color name="orange_dark">#F57C00</color>
+ <color name="brown_dark">#5D4037</color>
+ <color name="teal_dark">#00796B</color>
+ <color name="blue_dark">#303F9F</color>
<!-- Standard Text Color -->
- <color name="default_text_color">#cc231f20</color>
- <color name="default_text_color_light">#bfffffff</color>
+ <color name="default_text_color">@color/black</color>
+ <color name="default_text_color_light">@color/white</color>
- <!-- Transparent black -->
- <color name="transparent_black">#99000000</color>
+ <!-- Cards -->
+ <color name="cards_bg_color">#273139</color>
+ <color name="cardOne">@color/white</color>
+ <color name="cardTwo">#e0e0e0</color>
- <!-- Transparent white -->
- <color name="transparent_white">#ffcccccc</color>
+ <!-- Transparent colors -->
+ <color name="transparent">#00000000</color>
+ <color name="transparent_black">#99212121</color>
+ <color name="transparent_white">#99fafafa</color>
+ <color name="transparent_blue">#993F51B5</color>
- <!-- A light, Holo shade of blue -->
- <color name="holo_blue_light">#ff33b5e5</color>
-
- <!-- A light, transparent Holo shade of blue -->
- <color name="holo_blue_light_transparent">#9933b5e5</color>
-
- <!-- A light Holo shade of green -->
- <color name="holo_green_light">#ff99cc00</color>
-
- <!-- A light Holo shade of red -->
- <color name="holo_red_light">#ffff4444</color>
-
- <!-- A Holo shade of purple -->
- <color name="holo_purple">#ffaa66cc</color>
-
- <!-- A light Holo shade of orange -->
- <color name="holo_orange_light">#ffffbb33</color>
-
- <!-- A dark Holo shade of orange -->
- <color name="holo_orange_dark">#ffff8800</color>
+ <color name="background_color">@color/white</color>
<!-- Color for the action bar -->
- <color name="header_action_bar_color">#ff31353f</color>
- <color name="header_action_bar_text_color">#bfffffff</color>
+ <color name="header_action_bar_color">@color/primary</color>
+ <color name="header_action_bar_text_color">#f5f5f5</color>
+ <color name="header_action_bar_text_color_active">#ffffff</color>
<color name="bottom_action_bar_text_color">@color/default_text_color_light</color>
<!-- Background color used on some page headers -->
- <color name="page_header_background">#fff4f4f4</color>
+ <color name="page_header_background">@color/white</color>
<!-- Color for background for shadow on playlist page -->
- <color name="header_shadow_color">#ea31353f</color>
+ <color name="header_shadow_color">#ea212121</color>
<!-- Color for the pop up menu -->
- <color name="menu_divider_color">#4ca19d9e</color>
+ <color name="menu_divider_color">@color/transparent</color>
<color name="menu_text_color">@color/black</color>
<!-- List view related colors -->
- <color name="smart_playlist_item_background">#1931353f</color>
- <color name="list_item_background">#4ce4e9ed</color>
- <color name="list_item_header_text_color">#ff3d4049</color>
- <color name="list_item_search_footer_text_color">#ff41a4f4</color>
+ <color name="list_item_background">#4cfafafa</color>
+ <color name="list_item_header_text_color">@color/black</color>
+ <color name="list_item_search_footer_text_color">@color/accent</color>
<color name="list_item_text_color">@color/default_text_color</color>
<color name="list_item_text_color_light">@color/default_text_color_light</color>
- <color name="list_item_divider_color">#4c231f20</color>
- <color name="list_item_divider_color_light">#34ffffff</color>
- <color name="grid_list_item_text_color">#b3231f20</color>
+ <color name="list_item_divider_color">#4c212121</color>
+ <color name="list_item_divider_color_light">#34fafafa</color>
+ <color name="grid_list_item_text_color">#b3212121</color>
<!-- Top title page colors -->
- <color name="tab_ripple_color">#ffffff</color>
- <color name="tab_accent_color">#ffffff</color>
- <color name="tab_selected_underline_color">#ffffff</color>
+ <color name="tab_ripple_color">@color/white</color>
+ <color name="tab_accent_color">@color/white</color>
+ <color name="tab_selected_underline_color">@color/white</color>
<!-- Search Colors -->
- <color name="search_hint_color">#4cffffff</color>
+ <color name="search_hint_color">@color/white</color>
<!-- Color for the text on the audio player -->
<color name="audio_player_text_color">@color/default_text_color_light</color>
<!-- Color for the Progress bar -->
- <color name="circular_progress_bar_background">#66ffffff</color>
+ <color name="circular_progress_bar_background">#40ffffff</color>
<color name="circular_progress_bar">@color/white</color>
<!-- search no results text color -->
- <color name="no_results">#ff231f20</color>
+ <color name="no_results">@color/black</color>
<color name="no_results_light">@color/white</color>
- <color name="now_playing_divider">#40ffffff</color>
+ <color name="now_playing_divider">@color/transparent</color>
<!-- App widget colors -->
- <color name="widget_divider">#373737</color>
- <!-- 80% opacity white -->
- <color name="widget_text">#ccffffff</color>
+ <color name="widget_text">@color/white</color>
<!-- Background Lyrics Color -->
- <color name="lyrics_background_color">#b2000000</color>
+ <color name="lyrics_background_color">#b2212121</color>
<!-- Letter tile colors -->
- <color name="letter_tile_default_color">#cccccc</color>
- <color name="letter_tile_font_color">#ffffff</color>
+ <color name="letter_tile_default_color">@color/grey</color>
+ <color name="letter_tile_font_color">@color/white</color>
<array name="letter_tile_colors">
<item>@color/letter_tile_purple_color</item>
<item>@color/letter_tile_blue_color</item>
@@ -147,5 +142,5 @@
</array>
<!-- Color for the visualizer bars -->
- <color name="visualizer_fill_color">#bfffffff</color>
+ <color name="visualizer_fill_color">#bffafafa</color>
</resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 0920551..dbbf5e8 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -17,20 +17,20 @@
<resources>
<!-- Text sizes -->
- <dimen name="text_size_extra_micro">10.0sp</dimen>
- <dimen name="text_size_micro">12.0sp</dimen>
- <dimen name="text_size_small">12.0sp</dimen>
- <dimen name="text_size_medium">14.0sp</dimen>
- <dimen name="text_size_large">16.0sp</dimen>
- <dimen name="text_size_x_large">22.0sp</dimen>
- <dimen name="text_size_dayum">34.0sp</dimen>
+ <dimen name="text_size_extra_micro">12sp</dimen>
+ <dimen name="text_size_micro">13sp</dimen>
+ <dimen name="text_size_small">14sp</dimen>
+ <dimen name="text_size_medium">16sp</dimen>
+ <dimen name="text_size_large">22sp</dimen>
+ <dimen name="text_size_x_large">24sp</dimen>
+ <dimen name="text_size_dayum">34sp</dimen>
<!-- Frequently used spacing between elements in many layouts -->
- <dimen name="standard_padding">16.0dip</dimen>
+ <dimen name="standard_padding">16.0dp</dimen>
<!-- overflow menu used on page headers and in list items -->
- <dimen name="overflow_height">48.0dip</dimen>
- <dimen name="overflow_width">38.0dip</dimen>
+ <dimen name="overflow_height">56dp</dimen>
+ <dimen name="overflow_width">48dp</dimen>
<!-- List and grid view padding -->
<dimen name="list_preferred_item_padding">14.0dip</dimen>
@@ -47,19 +47,19 @@
<dimen name="list_item_queue_text_padding_left">15.0dip</dimen>
<!-- List view fast scroll padding left -->
- <dimen name="fast_scroll_padding_left">8.0dip</dimen>
+ <dimen name="fast_scroll_padding_left">8dp</dimen>
<!-- List view fast scroll padding right -->
- <dimen name="fast_scroll_padding_right">8.0dip</dimen>
+ <dimen name="fast_scroll_padding_right">8dp</dimen>
<!-- grid view vertical and horizontal spacing -->
- <dimen name="grid_item_horizontal_spacing">8.0dip</dimen>
- <dimen name="grid_item_vertical_spacing">8.0dip</dimen>
+ <dimen name="grid_item_horizontal_spacing">2dp</dimen>
+ <dimen name="grid_item_vertical_spacing">2dp</dimen>
<!-- List item detailed height -->
- <dimen name="list_item_detailed_height">120.0dip</dimen>
+ <dimen name="list_item_detailed_height">128dp</dimen>
<!-- Top margin of "line_two" -->
- <dimen name="list_item_line_two_margin_top">8.0dip</dimen>
+ <dimen name="list_item_line_two_margin_top">8dp</dimen>
<!-- Left padding in the grid text -->
- <dimen name="grid_item_padding_left">8.0dip</dimen>
- <dimen name="grid_item_padding_right">5.0dip</dimen>
+ <dimen name="grid_item_padding_left">16dp</dimen>
+ <dimen name="grid_item_padding_right">16dp</dimen>
<!-- Left padding in the grid text -->
<dimen name="grid_bottom_height">44dip</dimen>
<!-- Grid and list item normal height -->
diff --git a/res/values/donottranslate.xml b/res/values/donottranslate.xml
index 7d3584b..a15befd 100644
--- a/res/values/donottranslate.xml
+++ b/res/values/donottranslate.xml
@@ -22,7 +22,5 @@
<string name="durationformatlong" translatable="false"><xliff:g id="format">%1$d:%2$02d:%3$02d</xliff:g></string>
<!-- Do not translate. This provides a separator for two strings -->
<string name="combine_two_strings" translatable="false">%1$s | %2$s</string>
-
- <!-- Font family used when drawing letters for letter tile avatars. -->
- <string name="letter_tile_letter_font_family" translatable="false">sans-serif-light</string>
+ <string name="letter_tile_letter_font_family" translatable="false">roboto</string>
</resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index d9564a7..93acfd1 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -24,11 +24,13 @@
<item name="android:textAppearanceLargePopupMenu">@style/LargePopupMenu</item>
<item name="android:listViewStyle">@style/ListView</item>
<item name="android:actionBarStyle">@style/ActionBar</item>
- <item name="android:actionOverflowButtonStyle">@style/ActionOverFlowButton</item>
<item name="android:actionBarWidgetTheme">@style/ActionBarWidgetTheme</item>
<item name="android:colorPrimary">@color/primary</item>
<item name="android:colorPrimaryDark">@color/primary_dark</item>
<item name="android:colorAccent">@color/accent</item>
+ <item name="android:windowContentTransitions">true</item>
+ <item name="android:windowAllowEnterTransitionOverlap">false</item>
+ <item name="android:windowAllowReturnTransitionOverlap">false</item>
</style>
<style name="ActionBarWidgetTheme" parent="@android:style/Theme.Material">
@@ -54,48 +56,27 @@
<item name="android:dividerHeight">@dimen/divider_height</item>
</style>
- <!-- Sets up the pop up menu backgroudn resource -->
- <style name="PopupMenu" parent="@android:style/Widget.Material.PopupMenu">
- <item name="android:popupBackground">@drawable/menu_background</item>
- </style>
+ <style name="PopupMenu" parent="@android:style/Widget.Material.PopupMenu"/>
- <!-- Sets up the pop up menu divider color and height -->
- <style name="DropDownListView" parent="@android:style/Widget.Material.ListView.DropDown">
- <item name="android:divider">@color/menu_divider_color</item>
- <item name="android:dividerHeight">@dimen/divider_height</item>
- </style>
+ <style name="DropDownListView" parent="@android:style/Widget.Material.ListView.DropDown"/>
<!-- Sets up the pop up menu text color and size -->
<style name="SmallPopupMenu" parent="@android:style/TextAppearance.Widget.PopupMenu.Small">
- <item name="android:fontFamily">sans-serif-light</item>
<item name="android:textColor">@color/menu_text_color</item>
<item name="android:textSize">@dimen/text_size_medium</item>
</style>
<!-- Sets up the pop up menu text color and size -->
<style name="LargePopupMenu" parent="@android:style/TextAppearance.Widget.PopupMenu.Large">
- <item name="android:fontFamily">sans-serif-light</item>
<item name="android:textColor">@color/menu_text_color</item>
<item name="android:textSize">@dimen/text_size_medium</item>
</style>
<!-- Sets the action bar title text style -->
<style name="ActionBar" parent="@android:style/Widget.Material.ActionBar">
- <item name="android:titleTextStyle">@style/ActionBar.TitleText</item>
- <item name="android:subtitleTextStyle">@style/ActionBar.SubtitleText</item>
<item name="android:background">@color/header_action_bar_color</item>
</style>
- <!-- Sets the action bar title text color -->
- <style name="ActionBar.TitleText" parent="@android:style/TextAppearance.Material.Widget.ActionBar.Title">
- <item name="android:textColor">@color/header_action_bar_text_color</item>
- <item name="android:textSize">@dimen/text_size_medium</item>
- </style>
-
- <style name="ActionBar.SubtitleText" parent="@android:style/TextAppearance.Material.Widget.ActionBar.Subtitle">
- <item name="android:textColor">@color/header_action_bar_text_color</item>
- </style>
-
<!-- Sets the action bar menu icon -->
<style name="ActionOverFlowButton" parent="@android:style/Widget.Material.ActionButton.Overflow">
<item name="android:src">@drawable/menu_button_light</item>
@@ -108,7 +89,6 @@
<style name="ListItemMainText">
<item name="android:textColor">@color/list_item_text_color</item>
<item name="android:textSize">@dimen/list_item_main_text_size</item>
- <item name="android:fontFamily">sans-serif</item>
<item name="android:textStyle">bold</item>
<item name="android:ellipsize">end</item>
</style>
@@ -126,7 +106,6 @@
<style name="ListItemSecondaryText">
<item name="android:textColor">@color/list_item_text_color</item>
<item name="android:textSize">@dimen/list_item_secondary_text_size</item>
- <item name="android:fontFamily">sans-serif-light</item>
<item name="android:textStyle">normal</item>
<item name="android:ellipsize">end</item>
</style>
@@ -189,13 +168,11 @@
</style>
<style name="BottomActionBarLineOne" parent="@style/BottomActionBarText">
- <item name="android:fontFamily">sans-serif</item>
<item name="android:textStyle">bold</item>
<item name="android:textSize">@dimen/text_size_small</item>
</style>
<style name="BottomActionBarLineTwo" parent="@style/BottomActionBarText">
- <item name="android:fontFamily">sans-serif-light</item>
<item name="android:textSize">@dimen/text_size_extra_micro</item>
</style>
@@ -213,6 +190,5 @@
<style name="HeaderTabTextStyle" parent="android:style/Widget.Material.ActionBar.TabText">
<item name="android:textColor">@color/tab_text_color</item>
<item name="android:textSize">@dimen/tab_text_size</item>
- <item name="android:fontFamily">"sans-serif-medium"</item>
</style>
</resources>
diff --git a/res/xml/app_widget_large.xml b/res/xml/app_widget_large.xml
index d4d2979..f3615dd 100644
--- a/res/xml/app_widget_large.xml
+++ b/res/xml/app_widget_large.xml
@@ -18,6 +18,5 @@
android:initialLayout="@layout/app_widget_large"
android:minHeight="@dimen/app_widget_large_min_height"
android:minWidth="@dimen/app_widget_large_min_width"
- android:previewImage="@drawable/app_widget_large"
android:updatePeriodMillis="0"
- android:widgetCategory="keyguard|home_screen" />
+ android:widgetCategory="home_screen" />
diff --git a/res/xml/app_widget_large_alternate.xml b/res/xml/app_widget_large_alternate.xml
index 8e4c182..c637eb6 100644
--- a/res/xml/app_widget_large_alternate.xml
+++ b/res/xml/app_widget_large_alternate.xml
@@ -18,6 +18,5 @@
android:initialLayout="@layout/app_widget_large_alternate"
android:minHeight="@dimen/app_widget_large_min_height"
android:minWidth="@dimen/app_widget_large_min_width"
- android:previewImage="@drawable/app_widget_large_alternate"
android:updatePeriodMillis="0"
- android:widgetCategory="keyguard|home_screen" />
+ android:widgetCategory="home_screen" />
diff --git a/res/xml/app_widget_small.xml b/res/xml/app_widget_small.xml
index a6fbd31..b2304f7 100644
--- a/res/xml/app_widget_small.xml
+++ b/res/xml/app_widget_small.xml
@@ -18,6 +18,5 @@
android:initialLayout="@layout/app_widget_small"
android:minHeight="@dimen/app_widget_small_min_height"
android:minWidth="@dimen/app_widget_small_min_width"
- android:previewImage="@drawable/app_widget_small"
android:updatePeriodMillis="0"
- android:widgetCategory="keyguard|home_screen" />
+ android:widgetCategory="home_screen" />
\ No newline at end of file
diff --git a/src/com/cyanogenmod/eleven/dragdrop/DragSortListView.java b/src/com/cyanogenmod/eleven/dragdrop/DragSortListView.java
index e7be9eb..9d36af1 100644
--- a/src/com/cyanogenmod/eleven/dragdrop/DragSortListView.java
+++ b/src/com/cyanogenmod/eleven/dragdrop/DragSortListView.java
@@ -393,9 +393,8 @@
DragSortController.ON_DOWN, DragSortController.FLING_RIGHT_REMOVE);
mController.setRemoveEnabled(true);
mController.setSortEnabled(true);
- /* Transparent holo light blue */
mController
- .setBackgroundColor(getResources().getColor(R.color.holo_blue_light_transparent));
+ .setBackgroundColor(getResources().getColor(R.color.accent));
mFloatViewManager = mController;
setOnTouchListener(mController);
diff --git a/src/com/cyanogenmod/eleven/ui/activities/BaseActivity.java b/src/com/cyanogenmod/eleven/ui/activities/BaseActivity.java
index 910fb1b..74172b4 100644
--- a/src/com/cyanogenmod/eleven/ui/activities/BaseActivity.java
+++ b/src/com/cyanogenmod/eleven/ui/activities/BaseActivity.java
@@ -34,6 +34,7 @@
import android.view.View;
import android.widget.ImageView;
import android.widget.TextView;
+import android.widget.Toast;
import android.widget.Toolbar;
import com.cyanogenmod.eleven.IElevenService;
@@ -43,7 +44,6 @@
import com.cyanogenmod.eleven.cache.ICacheListener;
import com.cyanogenmod.eleven.cache.ImageFetcher;
import com.cyanogenmod.eleven.utils.ApolloUtils;
-import com.cyanogenmod.eleven.utils.CustomToast;
import com.cyanogenmod.eleven.utils.Lists;
import com.cyanogenmod.eleven.utils.MusicUtils;
import com.cyanogenmod.eleven.utils.MusicUtils.ServiceToken;
@@ -405,7 +405,7 @@
} else if (action.equals(MusicPlaybackService.TRACK_ERROR)) {
final String errorMsg = context.getString(R.string.error_playing_track,
intent.getStringExtra(MusicPlaybackService.TrackErrorExtra.TRACK_NAME));
- CustomToast.makeText(baseActivity, errorMsg, CustomToast.LENGTH_SHORT).show();
+ Toast.makeText(baseActivity, errorMsg, Toast.LENGTH_SHORT).show();
}
}
}
diff --git a/src/com/cyanogenmod/eleven/ui/activities/SearchActivity.java b/src/com/cyanogenmod/eleven/ui/activities/SearchActivity.java
index 27ef14f..55b9bd7 100644
--- a/src/com/cyanogenmod/eleven/ui/activities/SearchActivity.java
+++ b/src/com/cyanogenmod/eleven/ui/activities/SearchActivity.java
@@ -346,10 +346,6 @@
// Start the loader for the search history
getSupportLoaderManager().initLoader(HISTORY_LOADER, null, mSearchHistoryCallback);
}
-
- // set the background on the root view
- getWindow().getDecorView().getRootView().setBackgroundColor(
- getResources().getColor(R.color.background_color));
}
/**
diff --git a/src/com/cyanogenmod/eleven/ui/fragments/AudioPlayerFragment.java b/src/com/cyanogenmod/eleven/ui/fragments/AudioPlayerFragment.java
index e54eabd..e5dfde6 100644
--- a/src/com/cyanogenmod/eleven/ui/fragments/AudioPlayerFragment.java
+++ b/src/com/cyanogenmod/eleven/ui/fragments/AudioPlayerFragment.java
@@ -116,9 +116,6 @@
// Next button
private RepeatingImageButton mNextButton;
- private BrowseButton mBrowseButton;
- private QueueButton mQueueButton;
-
// Album art ListView
private ViewPager mAlbumArtViewPager;
private LoadingEmptyContainer mQueueEmpty;
@@ -134,9 +131,6 @@
// Visualizer View
private VisualizerView mVisualizerView;
- // Equalizer Gradient
- private View mEqualizerGradient;
-
// Broadcast receiver
private PlaybackStatus mPlaybackStatus;
@@ -194,8 +188,6 @@
mVisualizerView.initialize(getActivity());
updateVisualizerPowerSaveMode();
- mEqualizerGradient = mRootView.findViewById(R.id.equalizerGradient);
-
mLyricsText = (TextView) mRootView.findViewById(R.id.audio_player_lyrics);
return mRootView;
@@ -355,10 +347,6 @@
mRepeatButton = (RepeatButton)mRootView.findViewById(R.id.action_button_repeat);
mPreviousButton = (RepeatingImageButton)mRootView.findViewById(R.id.action_button_previous);
mNextButton = (RepeatingImageButton)mRootView.findViewById(R.id.action_button_next);
- mBrowseButton = (BrowseButton)mRootView.findViewById(R.id.action_button_browse);
- mBrowseButton.setActivity(getActivity());
- mQueueButton = (QueueButton)mRootView.findViewById(R.id.action_button_queue);
- mQueueButton.setActivity(getActivity());
// Album art view pager
mAlbumArtViewPager = (ViewPager)mRootView.findViewById(R.id.audio_player_album_art_viewpager);
@@ -472,16 +460,10 @@
if(queueSize == 0) {
mAlbumArtViewPager.setVisibility(View.GONE);
mQueueEmpty.showNoResults();
- mEqualizerGradient.setVisibility(View.GONE);
mAddToPlaylistButton.setVisibility(View.GONE);
} else {
mAlbumArtViewPager.setVisibility(View.VISIBLE);
mQueueEmpty.hideAll();
- if (PreferenceUtils.getInstance(getActivity()).getShowVisualizer()) {
- mEqualizerGradient.setVisibility(View.VISIBLE);
- } else {
- mEqualizerGradient.setVisibility(View.GONE);
- }
mAddToPlaylistButton.setVisibility(View.VISIBLE);
}
}
diff --git a/src/com/cyanogenmod/eleven/ui/fragments/RecentFragment.java b/src/com/cyanogenmod/eleven/ui/fragments/RecentFragment.java
index 35f70ff..971f8aa 100644
--- a/src/com/cyanogenmod/eleven/ui/fragments/RecentFragment.java
+++ b/src/com/cyanogenmod/eleven/ui/fragments/RecentFragment.java
@@ -16,6 +16,9 @@
import android.app.Activity;
import android.os.Bundle;
import android.support.v4.content.Loader;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
import com.cyanogenmod.eleven.Config;
import com.cyanogenmod.eleven.Config.SmartPlaylistType;
@@ -84,8 +87,16 @@
}
@Override
+ public final View onCreateView(LayoutInflater inflater, ViewGroup container,
+ Bundle savedInstanceState) {
+ setupActionBar();
+ return super.onCreateView(inflater, container, savedInstanceState);
+ }
+
+ @Override
public void setupActionBar() {
((BaseActivity)getActivity()).setupActionBar(R.string.playlist_recently_played);
+ ((BaseActivity)getActivity()).setActionBarElevation(true);
}
@Override
diff --git a/src/com/cyanogenmod/eleven/ui/fragments/profile/LastAddedFragment.java b/src/com/cyanogenmod/eleven/ui/fragments/profile/LastAddedFragment.java
index 6721cca..87300d9 100644
--- a/src/com/cyanogenmod/eleven/ui/fragments/profile/LastAddedFragment.java
+++ b/src/com/cyanogenmod/eleven/ui/fragments/profile/LastAddedFragment.java
@@ -15,6 +15,9 @@
import android.os.Bundle;
import android.support.v4.content.Loader;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
import com.cyanogenmod.eleven.Config;
import com.cyanogenmod.eleven.Config.SmartPlaylistType;
@@ -57,8 +60,16 @@
}
@Override
+ public final View onCreateView(LayoutInflater inflater, ViewGroup container,
+ Bundle savedInstanceState) {
+ setupActionBar();
+ return super.onCreateView(inflater, container, savedInstanceState);
+ }
+
+ @Override
public void setupActionBar() {
((BaseActivity)getActivity()).setupActionBar(R.string.playlist_last_added);
+ ((BaseActivity)getActivity()).setActionBarElevation(true);
}
@Override
diff --git a/src/com/cyanogenmod/eleven/ui/fragments/profile/SmartPlaylistFragment.java b/src/com/cyanogenmod/eleven/ui/fragments/profile/SmartPlaylistFragment.java
index f3907ee..72b2b41 100644
--- a/src/com/cyanogenmod/eleven/ui/fragments/profile/SmartPlaylistFragment.java
+++ b/src/com/cyanogenmod/eleven/ui/fragments/profile/SmartPlaylistFragment.java
@@ -48,7 +48,8 @@
public int getLoaderId() { return LOADER; }
@Override
- public final View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+ public View onCreateView(LayoutInflater inflater, ViewGroup container,
+ Bundle savedInstanceState) {
setHasOptionsMenu(true);
return super.onCreateView(inflater, container, savedInstanceState);
}
diff --git a/src/com/cyanogenmod/eleven/ui/fragments/profile/TopTracksFragment.java b/src/com/cyanogenmod/eleven/ui/fragments/profile/TopTracksFragment.java
index 6891cda..1d71316 100644
--- a/src/com/cyanogenmod/eleven/ui/fragments/profile/TopTracksFragment.java
+++ b/src/com/cyanogenmod/eleven/ui/fragments/profile/TopTracksFragment.java
@@ -16,6 +16,7 @@
import android.app.Activity;
import android.os.Bundle;
import android.support.v4.content.Loader;
+import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.TextView;
@@ -69,8 +70,15 @@
}
@Override
+ public final View onCreateView(LayoutInflater inflater, ViewGroup container,
+ Bundle savedInstanceState) {
+ setupActionBar();
+ return super.onCreateView(inflater, container, savedInstanceState);
+ }
+
public void setupActionBar() {
((BaseActivity)getActivity()).setupActionBar(R.string.playlist_top_tracks);
+ ((BaseActivity)getActivity()).setActionBarElevation(true);
}
public class TopTracksAdapter extends SongAdapter {
diff --git a/src/com/cyanogenmod/eleven/utils/CustomToast.java b/src/com/cyanogenmod/eleven/utils/CustomToast.java
deleted file mode 100644
index 11c567f..0000000
--- a/src/com/cyanogenmod/eleven/utils/CustomToast.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package com.cyanogenmod.eleven.utils;
-
-import android.app.Activity;
-import android.view.Gravity;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.widget.TextView;
-import android.widget.Toast;
-import com.cyanogenmod.eleven.R;
-
-/**
- * Ancillary utilities class to customize the appearance of Toast messages
- */
-public class CustomToast {
-
- public static final int LENGTH_LONG = Toast.LENGTH_LONG;
- public static final int LENGTH_SHORT = Toast.LENGTH_SHORT;
-
- private Toast mToast;
- private TextView mTextView;
-
- public CustomToast(Activity activity, String message) {
- mToast = new Toast( activity.getApplicationContext() );
- LayoutInflater layoutInflater = activity.getLayoutInflater();
- View toastView = layoutInflater.inflate(R.layout.custom_toast, null);
- mToast.setView(toastView);
-
- mTextView = (TextView) toastView.findViewById(R.id.toast_text_view);
- if (message != null) {
- mTextView.setText(message);
- }
-
- // set toast location
- // centered with an offset in y expressed as % of display height
- int displayHeight = activity.getWindow().getDecorView().getHeight();
- int heightOffset = (int)(0.30 * displayHeight);
- mToast.setGravity(Gravity.CENTER_HORIZONTAL, 0, heightOffset);
-
- }
-
- public static CustomToast makeText(Activity context, String text, int duration) {
- CustomToast customToast = new CustomToast(context, text);
- if (duration == CustomToast.LENGTH_LONG)
- customToast.setDuration(duration);
- else
- customToast.setDuration(CustomToast.LENGTH_SHORT);
-
- return customToast;
- }
-
- public void setDuration(int duration) {
- mToast.setDuration(duration);
- }
-
- public void setMessage(String message) {
- mTextView.setText(message);
- }
-
- public void show() {
- mToast.show();
- }
-}
diff --git a/src/com/cyanogenmod/eleven/utils/MusicUtils.java b/src/com/cyanogenmod/eleven/utils/MusicUtils.java
index c8292ef..a8acb9f 100644
--- a/src/com/cyanogenmod/eleven/utils/MusicUtils.java
+++ b/src/com/cyanogenmod/eleven/utils/MusicUtils.java
@@ -39,6 +39,7 @@
import android.provider.Settings;
import android.util.Log;
import android.view.Menu;
+import android.widget.Toast;
import com.cyanogenmod.eleven.Config.IdType;
import com.cyanogenmod.eleven.Config.SmartPlaylistType;
@@ -902,7 +903,6 @@
public static void shuffleAll(final Context context) {
Cursor cursor = SongLoader.makeSongCursor(context, null);
final long[] mTrackList = getSongListForCursor(cursor);
- final int position = 0;
if (mTrackList.length == 0 || mService == null) {
return;
}
@@ -910,8 +910,8 @@
mService.setShuffleMode(MusicPlaybackService.SHUFFLE_NORMAL);
final long mCurrentId = mService.getAudioId();
final int mCurrentQueuePosition = getQueuePosition();
- if (position != -1 && mCurrentQueuePosition == position
- && mCurrentId == mTrackList[position]) {
+ if (mCurrentQueuePosition == 0
+ && mCurrentId == mTrackList[0]) {
final long[] mPlaylist = getQueue();
if (Arrays.equals(mTrackList, mPlaylist)) {
mService.play();
@@ -1148,7 +1148,7 @@
}
final String message = context.getResources().getQuantityString(
R.plurals.NNNtrackstoplaylist, numinserted, numinserted);
- CustomToast.makeText((Activity)context, message, CustomToast.LENGTH_SHORT).show();
+ Toast.makeText((Activity)context, message, Toast.LENGTH_SHORT).show();
playlistChanged();
}
@@ -1167,7 +1167,7 @@
});
final String message = context.getResources().getQuantityString(
R.plurals.NNNtracksfromplaylist, 1, 1);
- CustomToast.makeText((Activity)context, message, CustomToast.LENGTH_SHORT).show();
+ Toast.makeText((Activity)context, message, Toast.LENGTH_SHORT).show();
playlistChanged();
}
@@ -1183,7 +1183,7 @@
try {
mService.enqueue(list, MusicPlaybackService.LAST, sourceId, sourceType.mId);
final String message = makeLabel(context, R.plurals.NNNtrackstoqueue, list.length);
- CustomToast.makeText((Activity) context, message, CustomToast.LENGTH_SHORT).show();
+ Toast.makeText((Activity) context, message, Toast.LENGTH_SHORT).show();
} catch (final RemoteException ignored) {
}
}
@@ -1217,7 +1217,7 @@
Settings.System.putString(resolver, Settings.System.RINGTONE, uri.toString());
final String message = context.getString(R.string.set_as_ringtone,
cursor.getString(2));
- CustomToast.makeText((Activity)context, message, CustomToast.LENGTH_SHORT).show();
+ Toast.makeText((Activity)context, message, Toast.LENGTH_SHORT).show();
}
} finally {
if (cursor != null) {
@@ -1641,7 +1641,7 @@
final String message = makeLabel(context, R.plurals.NNNtracksdeleted, list.length);
- CustomToast.makeText((Activity)context, message, CustomToast.LENGTH_SHORT).show();
+ Toast.makeText((Activity)context, message, Toast.LENGTH_SHORT).show();
// We deleted a number of tracks, which could affect any number of
// things
// in the media content domain, so update everything.
diff --git a/src/com/cyanogenmod/eleven/utils/NavUtils.java b/src/com/cyanogenmod/eleven/utils/NavUtils.java
index ab68fb0..0e74f47 100644
--- a/src/com/cyanogenmod/eleven/utils/NavUtils.java
+++ b/src/com/cyanogenmod/eleven/utils/NavUtils.java
@@ -23,6 +23,7 @@
import android.os.Bundle;
import android.provider.MediaStore;
import android.util.Log;
+import android.widget.Toast;
import com.cyanogenmod.eleven.Config;
import com.cyanogenmod.eleven.R;
@@ -135,8 +136,8 @@
// The google MusicFX apps need to be started using startActivityForResult
context.startActivityForResult(createEffectsIntent(), requestCode);
} catch (final ActivityNotFoundException notFound) {
- CustomToast.makeText(context, context.getString(R.string.no_effects_for_you),
- CustomToast.LENGTH_SHORT).show();
+ Toast.makeText(context, context.getString(R.string.no_effects_for_you),
+ Toast.LENGTH_SHORT).show();
}
}
diff --git a/src/com/cyanogenmod/eleven/utils/PreferenceUtils.java b/src/com/cyanogenmod/eleven/utils/PreferenceUtils.java
index 3932d12..7f4fd12 100644
--- a/src/com/cyanogenmod/eleven/utils/PreferenceUtils.java
+++ b/src/com/cyanogenmod/eleven/utils/PreferenceUtils.java
@@ -170,7 +170,7 @@
*/
public final int getDefaultThemeColor(final Context context) {
return mPreferences.getInt(DEFAULT_THEME_COLOR,
- context.getResources().getColor(R.color.holo_blue_light));
+ context.getResources().getColor(R.color.blue));
}
/**
diff --git a/src/com/cyanogenmod/eleven/widgets/PlayPauseButton.java b/src/com/cyanogenmod/eleven/widgets/PlayPauseButton.java
index 2b68d02..ca74dcf 100644
--- a/src/com/cyanogenmod/eleven/widgets/PlayPauseButton.java
+++ b/src/com/cyanogenmod/eleven/widgets/PlayPauseButton.java
@@ -13,12 +13,16 @@
package com.cyanogenmod.eleven.widgets;
+import android.animation.Animator;
import android.content.Context;
import android.text.TextUtils;
import android.util.AttributeSet;
import android.view.View;
+import android.view.ViewAnimationUtils;
import android.view.View.OnClickListener;
import android.view.View.OnLongClickListener;
+import android.view.animation.Animation;
+import android.view.animation.AnimationUtils;
import android.widget.ImageButton;
import com.cyanogenmod.eleven.R;
@@ -62,6 +66,17 @@
@Override
public void onClick(final View v) {
MusicUtils.playOrPause();
+ int centerX = (v.getLeft() + v.getRight()) / 2;
+ int centerY = (v.getTop() + v.getBottom()) / 2;
+ int startRadius = 0;
+ int endRadius = (int) Math.hypot(v.getWidth(), v.getHeight());
+
+ Animator anim = ViewAnimationUtils.createCircularReveal(
+ v, centerX, centerY, startRadius, endRadius);
+
+ anim.setDuration(800);
+ anim.start();
+
updateState();
}
