diff options
217 files changed, 1705 insertions, 324 deletions
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/Music.apk b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/Music.apk Binary files differindex 9fd0f9a..6254a7c 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/Music.apk +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/Music.apk diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes.dex b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes.dex Binary files differindex e82018b..0c19f7a 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes.dex +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes.dex diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/AlbumBrowserActivity$1.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/AlbumBrowserActivity$1.class Binary files differindex dd97753..623321f 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/AlbumBrowserActivity$1.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/AlbumBrowserActivity$1.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/AlbumBrowserActivity$10.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/AlbumBrowserActivity$10.class Binary files differindex 98bc616..2f13c4a 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/AlbumBrowserActivity$10.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/AlbumBrowserActivity$10.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/AlbumBrowserActivity$11.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/AlbumBrowserActivity$11.class Binary files differindex 6957be3..5257d60 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/AlbumBrowserActivity$11.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/AlbumBrowserActivity$11.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/AlbumBrowserActivity$12.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/AlbumBrowserActivity$12.class Binary files differindex 4ecb7bb..677cc64 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/AlbumBrowserActivity$12.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/AlbumBrowserActivity$12.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/AlbumBrowserActivity$13.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/AlbumBrowserActivity$13.class Binary files differnew file mode 100644 index 0000000..1ce459a --- /dev/null +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/AlbumBrowserActivity$13.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/AlbumBrowserActivity$2.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/AlbumBrowserActivity$2.class Binary files differindex 8499cbc..e4d866c 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/AlbumBrowserActivity$2.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/AlbumBrowserActivity$2.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/AlbumBrowserActivity$3.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/AlbumBrowserActivity$3.class Binary files differindex b3d6c8c..f4a6b91 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/AlbumBrowserActivity$3.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/AlbumBrowserActivity$3.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/AlbumBrowserActivity$4.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/AlbumBrowserActivity$4.class Binary files differindex 44edd9a..5d74297 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/AlbumBrowserActivity$4.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/AlbumBrowserActivity$4.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/AlbumBrowserActivity$5.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/AlbumBrowserActivity$5.class Binary files differindex 26dca9e..9582088 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/AlbumBrowserActivity$5.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/AlbumBrowserActivity$5.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/AlbumBrowserActivity$6.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/AlbumBrowserActivity$6.class Binary files differindex 2ebea47..be69609 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/AlbumBrowserActivity$6.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/AlbumBrowserActivity$6.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/AlbumBrowserActivity$7.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/AlbumBrowserActivity$7.class Binary files differindex 38918af..52944c5 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/AlbumBrowserActivity$7.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/AlbumBrowserActivity$7.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/AlbumBrowserActivity$8.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/AlbumBrowserActivity$8.class Binary files differindex eaefaa2..7892894 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/AlbumBrowserActivity$8.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/AlbumBrowserActivity$8.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/AlbumBrowserActivity$9.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/AlbumBrowserActivity$9.class Binary files differindex ba6a550..694f8ab 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/AlbumBrowserActivity$9.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/AlbumBrowserActivity$9.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/AlbumBrowserActivity$AlbumListAdapter$1.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/AlbumBrowserActivity$AlbumListAdapter$1.class Binary files differindex b8ac0ae..a46f2a4 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/AlbumBrowserActivity$AlbumListAdapter$1.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/AlbumBrowserActivity$AlbumListAdapter$1.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/AlbumBrowserActivity$AlbumListAdapter$QueryHandler.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/AlbumBrowserActivity$AlbumListAdapter$QueryHandler.class Binary files differindex 535c0a1..9829c3a 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/AlbumBrowserActivity$AlbumListAdapter$QueryHandler.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/AlbumBrowserActivity$AlbumListAdapter$QueryHandler.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/AlbumBrowserActivity$AlbumListAdapter$ViewHolder.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/AlbumBrowserActivity$AlbumListAdapter$ViewHolder.class Binary files differindex b9b6ad7..222fe72 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/AlbumBrowserActivity$AlbumListAdapter$ViewHolder.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/AlbumBrowserActivity$AlbumListAdapter$ViewHolder.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/AlbumBrowserActivity$AlbumListAdapter.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/AlbumBrowserActivity$AlbumListAdapter.class Binary files differindex 8706732..16b0b75 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/AlbumBrowserActivity$AlbumListAdapter.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/AlbumBrowserActivity$AlbumListAdapter.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/AlbumBrowserActivity$ModeCallback.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/AlbumBrowserActivity$ModeCallback.class Binary files differindex 49c3d3e..b5eb299 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/AlbumBrowserActivity$ModeCallback.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/AlbumBrowserActivity$ModeCallback.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/AlbumBrowserActivity$NowPlayingGesture.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/AlbumBrowserActivity$NowPlayingGesture.class Binary files differindex d2bab2e..2081c2d 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/AlbumBrowserActivity$NowPlayingGesture.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/AlbumBrowserActivity$NowPlayingGesture.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/AlbumBrowserActivity$TabSwipe.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/AlbumBrowserActivity$TabSwipe.class Binary files differindex 90b5dc1..dc9bbef 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/AlbumBrowserActivity$TabSwipe.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/AlbumBrowserActivity$TabSwipe.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/AlbumBrowserActivity.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/AlbumBrowserActivity.class Binary files differindex f54d975..cf064f5 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/AlbumBrowserActivity.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/AlbumBrowserActivity.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/ArtistAlbumBrowserActivity$1.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/ArtistAlbumBrowserActivity$1.class Binary files differindex ef13891..8572422 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/ArtistAlbumBrowserActivity$1.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/ArtistAlbumBrowserActivity$1.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/ArtistAlbumBrowserActivity$10.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/ArtistAlbumBrowserActivity$10.class Binary files differindex 27bddf2..58240d9 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/ArtistAlbumBrowserActivity$10.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/ArtistAlbumBrowserActivity$10.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/ArtistAlbumBrowserActivity$11.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/ArtistAlbumBrowserActivity$11.class Binary files differindex f648123..713306e 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/ArtistAlbumBrowserActivity$11.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/ArtistAlbumBrowserActivity$11.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/ArtistAlbumBrowserActivity$12.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/ArtistAlbumBrowserActivity$12.class Binary files differindex 594ef64..5878170 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/ArtistAlbumBrowserActivity$12.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/ArtistAlbumBrowserActivity$12.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/ArtistAlbumBrowserActivity$13.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/ArtistAlbumBrowserActivity$13.class Binary files differnew file mode 100644 index 0000000..864f2b7 --- /dev/null +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/ArtistAlbumBrowserActivity$13.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/ArtistAlbumBrowserActivity$2.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/ArtistAlbumBrowserActivity$2.class Binary files differindex 0b056f7..14af0c7 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/ArtistAlbumBrowserActivity$2.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/ArtistAlbumBrowserActivity$2.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/ArtistAlbumBrowserActivity$3.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/ArtistAlbumBrowserActivity$3.class Binary files differindex ec524b0..3f8312a 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/ArtistAlbumBrowserActivity$3.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/ArtistAlbumBrowserActivity$3.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/ArtistAlbumBrowserActivity$4.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/ArtistAlbumBrowserActivity$4.class Binary files differindex 56d895d..0edd63e 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/ArtistAlbumBrowserActivity$4.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/ArtistAlbumBrowserActivity$4.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/ArtistAlbumBrowserActivity$5.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/ArtistAlbumBrowserActivity$5.class Binary files differindex f8f769d..4fad905 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/ArtistAlbumBrowserActivity$5.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/ArtistAlbumBrowserActivity$5.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/ArtistAlbumBrowserActivity$6.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/ArtistAlbumBrowserActivity$6.class Binary files differindex 1189ba1..32fd8d2 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/ArtistAlbumBrowserActivity$6.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/ArtistAlbumBrowserActivity$6.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/ArtistAlbumBrowserActivity$7.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/ArtistAlbumBrowserActivity$7.class Binary files differindex e3d2ade..577e988 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/ArtistAlbumBrowserActivity$7.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/ArtistAlbumBrowserActivity$7.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/ArtistAlbumBrowserActivity$8.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/ArtistAlbumBrowserActivity$8.class Binary files differindex d2840b3..1771269 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/ArtistAlbumBrowserActivity$8.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/ArtistAlbumBrowserActivity$8.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/ArtistAlbumBrowserActivity$9.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/ArtistAlbumBrowserActivity$9.class Binary files differindex 0f1c1e2..35dfa7a 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/ArtistAlbumBrowserActivity$9.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/ArtistAlbumBrowserActivity$9.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/ArtistAlbumBrowserActivity$ArtistAlbumListAdapter$1.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/ArtistAlbumBrowserActivity$ArtistAlbumListAdapter$1.class Binary files differindex 418b605..91cdb3d 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/ArtistAlbumBrowserActivity$ArtistAlbumListAdapter$1.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/ArtistAlbumBrowserActivity$ArtistAlbumListAdapter$1.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/ArtistAlbumBrowserActivity$ArtistAlbumListAdapter$1MyCursorWrapper.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/ArtistAlbumBrowserActivity$ArtistAlbumListAdapter$1MyCursorWrapper.class Binary files differindex ff14ca9..88889be 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/ArtistAlbumBrowserActivity$ArtistAlbumListAdapter$1MyCursorWrapper.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/ArtistAlbumBrowserActivity$ArtistAlbumListAdapter$1MyCursorWrapper.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/ArtistAlbumBrowserActivity$ArtistAlbumListAdapter$QueryHandler.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/ArtistAlbumBrowserActivity$ArtistAlbumListAdapter$QueryHandler.class Binary files differindex aea75c4..85dd5f2 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/ArtistAlbumBrowserActivity$ArtistAlbumListAdapter$QueryHandler.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/ArtistAlbumBrowserActivity$ArtistAlbumListAdapter$QueryHandler.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/ArtistAlbumBrowserActivity$ArtistAlbumListAdapter$ViewHolder.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/ArtistAlbumBrowserActivity$ArtistAlbumListAdapter$ViewHolder.class Binary files differindex 89d149b..09da508 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/ArtistAlbumBrowserActivity$ArtistAlbumListAdapter$ViewHolder.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/ArtistAlbumBrowserActivity$ArtistAlbumListAdapter$ViewHolder.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/ArtistAlbumBrowserActivity$ArtistAlbumListAdapter.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/ArtistAlbumBrowserActivity$ArtistAlbumListAdapter.class Binary files differindex b784a2c..13431d6 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/ArtistAlbumBrowserActivity$ArtistAlbumListAdapter.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/ArtistAlbumBrowserActivity$ArtistAlbumListAdapter.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/ArtistAlbumBrowserActivity$NowPlayingGesture.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/ArtistAlbumBrowserActivity$NowPlayingGesture.class Binary files differindex 18d5727..3a50143 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/ArtistAlbumBrowserActivity$NowPlayingGesture.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/ArtistAlbumBrowserActivity$NowPlayingGesture.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/ArtistAlbumBrowserActivity$TabSwipe.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/ArtistAlbumBrowserActivity$TabSwipe.class Binary files differindex 92a3407..ab84843 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/ArtistAlbumBrowserActivity$TabSwipe.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/ArtistAlbumBrowserActivity$TabSwipe.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/ArtistAlbumBrowserActivity.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/ArtistAlbumBrowserActivity.class Binary files differindex 6aacc83..6f1a369 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/ArtistAlbumBrowserActivity.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/ArtistAlbumBrowserActivity.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/AudioPreview.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/AudioPreview.class Binary files differindex f57d23a..d3a7f2c 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/AudioPreview.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/AudioPreview.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/ColorPicker.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/ColorPicker.class Binary files differindex 5840cd9..2dfba14 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/ColorPicker.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/ColorPicker.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/CreatePlaylist.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/CreatePlaylist.class Binary files differindex c53b37b..4f04185 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/CreatePlaylist.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/CreatePlaylist.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/DeleteItems.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/DeleteItems.class Binary files differindex 0371c3b..d0f9801 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/DeleteItems.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/DeleteItems.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaAppWidgetProvider3x1.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaAppWidgetProvider3x1.class Binary files differindex aeae120..e06403b 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaAppWidgetProvider3x1.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaAppWidgetProvider3x1.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaAppWidgetProvider4x1.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaAppWidgetProvider4x1.class Binary files differindex f66dbe5..2884cb9 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaAppWidgetProvider4x1.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaAppWidgetProvider4x1.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaAppWidgetProvider4x2.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaAppWidgetProvider4x2.class Binary files differindex 82eca68..1f0a48e 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaAppWidgetProvider4x2.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaAppWidgetProvider4x2.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPickerActivity$PickListAdapter.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPickerActivity$PickListAdapter.class Binary files differindex c9cf004..012f2a0 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPickerActivity$PickListAdapter.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPickerActivity$PickListAdapter.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPickerActivity.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPickerActivity.class Binary files differindex 1a09a43..14fbee7 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPickerActivity.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPickerActivity.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPlaybackActivity$1.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPlaybackActivity$1.class Binary files differindex 5514fe5..885a3d3 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPlaybackActivity$1.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPlaybackActivity$1.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPlaybackActivity$10.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPlaybackActivity$10.class Binary files differindex f13d9c9..e2e3818 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPlaybackActivity$10.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPlaybackActivity$10.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPlaybackActivity$11.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPlaybackActivity$11.class Binary files differindex 3d981af..9917ac8 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPlaybackActivity$11.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPlaybackActivity$11.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPlaybackActivity$12.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPlaybackActivity$12.class Binary files differindex 2b05331..e4a8c59 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPlaybackActivity$12.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPlaybackActivity$12.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPlaybackActivity$13.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPlaybackActivity$13.class Binary files differindex 818515b..befa5da 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPlaybackActivity$13.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPlaybackActivity$13.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPlaybackActivity$14.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPlaybackActivity$14.class Binary files differindex 7afe3e7..00a6bc7 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPlaybackActivity$14.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPlaybackActivity$14.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPlaybackActivity$15.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPlaybackActivity$15.class Binary files differindex fc2ee3e..43c73fa 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPlaybackActivity$15.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPlaybackActivity$15.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPlaybackActivity$16.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPlaybackActivity$16.class Binary files differindex 29dcc81..d9becfe 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPlaybackActivity$16.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPlaybackActivity$16.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPlaybackActivity$17.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPlaybackActivity$17.class Binary files differindex d45a223..67f0f8c 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPlaybackActivity$17.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPlaybackActivity$17.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPlaybackActivity$18.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPlaybackActivity$18.class Binary files differindex 1ec37bf..685ed73 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPlaybackActivity$18.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPlaybackActivity$18.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPlaybackActivity$19.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPlaybackActivity$19.class Binary files differindex 6139c6a..a9f2a96 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPlaybackActivity$19.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPlaybackActivity$19.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPlaybackActivity$2.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPlaybackActivity$2.class Binary files differindex c821198..2e73942 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPlaybackActivity$2.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPlaybackActivity$2.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPlaybackActivity$20.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPlaybackActivity$20.class Binary files differindex c78c4f5..1a1f221 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPlaybackActivity$20.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPlaybackActivity$20.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPlaybackActivity$21.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPlaybackActivity$21.class Binary files differindex 4dcd146..ce93b19 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPlaybackActivity$21.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPlaybackActivity$21.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPlaybackActivity$22$1.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPlaybackActivity$22$1.class Binary files differindex 573ded6..536fd60 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPlaybackActivity$22$1.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPlaybackActivity$22$1.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPlaybackActivity$22.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPlaybackActivity$22.class Binary files differindex 57a2d78..d278fdd 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPlaybackActivity$22.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPlaybackActivity$22.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPlaybackActivity$23.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPlaybackActivity$23.class Binary files differindex 6555a4b..bf6f652 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPlaybackActivity$23.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPlaybackActivity$23.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPlaybackActivity$3.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPlaybackActivity$3.class Binary files differindex c59c7c8..48f1420 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPlaybackActivity$3.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPlaybackActivity$3.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPlaybackActivity$4.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPlaybackActivity$4.class Binary files differindex f7855b5..4de2fe3 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPlaybackActivity$4.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPlaybackActivity$4.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPlaybackActivity$5.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPlaybackActivity$5.class Binary files differindex e7955c7..652b368 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPlaybackActivity$5.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPlaybackActivity$5.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPlaybackActivity$6.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPlaybackActivity$6.class Binary files differindex 6990bb8..a454224 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPlaybackActivity$6.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPlaybackActivity$6.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPlaybackActivity$7.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPlaybackActivity$7.class Binary files differindex 74d8ffc..8d7d648 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPlaybackActivity$7.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPlaybackActivity$7.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPlaybackActivity$8.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPlaybackActivity$8.class Binary files differindex cb80c3d..90c610f 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPlaybackActivity$8.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPlaybackActivity$8.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPlaybackActivity$9.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPlaybackActivity$9.class Binary files differindex 0259775..38e283c 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPlaybackActivity$9.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPlaybackActivity$9.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPlaybackActivity$AlbumArtHandler.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPlaybackActivity$AlbumArtHandler.class Binary files differindex cd074b8..39b4b0e 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPlaybackActivity$AlbumArtHandler.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPlaybackActivity$AlbumArtHandler.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPlaybackActivity$AlbumSongIdWrapper.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPlaybackActivity$AlbumSongIdWrapper.class Binary files differindex 62d21f7..da59a9d 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPlaybackActivity$AlbumSongIdWrapper.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPlaybackActivity$AlbumSongIdWrapper.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPlaybackActivity$Worker.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPlaybackActivity$Worker.class Binary files differindex 7e969e3..99eb8c8 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPlaybackActivity$Worker.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPlaybackActivity$Worker.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPlaybackActivity.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPlaybackActivity.class Binary files differindex cb42c6c..60f79c5 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPlaybackActivity.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPlaybackActivity.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPlaybackService$1.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPlaybackService$1.class Binary files differindex 13d5d75..25e7398 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPlaybackService$1.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPlaybackService$1.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPlaybackService$2.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPlaybackService$2.class Binary files differindex dd97fbe..1830503 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPlaybackService$2.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPlaybackService$2.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPlaybackService$3.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPlaybackService$3.class Binary files differindex 4e37e7c..71a4cad 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPlaybackService$3.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPlaybackService$3.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPlaybackService$4.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPlaybackService$4.class Binary files differindex 99e0e15..20df204 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPlaybackService$4.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPlaybackService$4.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPlaybackService$5.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPlaybackService$5.class Binary files differindex 037faae..b833057 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPlaybackService$5.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPlaybackService$5.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPlaybackService$6.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPlaybackService$6.class Binary files differindex cc4b604..1f24c6d 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPlaybackService$6.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPlaybackService$6.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPlaybackService$7.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPlaybackService$7.class Binary files differindex cdb59de..984ff12 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPlaybackService$7.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPlaybackService$7.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPlaybackService$MultiPlayer$1.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPlaybackService$MultiPlayer$1.class Binary files differindex abe0e57..b4fdc18 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPlaybackService$MultiPlayer$1.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPlaybackService$MultiPlayer$1.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPlaybackService$MultiPlayer$2.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPlaybackService$MultiPlayer$2.class Binary files differindex 2f96787..2c627f6 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPlaybackService$MultiPlayer$2.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPlaybackService$MultiPlayer$2.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPlaybackService$MultiPlayer.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPlaybackService$MultiPlayer.class Binary files differindex 8617435..f4dbb5f 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPlaybackService$MultiPlayer.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPlaybackService$MultiPlayer.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPlaybackService$ServiceStub.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPlaybackService$ServiceStub.class Binary files differindex b9b7144..f515104 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPlaybackService$ServiceStub.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPlaybackService$ServiceStub.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPlaybackService$Shuffler.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPlaybackService$Shuffler.class Binary files differindex 8d7513b..d25aeb4 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPlaybackService$Shuffler.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPlaybackService$Shuffler.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPlaybackService.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPlaybackService.class Binary files differindex bd33702..3d2c182 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPlaybackService.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MediaPlaybackService.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MusicBrowserActivity.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MusicBrowserActivity.class Binary files differindex 94fb96f..24cb0c5 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MusicBrowserActivity.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MusicBrowserActivity.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MusicPicker$TrackListAdapter.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MusicPicker$TrackListAdapter.class Binary files differindex 9918b14..69960f1 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MusicPicker$TrackListAdapter.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MusicPicker$TrackListAdapter.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MusicPicker.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MusicPicker.class Binary files differindex 3de8860..46d801e 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MusicPicker.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MusicPicker.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MusicSettingsActivity$1.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MusicSettingsActivity$1.class Binary files differindex 67e6173..5e779d3 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MusicSettingsActivity$1.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MusicSettingsActivity$1.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MusicSettingsActivity$2.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MusicSettingsActivity$2.class Binary files differindex c93b416..43df28f 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MusicSettingsActivity$2.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MusicSettingsActivity$2.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MusicSettingsActivity$3.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MusicSettingsActivity$3.class Binary files differindex 86d09ee..d2681c0 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MusicSettingsActivity$3.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MusicSettingsActivity$3.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MusicSettingsActivity$4.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MusicSettingsActivity$4.class Binary files differindex 2e50417..0ed145b 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MusicSettingsActivity$4.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MusicSettingsActivity$4.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MusicSettingsActivity$5.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MusicSettingsActivity$5.class Binary files differindex 3b17444..3b52282 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MusicSettingsActivity$5.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MusicSettingsActivity$5.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MusicSettingsActivity$6.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MusicSettingsActivity$6.class Binary files differnew file mode 100644 index 0000000..1432588 --- /dev/null +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MusicSettingsActivity$6.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MusicSettingsActivity$7.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MusicSettingsActivity$7.class Binary files differnew file mode 100644 index 0000000..fbecaa8 --- /dev/null +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MusicSettingsActivity$7.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MusicSettingsActivity$8.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MusicSettingsActivity$8.class Binary files differnew file mode 100644 index 0000000..b06b97f --- /dev/null +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MusicSettingsActivity$8.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MusicSettingsActivity$9.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MusicSettingsActivity$9.class Binary files differnew file mode 100644 index 0000000..5d448fa --- /dev/null +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MusicSettingsActivity$9.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MusicSettingsActivity.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MusicSettingsActivity.class Binary files differindex a6c3f03..4dc09dc 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MusicSettingsActivity.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MusicSettingsActivity.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MusicUtils$1.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MusicUtils$1.class Binary files differindex 791f69d..3703236 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MusicUtils$1.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MusicUtils$1.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MusicUtils$2.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MusicUtils$2.class Binary files differindex 214b0a1..4701497 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MusicUtils$2.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MusicUtils$2.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MusicUtils$3.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MusicUtils$3.class Binary files differindex 81de322..96372af 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MusicUtils$3.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MusicUtils$3.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MusicUtils$FastBitmapDrawable.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MusicUtils$FastBitmapDrawable.class Binary files differindex 2b34af0..8a73b66 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MusicUtils$FastBitmapDrawable.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MusicUtils$FastBitmapDrawable.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MusicUtils$LogEntry.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MusicUtils$LogEntry.class Binary files differindex e9f8ac8..fee3bf8 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MusicUtils$LogEntry.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MusicUtils$LogEntry.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MusicUtils$ServiceBinder.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MusicUtils$ServiceBinder.class Binary files differindex d45b0e3..3eff717 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MusicUtils$ServiceBinder.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MusicUtils$ServiceBinder.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MusicUtils$ServiceToken.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MusicUtils$ServiceToken.class Binary files differindex abc54a5..7f65f7a 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MusicUtils$ServiceToken.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MusicUtils$ServiceToken.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MusicUtils.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MusicUtils.class Binary files differindex 835a9e8..b243877 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MusicUtils.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/MusicUtils.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/PlaylistBrowserActivity$1.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/PlaylistBrowserActivity$1.class Binary files differindex 57539ea..7e9c09e 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/PlaylistBrowserActivity$1.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/PlaylistBrowserActivity$1.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/PlaylistBrowserActivity$10.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/PlaylistBrowserActivity$10.class Binary files differindex e5aba69..b9255c6 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/PlaylistBrowserActivity$10.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/PlaylistBrowserActivity$10.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/PlaylistBrowserActivity$11.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/PlaylistBrowserActivity$11.class Binary files differindex 7fbb769..04be82b 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/PlaylistBrowserActivity$11.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/PlaylistBrowserActivity$11.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/PlaylistBrowserActivity$12.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/PlaylistBrowserActivity$12.class Binary files differindex 9e7be4e..7426353 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/PlaylistBrowserActivity$12.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/PlaylistBrowserActivity$12.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/PlaylistBrowserActivity$13.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/PlaylistBrowserActivity$13.class Binary files differindex a8597de..72d33ca 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/PlaylistBrowserActivity$13.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/PlaylistBrowserActivity$13.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/PlaylistBrowserActivity$14.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/PlaylistBrowserActivity$14.class Binary files differindex 1f8089a..d2243b9 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/PlaylistBrowserActivity$14.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/PlaylistBrowserActivity$14.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/PlaylistBrowserActivity$15.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/PlaylistBrowserActivity$15.class Binary files differnew file mode 100644 index 0000000..8182494 --- /dev/null +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/PlaylistBrowserActivity$15.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/PlaylistBrowserActivity$2.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/PlaylistBrowserActivity$2.class Binary files differindex ae08541..88c8fe1 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/PlaylistBrowserActivity$2.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/PlaylistBrowserActivity$2.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/PlaylistBrowserActivity$3.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/PlaylistBrowserActivity$3.class Binary files differindex 63e4e12..378ef1b 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/PlaylistBrowserActivity$3.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/PlaylistBrowserActivity$3.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/PlaylistBrowserActivity$4.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/PlaylistBrowserActivity$4.class Binary files differindex 24c6ba5..4e855f4 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/PlaylistBrowserActivity$4.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/PlaylistBrowserActivity$4.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/PlaylistBrowserActivity$5.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/PlaylistBrowserActivity$5.class Binary files differindex 4166605..5b854c4 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/PlaylistBrowserActivity$5.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/PlaylistBrowserActivity$5.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/PlaylistBrowserActivity$6.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/PlaylistBrowserActivity$6.class Binary files differindex 9ab3291..cc0ac4d 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/PlaylistBrowserActivity$6.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/PlaylistBrowserActivity$6.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/PlaylistBrowserActivity$7.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/PlaylistBrowserActivity$7.class Binary files differindex 825c3e9..b072b9d 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/PlaylistBrowserActivity$7.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/PlaylistBrowserActivity$7.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/PlaylistBrowserActivity$8.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/PlaylistBrowserActivity$8.class Binary files differindex c4e0b63..69c5f2f 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/PlaylistBrowserActivity$8.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/PlaylistBrowserActivity$8.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/PlaylistBrowserActivity$9.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/PlaylistBrowserActivity$9.class Binary files differindex 9a63dc5..6884717 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/PlaylistBrowserActivity$9.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/PlaylistBrowserActivity$9.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/PlaylistBrowserActivity$NowPlayingGesture.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/PlaylistBrowserActivity$NowPlayingGesture.class Binary files differindex ac0e91b..0ebad48 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/PlaylistBrowserActivity$NowPlayingGesture.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/PlaylistBrowserActivity$NowPlayingGesture.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/PlaylistBrowserActivity$PlaylistListAdapter$1.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/PlaylistBrowserActivity$PlaylistListAdapter$1.class Binary files differindex 1a6db4f..c7ea05d 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/PlaylistBrowserActivity$PlaylistListAdapter$1.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/PlaylistBrowserActivity$PlaylistListAdapter$1.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/PlaylistBrowserActivity$PlaylistListAdapter$QueryHandler.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/PlaylistBrowserActivity$PlaylistListAdapter$QueryHandler.class Binary files differindex 4f03f50..73d9f7e 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/PlaylistBrowserActivity$PlaylistListAdapter$QueryHandler.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/PlaylistBrowserActivity$PlaylistListAdapter$QueryHandler.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/PlaylistBrowserActivity$PlaylistListAdapter.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/PlaylistBrowserActivity$PlaylistListAdapter.class Binary files differindex ebb6c86..b364469 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/PlaylistBrowserActivity$PlaylistListAdapter.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/PlaylistBrowserActivity$PlaylistListAdapter.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/PlaylistBrowserActivity$TabSwipe.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/PlaylistBrowserActivity$TabSwipe.class Binary files differindex b3e0cb6..3fb7d8f 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/PlaylistBrowserActivity$TabSwipe.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/PlaylistBrowserActivity$TabSwipe.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/PlaylistBrowserActivity.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/PlaylistBrowserActivity.class Binary files differindex cd6ee33..ef91291 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/PlaylistBrowserActivity.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/PlaylistBrowserActivity.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/PreviewPreference.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/PreviewPreference.class Binary files differindex fb91565..bb7ac53 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/PreviewPreference.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/PreviewPreference.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/QueryBrowserActivity$QueryListAdapter.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/QueryBrowserActivity$QueryListAdapter.class Binary files differindex 1282f1e..78c44f9 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/QueryBrowserActivity$QueryListAdapter.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/QueryBrowserActivity$QueryListAdapter.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/QueryBrowserActivity.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/QueryBrowserActivity.class Binary files differindex 9b01ad3..df3ccd1 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/QueryBrowserActivity.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/QueryBrowserActivity.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/R$drawable.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/R$drawable.class Binary files differindex 7f31d8d..f7fc7b1 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/R$drawable.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/R$drawable.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/R$id.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/R$id.class Binary files differindex 804319d..ee77576 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/R$id.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/R$id.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/R$layout.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/R$layout.class Binary files differindex fcd13f3..80449fd 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/R$layout.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/R$layout.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/R$menu.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/R$menu.class Binary files differindex d75325d..081cc8c 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/R$menu.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/R$menu.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/R$plurals.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/R$plurals.class Binary files differindex 1c4d35a..b3b9e1e 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/R$plurals.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/R$plurals.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/R$raw.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/R$raw.class Binary files differindex c341f99..a3ff8e9 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/R$raw.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/R$raw.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/R$string.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/R$string.class Binary files differindex b4eaff8..c4e1116 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/R$string.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/R$string.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/R$xml.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/R$xml.class Binary files differindex 5513057..486ad3b 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/R$xml.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/R$xml.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/RenamePlaylist.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/RenamePlaylist.class Binary files differindex 55aaa7e..842eae7 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/RenamePlaylist.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/RenamePlaylist.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/ScanningProgress.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/ScanningProgress.class Binary files differindex dd8226a..0178238 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/ScanningProgress.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/ScanningProgress.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/TouchInterceptor.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/TouchInterceptor.class Binary files differindex cb38e1e..023c295 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/TouchInterceptor.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/TouchInterceptor.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/TrackBrowserActivity$1.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/TrackBrowserActivity$1.class Binary files differindex 6b6e705..0a67e00 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/TrackBrowserActivity$1.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/TrackBrowserActivity$1.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/TrackBrowserActivity$10.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/TrackBrowserActivity$10.class Binary files differindex 63b8f03..95aff08 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/TrackBrowserActivity$10.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/TrackBrowserActivity$10.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/TrackBrowserActivity$11.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/TrackBrowserActivity$11.class Binary files differindex 44ed333..9c91d30 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/TrackBrowserActivity$11.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/TrackBrowserActivity$11.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/TrackBrowserActivity$12.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/TrackBrowserActivity$12.class Binary files differindex 4b80646..45ab116 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/TrackBrowserActivity$12.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/TrackBrowserActivity$12.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/TrackBrowserActivity$13.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/TrackBrowserActivity$13.class Binary files differindex 7c0fdfb..443582a 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/TrackBrowserActivity$13.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/TrackBrowserActivity$13.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/TrackBrowserActivity$14.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/TrackBrowserActivity$14.class Binary files differindex 893ba61..5628e95 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/TrackBrowserActivity$14.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/TrackBrowserActivity$14.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/TrackBrowserActivity$15.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/TrackBrowserActivity$15.class Binary files differindex d65efc4..44990ae 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/TrackBrowserActivity$15.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/TrackBrowserActivity$15.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/TrackBrowserActivity$16.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/TrackBrowserActivity$16.class Binary files differindex 560847f..e1cb792 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/TrackBrowserActivity$16.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/TrackBrowserActivity$16.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/TrackBrowserActivity$17.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/TrackBrowserActivity$17.class Binary files differnew file mode 100644 index 0000000..18fd5e8 --- /dev/null +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/TrackBrowserActivity$17.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/TrackBrowserActivity$2.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/TrackBrowserActivity$2.class Binary files differindex c2bdc93..f078403 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/TrackBrowserActivity$2.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/TrackBrowserActivity$2.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/TrackBrowserActivity$3.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/TrackBrowserActivity$3.class Binary files differindex c2540b6..f3075f1 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/TrackBrowserActivity$3.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/TrackBrowserActivity$3.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/TrackBrowserActivity$4.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/TrackBrowserActivity$4.class Binary files differindex d0fe24d..73ec046 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/TrackBrowserActivity$4.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/TrackBrowserActivity$4.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/TrackBrowserActivity$5.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/TrackBrowserActivity$5.class Binary files differindex 23df5a3..2876e69 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/TrackBrowserActivity$5.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/TrackBrowserActivity$5.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/TrackBrowserActivity$6.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/TrackBrowserActivity$6.class Binary files differindex 8fe9c34..07b236c 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/TrackBrowserActivity$6.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/TrackBrowserActivity$6.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/TrackBrowserActivity$7.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/TrackBrowserActivity$7.class Binary files differindex 1c2b01e..9921bc2 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/TrackBrowserActivity$7.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/TrackBrowserActivity$7.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/TrackBrowserActivity$8.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/TrackBrowserActivity$8.class Binary files differindex 511fa32..cd86335 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/TrackBrowserActivity$8.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/TrackBrowserActivity$8.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/TrackBrowserActivity$9.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/TrackBrowserActivity$9.class Binary files differindex 04edcb1..6e10a0e 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/TrackBrowserActivity$9.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/TrackBrowserActivity$9.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/TrackBrowserActivity$NowPlayingCursor.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/TrackBrowserActivity$NowPlayingCursor.class Binary files differindex 66b5dff..3235fd6 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/TrackBrowserActivity$NowPlayingCursor.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/TrackBrowserActivity$NowPlayingCursor.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/TrackBrowserActivity$NowPlayingGesture.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/TrackBrowserActivity$NowPlayingGesture.class Binary files differindex 2b9703f..7890dbc 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/TrackBrowserActivity$NowPlayingGesture.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/TrackBrowserActivity$NowPlayingGesture.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/TrackBrowserActivity$TabSwipe.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/TrackBrowserActivity$TabSwipe.class Binary files differindex 246e259..9b31c90 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/TrackBrowserActivity$TabSwipe.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/TrackBrowserActivity$TabSwipe.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/TrackBrowserActivity$TrackListAdapter$1.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/TrackBrowserActivity$TrackListAdapter$1.class Binary files differindex 788e4a6..59da716 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/TrackBrowserActivity$TrackListAdapter$1.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/TrackBrowserActivity$TrackListAdapter$1.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/TrackBrowserActivity$TrackListAdapter$TrackQueryHandler$QueryArgs.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/TrackBrowserActivity$TrackListAdapter$TrackQueryHandler$QueryArgs.class Binary files differindex fb251f6..ef50b75 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/TrackBrowserActivity$TrackListAdapter$TrackQueryHandler$QueryArgs.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/TrackBrowserActivity$TrackListAdapter$TrackQueryHandler$QueryArgs.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/TrackBrowserActivity$TrackListAdapter$TrackQueryHandler.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/TrackBrowserActivity$TrackListAdapter$TrackQueryHandler.class Binary files differindex 96c4722..3c2c351 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/TrackBrowserActivity$TrackListAdapter$TrackQueryHandler.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/TrackBrowserActivity$TrackListAdapter$TrackQueryHandler.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/TrackBrowserActivity$TrackListAdapter$ViewHolder.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/TrackBrowserActivity$TrackListAdapter$ViewHolder.class Binary files differindex 0f6f58d..9b4c978 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/TrackBrowserActivity$TrackListAdapter$ViewHolder.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/TrackBrowserActivity$TrackListAdapter$ViewHolder.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/TrackBrowserActivity$TrackListAdapter.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/TrackBrowserActivity$TrackListAdapter.class Binary files differindex 0fe7dd7..a5ba837 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/TrackBrowserActivity$TrackListAdapter.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/TrackBrowserActivity$TrackListAdapter.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/TrackBrowserActivity.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/TrackBrowserActivity.class Binary files differindex 6de110f..e149e99 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/TrackBrowserActivity.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/TrackBrowserActivity.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/VerticalTextSpinner.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/VerticalTextSpinner.class Binary files differindex 28fae7a..3f435ca 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/VerticalTextSpinner.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/VerticalTextSpinner.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/VideoBrowserActivity.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/VideoBrowserActivity.class Binary files differindex db104f0..54081d8 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/VideoBrowserActivity.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/VideoBrowserActivity.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/WeekSelector.class b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/WeekSelector.class Binary files differindex 9d8353c..42673d5 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/WeekSelector.class +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/classes/com/android/music/WeekSelector.class diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/res/drawable-hdpi/ic_dialog_alert_holo_dark.png b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/res/drawable-hdpi/ic_dialog_alert_holo_dark.png Binary files differnew file mode 100644 index 0000000..7e77506 --- /dev/null +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/res/drawable-hdpi/ic_dialog_alert_holo_dark.png diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/res/drawable-hdpi/ic_menu_moreoverflow_normal_holo_dark.png b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/res/drawable-hdpi/ic_menu_moreoverflow_normal_holo_dark.png Binary files differnew file mode 100644 index 0000000..1c1578d --- /dev/null +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/res/drawable-hdpi/ic_menu_moreoverflow_normal_holo_dark.png diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/res/drawable-mdpi/ic_dialog_alert_holo_dark.png b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/res/drawable-mdpi/ic_dialog_alert_holo_dark.png Binary files differnew file mode 100644 index 0000000..98132d5 --- /dev/null +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/res/drawable-mdpi/ic_dialog_alert_holo_dark.png diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/res/drawable-mdpi/ic_menu_moreoverflow_normal_holo_dark.png b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/res/drawable-mdpi/ic_menu_moreoverflow_normal_holo_dark.png Binary files differnew file mode 100644 index 0000000..3b4e746 --- /dev/null +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/res/drawable-mdpi/ic_menu_moreoverflow_normal_holo_dark.png diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/res/drawable-xhdpi/ic_dialog_alert_holo_dark.png b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/res/drawable-xhdpi/ic_dialog_alert_holo_dark.png Binary files differnew file mode 100644 index 0000000..6c845e2 --- /dev/null +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/res/drawable-xhdpi/ic_dialog_alert_holo_dark.png diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/res/drawable-xhdpi/ic_menu_moreoverflow_normal_holo_dark.png b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/res/drawable-xhdpi/ic_menu_moreoverflow_normal_holo_dark.png Binary files differnew file mode 100644 index 0000000..b90451e --- /dev/null +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/res/drawable-xhdpi/ic_menu_moreoverflow_normal_holo_dark.png diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/resources.ap_ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/resources.ap_ Binary files differindex 8450ebb..3a50f22 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/bin/resources.ap_ +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/bin/resources.ap_ diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/gen/com/android/music/R.java b/CyanogenMod-android_packages_apps_Music-41e85d6/gen/com/android/music/R.java index d1c485b..7bb3567 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/gen/com/android/music/R.java +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/gen/com/android/music/R.java @@ -112,9 +112,9 @@ public final class R { public static final int ic_appwidget_music_pause=0x7f020022;
public static final int ic_appwidget_music_play=0x7f020023;
public static final int ic_appwidget_music_prev=0x7f020024;
- public static final int ic_launcher_market_holo=0x7f020025;
- public static final int ic_launcher_shortcut_music_playlist=0x7f020026;
- public static final int ic_lock_idle_alarm=0x7f020027;
+ public static final int ic_dialog_alert_holo_dark=0x7f020025;
+ public static final int ic_launcher_market_holo=0x7f020026;
+ public static final int ic_launcher_shortcut_music_playlist=0x7f020027;
public static final int ic_market=0x7f020028;
public static final int ic_media_next=0x7f020029;
public static final int ic_media_pause=0x7f02002a;
@@ -124,199 +124,191 @@ public final class R { public static final int ic_menu_add_playlist=0x7f02002e;
public static final int ic_menu_delete=0x7f02002f;
public static final int ic_menu_eq=0x7f020030;
- public static final int ic_menu_share=0x7f020031;
- public static final int ic_mp_artist_list=0x7f020032;
- public static final int ic_mp_partyshuffle_on_btn=0x7f020033;
- public static final int ic_mp_playlist_list=0x7f020034;
- public static final int ic_mp_playlist_recently_added_list=0x7f020035;
- public static final int ic_mp_repeat_all_btn=0x7f020036;
- public static final int ic_mp_repeat_off_btn=0x7f020037;
- public static final int ic_mp_repeat_once_btn=0x7f020038;
- public static final int ic_mp_sd_card=0x7f020039;
- public static final int ic_mp_shuffle_off_btn=0x7f02003a;
- public static final int ic_mp_shuffle_on_btn=0x7f02003b;
- public static final int ic_mp_song_list=0x7f02003c;
- public static final int ic_ring=0x7f02003d;
- public static final int ic_slide_keyboard=0x7f02003e;
- public static final int indicator_playing_peak_meter_0=0x7f02003f;
- public static final int indicator_playing_peak_meter_1=0x7f020040;
- public static final int indicator_playing_peak_meter_2=0x7f020041;
- public static final int indicator_playing_peak_meter_3=0x7f020042;
- public static final int indicator_playing_peak_meter_4=0x7f020043;
- public static final int indicator_playing_peak_meter_5=0x7f020044;
- public static final int list_selector=0x7f020045;
- public static final int list_selector_background=0x7f020046;
- public static final int list_selector_background_transition=0x7f020047;
- public static final int media_next_normal=0x7f020048;
- public static final int media_previous_normal=0x7f020049;
- public static final int midi=0x7f02004a;
- public static final int movie=0x7f02004b;
- public static final int music_bottom_playback_bg=0x7f02004c;
- public static final int notify_panel_notification_icon_bg=0x7f02004d;
- public static final int now_playing_bg=0x7f02004e;
- public static final int now_playing_progress_handle_normal=0x7f02004f;
- public static final int now_playing_progress_handle_pressed=0x7f020050;
- public static final int now_playing_progress_handle_selected=0x7f020051;
- public static final int now_playing_selector=0x7f020052;
- public static final int np_bg=0x7f020053;
- public static final int panel_now_playing_progress_bg=0x7f020054;
- public static final int pickerbox_background=0x7f020055;
- public static final int pickerbox_selected=0x7f020056;
- public static final int pickerbox_unselected=0x7f020057;
- public static final int player_background=0x7f020058;
- public static final int playlist_tile=0x7f020059;
- public static final int playlist_tile_drag=0x7f02005a;
- public static final int playlist_tile_longpress=0x7f02005b;
- public static final int playlist_tile_normal=0x7f02005c;
- public static final int playlist_tile_pressed=0x7f02005d;
- public static final int playlist_tile_selected=0x7f02005e;
- public static final int progress_bg_holo_dark=0x7f02005f;
- public static final int progress_horizontal=0x7f020060;
- public static final int progress_primary_holo_dark=0x7f020061;
- public static final int progress_secondary_holo_dark=0x7f020062;
- public static final int seek_thumb=0x7f020063;
- public static final int solid_dark_pressed=0x7f020064;
- public static final int stat_notify_musicplayer=0x7f020065;
- public static final int status_bg=0x7f020066;
- public static final int status_next=0x7f020067;
- public static final int status_pause=0x7f020068;
- public static final int status_play=0x7f020069;
- public static final int status_prev=0x7f02006a;
- public static final int tabs_bg=0x7f02006b;
+ public static final int ic_menu_moreoverflow_normal_holo_dark=0x7f020031;
+ public static final int ic_menu_share=0x7f020032;
+ public static final int ic_mp_artist_list=0x7f020033;
+ public static final int ic_mp_partyshuffle_on_btn=0x7f020034;
+ public static final int ic_mp_playlist_list=0x7f020035;
+ public static final int ic_mp_playlist_recently_added_list=0x7f020036;
+ public static final int ic_mp_repeat_all_btn=0x7f020037;
+ public static final int ic_mp_repeat_off_btn=0x7f020038;
+ public static final int ic_mp_repeat_once_btn=0x7f020039;
+ public static final int ic_mp_sd_card=0x7f02003a;
+ public static final int ic_mp_shuffle_off_btn=0x7f02003b;
+ public static final int ic_mp_shuffle_on_btn=0x7f02003c;
+ public static final int ic_mp_song_list=0x7f02003d;
+ public static final int ic_ring=0x7f02003e;
+ public static final int ic_slide_keyboard=0x7f02003f;
+ public static final int indicator_playing_peak_meter_0=0x7f020040;
+ public static final int indicator_playing_peak_meter_1=0x7f020041;
+ public static final int indicator_playing_peak_meter_2=0x7f020042;
+ public static final int indicator_playing_peak_meter_3=0x7f020043;
+ public static final int indicator_playing_peak_meter_4=0x7f020044;
+ public static final int indicator_playing_peak_meter_5=0x7f020045;
+ public static final int list_selector=0x7f020046;
+ public static final int list_selector_background=0x7f020047;
+ public static final int list_selector_background_transition=0x7f020048;
+ public static final int media_next_normal=0x7f020049;
+ public static final int media_previous_normal=0x7f02004a;
+ public static final int midi=0x7f02004b;
+ public static final int movie=0x7f02004c;
+ public static final int music_bottom_playback_bg=0x7f02004d;
+ public static final int notify_panel_notification_icon_bg=0x7f02004e;
+ public static final int now_playing_bg=0x7f02004f;
+ public static final int now_playing_progress_handle_normal=0x7f020050;
+ public static final int now_playing_progress_handle_pressed=0x7f020051;
+ public static final int now_playing_progress_handle_selected=0x7f020052;
+ public static final int now_playing_selector=0x7f020053;
+ public static final int np_bg=0x7f020054;
+ public static final int panel_now_playing_progress_bg=0x7f020055;
+ public static final int pickerbox_background=0x7f020056;
+ public static final int pickerbox_selected=0x7f020057;
+ public static final int pickerbox_unselected=0x7f020058;
+ public static final int player_background=0x7f020059;
+ public static final int playlist_tile=0x7f02005a;
+ public static final int playlist_tile_drag=0x7f02005b;
+ public static final int playlist_tile_longpress=0x7f02005c;
+ public static final int playlist_tile_normal=0x7f02005d;
+ public static final int playlist_tile_pressed=0x7f02005e;
+ public static final int playlist_tile_selected=0x7f02005f;
+ public static final int progress_bg_holo_dark=0x7f020060;
+ public static final int progress_horizontal=0x7f020061;
+ public static final int progress_primary_holo_dark=0x7f020062;
+ public static final int progress_secondary_holo_dark=0x7f020063;
+ public static final int seek_thumb=0x7f020064;
+ public static final int solid_dark_pressed=0x7f020065;
+ public static final int stat_notify_musicplayer=0x7f020066;
+ public static final int status_bg=0x7f020067;
+ public static final int status_next=0x7f020068;
+ public static final int status_pause=0x7f020069;
+ public static final int status_play=0x7f02006a;
+ public static final int status_prev=0x7f02006b;
+ public static final int tabs_bg=0x7f02006c;
}
public static final class id {
- public static final int CM=0x7f0d0080;
- public static final int ThemeApply=0x7f0d007d;
- public static final int ThemeDescription=0x7f0d007b;
- public static final int ThemeIcon=0x7f0d007c;
- public static final int ThemeSearch=0x7f0d007e;
- public static final int ThemeTitle=0x7f0d007a;
- public static final int a_seekbar=0x7f0d002e;
- public static final int a_seekbar_gesture=0x7f0d0050;
- public static final int action_name=0x7f0d003c;
- public static final int add=0x7f0d0083;
- public static final int album=0x7f0d0016;
- public static final int albumDummy=0x7f0d0019;
+ public static final int CM=0x7f0d0076;
+ public static final int ThemeApply=0x7f0d0072;
+ public static final int ThemeDescription=0x7f0d0070;
+ public static final int ThemeIcon=0x7f0d0071;
+ public static final int ThemeSearch=0x7f0d0073;
+ public static final int ThemeTitle=0x7f0d006f;
+ public static final int a_seekbar=0x7f0d002f;
+ public static final int add=0x7f0d007a;
+ public static final int album=0x7f0d0017;
+ public static final int albumDummy=0x7f0d001a;
public static final int album_appwidget=0x7f0d0008;
- public static final int album_dummy=0x7f0d0017;
+ public static final int album_dummy=0x7f0d0018;
+ public static final int album_tab=0x7f0d004f;
public static final int albumart=0x7f0d0004;
- public static final int albumname=0x7f0d0014;
- public static final int albumtab=0x7f0d0028;
+ public static final int albumname=0x7f0d0015;
+ public static final int albumtab=0x7f0d0029;
public static final int artist=0x7f0d0009;
- public static final int artistname=0x7f0d0015;
- public static final int artistname_holder=0x7f0d0018;
- public static final int artisttab=0x7f0d0027;
- public static final int b_seekbar=0x7f0d0034;
- public static final int b_seekbar_gesture=0x7f0d0056;
- public static final int buttonbar=0x7f0d0026;
- public static final int cancel=0x7f0d0038;
- public static final int cancelButton=0x7f0d0060;
- public static final int colorPickerFrame=0x7f0d002c;
- public static final int colorPickerFrame_gesture=0x7f0d004e;
- public static final int color_picker_alpha=0x7f0d002d;
- public static final int color_picker_alpha_gesture=0x7f0d004f;
- public static final int color_picker_blue=0x7f0d0033;
- public static final int color_picker_blue_gesture=0x7f0d0055;
- public static final int color_picker_green=0x7f0d0031;
- public static final int color_picker_green_gesture=0x7f0d0053;
- public static final int color_picker_red=0x7f0d002f;
- public static final int color_picker_red_gesture=0x7f0d0051;
- public static final int color_picker_sample=0x7f0d0036;
- public static final int color_picker_sample_gesture=0x7f0d0058;
- public static final int colorsampleLayout=0x7f0d0035;
- public static final int colorsampleLayout_gesture=0x7f0d0057;
+ public static final int artist_tab=0x7f0d0050;
+ public static final int artistname=0x7f0d0016;
+ public static final int artistname_holder=0x7f0d0019;
+ public static final int artisttab=0x7f0d0028;
+ public static final int b_seekbar=0x7f0d0035;
+ public static final int buttonbar=0x7f0d0027;
+ public static final int cancel=0x7f0d0039;
+ public static final int cancelButton=0x7f0d0054;
+ public static final int child_item=0x7f0d0074;
+ public static final int colorPickerFrame=0x7f0d002d;
+ public static final int color_picker_alpha=0x7f0d002e;
+ public static final int color_picker_blue=0x7f0d0034;
+ public static final int color_picker_green=0x7f0d0032;
+ public static final int color_picker_red=0x7f0d0030;
+ public static final int color_picker_sample=0x7f0d0037;
+ public static final int colorsampleLayout=0x7f0d0036;
public static final int content=0x7f0d0003;
public static final int control_next=0x7f0d000b;
public static final int control_play=0x7f0d000a;
- public static final int control_prev=0x7f0d000d;
- public static final int control_repeat=0x7f0d000f;
- public static final int control_shuffle=0x7f0d000e;
- public static final int controls=0x7f0d000c;
- public static final int controls_info_divider=0x7f0d0012;
- public static final int create=0x7f0d003b;
- public static final int currenttime=0x7f0d001a;
+ public static final int control_prev=0x7f0d000e;
+ public static final int control_repeat=0x7f0d0010;
+ public static final int control_shuffle=0x7f0d000f;
+ public static final int controls=0x7f0d000d;
+ public static final int controls_info_divider=0x7f0d0013;
+ public static final int create=0x7f0d003c;
+ public static final int currenttime=0x7f0d001b;
public static final int custom_title_root=0x7f0d0000;
- public static final int delete=0x7f0d0039;
+ public static final int delete=0x7f0d003a;
+ public static final int delete_button=0x7f0d004e;
public static final int delete_extra=0x7f0d004d;
- public static final int doSearch=0x7f0d0070;
- public static final int done=0x7f0d003e;
- public static final int duration=0x7f0d0062;
+ public static final int doSearch=0x7f0d0064;
+ public static final int duration=0x7f0d0056;
public static final int eq_extra=0x7f0d004b;
public static final int eq_extra_image=0x7f0d004c;
- public static final int extra_controls=0x7f0d0040;
- public static final int g_seekbar=0x7f0d0032;
- public static final int g_seekbar_gesture=0x7f0d0054;
- public static final int gestures_overlay=0x7f0d003d;
- public static final int icon=0x7f0d003f;
- public static final int info=0x7f0d0011;
- public static final int info_divider=0x7f0d0065;
- public static final int line1=0x7f0d0023;
- public static final int line2=0x7f0d0024;
- public static final int listContainer=0x7f0d005e;
- public static final int loading=0x7f0d0021;
- public static final int market_music=0x7f0d006f;
- public static final int media_next=0x7f0d006c;
- public static final int media_play=0x7f0d006b;
- public static final int media_prev=0x7f0d006a;
- public static final int message=0x7f0d0071;
+ public static final int extra_controls=0x7f0d003e;
+ public static final int four_by_two=0x7f0d000c;
+ public static final int g_seekbar=0x7f0d0033;
+ public static final int group_item=0x7f0d0077;
+ public static final int icon=0x7f0d003d;
+ public static final int info=0x7f0d0012;
+ public static final int info_divider=0x7f0d0059;
+ public static final int line1=0x7f0d0024;
+ public static final int line2=0x7f0d0025;
+ public static final int listContainer=0x7f0d0052;
+ public static final int loading=0x7f0d0022;
+ public static final int market_music=0x7f0d0063;
+ public static final int media_next=0x7f0d0060;
+ public static final int media_play=0x7f0d005f;
+ public static final int media_prev=0x7f0d005e;
+ public static final int message=0x7f0d0066;
public static final int next=0x7f0d0007;
- public static final int now_playing_albumart=0x7f0d0066;
- public static final int now_playing_albumname=0x7f0d0069;
- public static final int now_playing_artist=0x7f0d0068;
- public static final int now_playing_title=0x7f0d0067;
- public static final int nowplaying=0x7f0d0064;
- public static final int nowplayingtab=0x7f0d002b;
- public static final int okayButton=0x7f0d005f;
- public static final int pause=0x7f0d001d;
- public static final int play_indicator=0x7f0d0063;
+ public static final int now_playing_albumart=0x7f0d005a;
+ public static final int now_playing_albumname=0x7f0d005d;
+ public static final int now_playing_artist=0x7f0d005c;
+ public static final int now_playing_title=0x7f0d005b;
+ public static final int nowplaying=0x7f0d0058;
+ public static final int nowplayingtab=0x7f0d002c;
+ public static final int okayButton=0x7f0d0053;
+ public static final int overFlow=0x7f0d0065;
+ public static final int pause=0x7f0d001e;
+ public static final int play_indicator=0x7f0d0057;
public static final int play_pause=0x7f0d0005;
- public static final int playlist=0x7f0d003a;
- public static final int playlisttab=0x7f0d002a;
- public static final int playpause=0x7f0d0025;
- public static final int plus_playlist=0x7f0d006d;
- public static final int prev=0x7f0d001c;
+ public static final int playlist=0x7f0d003b;
+ public static final int playlisttab=0x7f0d002b;
+ public static final int playpause=0x7f0d0026;
+ public static final int plus_playlist=0x7f0d0061;
+ public static final int prev=0x7f0d001d;
public static final int previous=0x7f0d0006;
- public static final int progress=0x7f0d0010;
- public static final int progressContainer=0x7f0d005d;
- public static final int prompt=0x7f0d0037;
- public static final int r_seekbar=0x7f0d0030;
- public static final int r_seekbar_gesture=0x7f0d0052;
- public static final int radio=0x7f0d0061;
- public static final int reloadButton=0x7f0d005b;
- public static final int repeat=0x7f0d0044;
- public static final int repeat_extra_image=0x7f0d0045;
- public static final int repeat_normal=0x7f0d001e;
- public static final int repeat_text=0x7f0d0046;
- public static final int resetButton=0x7f0d005c;
- public static final int ringtone=0x7f0d0048;
- public static final int sd_icon=0x7f0d0072;
- public static final int sd_message=0x7f0d0073;
- public static final int second_column_icon=0x7f0d007f;
+ public static final int progress=0x7f0d0011;
+ public static final int progressContainer=0x7f0d0051;
+ public static final int prompt=0x7f0d0038;
+ public static final int r_seekbar=0x7f0d0031;
+ public static final int radio=0x7f0d0055;
+ public static final int repeat=0x7f0d0042;
+ public static final int repeat_extra_image=0x7f0d0043;
+ public static final int repeat_normal=0x7f0d001f;
+ public static final int repeat_text=0x7f0d0044;
+ public static final int ring_button=0x7f0d0048;
+ public static final int ringtone=0x7f0d0047;
+ public static final int sd_icon=0x7f0d0067;
+ public static final int sd_message=0x7f0d0068;
+ public static final int second_column_icon=0x7f0d0075;
public static final int selected_conv_count=0x7f0d0002;
- public static final int set=0x7f0d0082;
+ public static final int set=0x7f0d0079;
public static final int share_extra=0x7f0d0049;
public static final int share_extra_image=0x7f0d004a;
- public static final int share_song=0x7f0d006e;
- public static final int shop=0x7f0d0047;
- public static final int shuffle=0x7f0d0041;
- public static final int shuffle_extra_image=0x7f0d0042;
- public static final int shuffle_normal=0x7f0d001b;
- public static final int shuffle_text=0x7f0d0043;
- public static final int songtab=0x7f0d0029;
- public static final int spinner=0x7f0d0020;
- public static final int status_icon=0x7f0d0075;
- public static final int status_media_collapse=0x7f0d0079;
- public static final int status_media_next=0x7f0d0078;
- public static final int status_media_play=0x7f0d0077;
- public static final int status_media_prev=0x7f0d0076;
- public static final int statusbar=0x7f0d0074;
- public static final int summary=0x7f0d005a;
- public static final int thumbnail=0x7f0d0059;
+ public static final int share_song=0x7f0d0062;
+ public static final int shop=0x7f0d0045;
+ public static final int shop_button=0x7f0d0046;
+ public static final int shuffle=0x7f0d003f;
+ public static final int shuffle_extra_image=0x7f0d0040;
+ public static final int shuffle_normal=0x7f0d001c;
+ public static final int shuffle_text=0x7f0d0041;
+ public static final int songtab=0x7f0d002a;
+ public static final int spinner=0x7f0d0021;
+ public static final int status_icon=0x7f0d006a;
+ public static final int status_media_collapse=0x7f0d006e;
+ public static final int status_media_next=0x7f0d006d;
+ public static final int status_media_play=0x7f0d006c;
+ public static final int status_media_prev=0x7f0d006b;
+ public static final int statusbar=0x7f0d0069;
public static final int title=0x7f0d0001;
- public static final int titleandbuttons=0x7f0d0022;
- public static final int totaltime=0x7f0d001f;
- public static final int trackname=0x7f0d0013;
- public static final int weeks=0x7f0d0081;
+ public static final int titleandbuttons=0x7f0d0023;
+ public static final int totaltime=0x7f0d0020;
+ public static final int trackname=0x7f0d0014;
+ public static final int weeks=0x7f0d0078;
}
public static final class layout {
public static final int action_menu_layout=0x7f030000;
@@ -331,30 +323,26 @@ public final class R { public static final int color_picker=0x7f030009;
public static final int confirm_delete=0x7f03000a;
public static final int create_playlist=0x7f03000b;
- public static final int customize_gesture=0x7f03000c;
- public static final int edit_track_list_item=0x7f03000d;
- public static final int extra_controls=0x7f03000e;
- public static final int gesture_color_picker=0x7f03000f;
- public static final int gestures_item=0x7f030010;
- public static final int gestures_list=0x7f030011;
- public static final int media_picker_activity=0x7f030012;
- public static final int media_picker_activity_expanding=0x7f030013;
- public static final int music_picker=0x7f030014;
- public static final int music_picker_item=0x7f030015;
- public static final int nowplaying=0x7f030016;
- public static final int player=0x7f030017;
- public static final int query_activity=0x7f030018;
- public static final int scanning=0x7f030019;
- public static final int scanning_nosdcard=0x7f03001a;
- public static final int sd_error=0x7f03001b;
- public static final int statusbar=0x7f03001c;
- public static final int theme_preview=0x7f03001d;
- public static final int track_list_item=0x7f03001e;
- public static final int track_list_item_child=0x7f03001f;
- public static final int track_list_item_common=0x7f030020;
- public static final int track_list_item_common_child=0x7f030021;
- public static final int track_list_item_group=0x7f030022;
- public static final int weekpicker=0x7f030023;
+ public static final int edit_track_list_item=0x7f03000c;
+ public static final int extra_controls=0x7f03000d;
+ public static final int media_picker_activity=0x7f03000e;
+ public static final int media_picker_activity_expanding=0x7f03000f;
+ public static final int music_picker=0x7f030010;
+ public static final int music_picker_item=0x7f030011;
+ public static final int nowplaying=0x7f030012;
+ public static final int player=0x7f030013;
+ public static final int query_activity=0x7f030014;
+ public static final int scanning=0x7f030015;
+ public static final int scanning_nosdcard=0x7f030016;
+ public static final int sd_error=0x7f030017;
+ public static final int statusbar=0x7f030018;
+ public static final int theme_preview=0x7f030019;
+ public static final int track_list_item=0x7f03001a;
+ public static final int track_list_item_child=0x7f03001b;
+ public static final int track_list_item_common=0x7f03001c;
+ public static final int track_list_item_common_child=0x7f03001d;
+ public static final int track_list_item_group=0x7f03001e;
+ public static final int weekpicker=0x7f03001f;
}
public static final class menu {
public static final int action_menu=0x7f0c0000;
@@ -380,14 +368,14 @@ public final class R { public static final int gestures=0x7f060000;
}
public static final class string {
- public static final int activity_not_found=0x7f0900f0;
+ public static final int activity_not_found=0x7f0900f4;
/** Context menu item
*/
public static final int add_to_playlist=0x7f090042;
public static final int album_art_anim_summary=0x7f0900ad;
public static final int album_art_anim_title=0x7f0900ac;
- public static final int album_ui_summary=0x7f0900c7;
- public static final int album_ui_title=0x7f0900c6;
+ public static final int album_ui_summary=0x7f0900cb;
+ public static final int album_ui_title=0x7f0900ca;
/** Category label on Library screen
*/
public static final int albums_menu=0x7f090015;
@@ -396,38 +384,38 @@ public final class R { public static final int albums_title=0x7f090016;
/** Do not translate. This is the separator character used when building the string that shows number of albums and songs.
*/
- public static final int albumsongseparator=0x7f0900fd;
+ public static final int albumsongseparator=0x7f090101;
/** All media screen title
*/
public static final int all_title=0x7f09001c;
- public static final int animation_ui_summary=0x7f0900d4;
- public static final int animation_ui_title=0x7f0900d3;
- public static final int artist_ui_summary=0x7f0900c5;
- public static final int artist_ui_title=0x7f0900c4;
+ public static final int animation_ui_summary=0x7f0900d8;
+ public static final int animation_ui_title=0x7f0900d7;
+ public static final int artist_ui_summary=0x7f0900c9;
+ public static final int artist_ui_title=0x7f0900c8;
/** Artist screen title
*/
public static final int artists_title=0x7f090014;
public static final int audio_cat=0x7f090072;
- public static final int back_button_action=0x7f0900c0;
- public static final int back_button_action_summary=0x7f0900c1;
- public static final int back_button_action_title=0x7f0900bf;
+ public static final int back_button_action=0x7f0900c4;
+ public static final int back_button_action_summary=0x7f0900c5;
+ public static final int back_button_action_title=0x7f0900c3;
/** Category label on Library screen
*/
public static final int browse_menu=0x7f09001d;
public static final int build_version=0x7f0900b2;
public static final int build_version_summary=0x7f0900b3;
- public static final int button_cancel=0x7f0900e7;
+ public static final int button_cancel=0x7f0900eb;
/** Button text for 'customize gesture' activity
*/
- public static final int button_done=0x7f0900e6;
- public static final int button_no=0x7f0900e1;
+ public static final int button_done=0x7f0900ea;
+ public static final int button_no=0x7f0900e5;
/** Button text for 'edit gestures' activity
*/
- public static final int button_reload_gestures=0x7f0900dd;
- public static final int button_reset_all_gestures=0x7f0900de;
+ public static final int button_reload_gestures=0x7f0900e1;
+ public static final int button_reset_all_gestures=0x7f0900e2;
/** Alert dialog 'yes' and 'no' button text
*/
- public static final int button_yes=0x7f0900e0;
+ public static final int button_yes=0x7f0900e4;
/** Text for the "cancel" button in the "delete" and "create playlist" confirmation dialogs
*/
public static final int cancel=0x7f090057;
@@ -438,31 +426,31 @@ public final class R { public static final int clear_playlist=0x7f090050;
/** Labels for colors in color picker
*/
- public static final int color_picker_alpha=0x7f0900f5;
- public static final int color_picker_blue=0x7f0900f8;
- public static final int color_picker_green=0x7f0900f7;
- public static final int color_picker_red=0x7f0900f6;
+ public static final int color_picker_alpha=0x7f0900f9;
+ public static final int color_picker_blue=0x7f0900fc;
+ public static final int color_picker_green=0x7f0900fb;
+ public static final int color_picker_red=0x7f0900fa;
/** Sample time used in color picker
*/
- public static final int color_picker_sample=0x7f0900f4;
+ public static final int color_picker_sample=0x7f0900f8;
/** Button name when saving a playlist
*/
public static final int create_playlist_create_text=0x7f090048;
/** Prompt in dialog when creating a playlist. The user will enter the name of the playlist in a textfield underneath this prompt.
Prompt in dialog when creating a playlist and the keyboard is closed.
*/
- public static final int create_playlist_create_text_prompt=0x7f0900f9;
+ public static final int create_playlist_create_text_prompt=0x7f0900fd;
/** Button name when saving a playlist and the new playlist will overwrite an existing one
*/
public static final int create_playlist_overwrite_text=0x7f090049;
/** Prompt and instructions for 'customize gesture' activity
*/
- public static final int custimize_gesture_prompt=0x7f0900e5;
+ public static final int custimize_gesture_prompt=0x7f0900e9;
public static final int customizations_summary=0x7f09007b;
public static final int customizations_title=0x7f09007a;
/** Title for 'customize gesture' activity
*/
- public static final int customize_gesture_title=0x7f0900e4;
+ public static final int customize_gesture_title=0x7f0900e8;
public static final int define_gestures=0x7f090077;
/** Delete confirmation dialog when deleting an entire album
*/
@@ -495,10 +483,10 @@ public final class R { */
public static final int delete_song_desc_nosdcard=0x7f09000f;
public static final int delete_track=0x7f090071;
- public static final int duck_attenuation_db_summary=0x7f0900be;
+ public static final int duck_attenuation_db_summary=0x7f0900c2;
/** Title, summary, and entries for 'enable gestures' preference list
*/
- public static final int duck_attenuation_db_title=0x7f0900bd;
+ public static final int duck_attenuation_db_title=0x7f0900c1;
/** Do not translate. Duration format for duration >= 1 hour
*/
public static final int durationformatlong=0x7f090002;
@@ -508,30 +496,32 @@ public final class R { public static final int edit_gesture_summary=0x7f090074;
/** Title for 'edit gestures' preference screen and subsequent activity
*/
- public static final int edit_gestures_title=0x7f0900d9;
+ public static final int edit_gestures_title=0x7f0900dd;
/** Playlist context menu item to edit the selected playlist
*/
public static final int edit_playlist_menu=0x7f090023;
/** Menu text for the item controlling the audio effects panel [CHAR LIMIT=15]
*/
- public static final int effectspanel=0x7f0900ba;
- public static final int effectspanel_summary=0x7f0900bb;
+ public static final int effectspanel=0x7f0900be;
+ public static final int effectspanel_summary=0x7f0900bf;
/** Toast after selecting an empty playlist
*/
public static final int emptyplaylist=0x7f090047;
/** Title and summary for 'enable gestures' preference checkbox
*/
- public static final int enable_gestures_summary=0x7f0900d6;
- public static final int enable_haptic_feedback_summary=0x7f0900d8;
+ public static final int enable_gestures_summary=0x7f0900da;
+ public static final int enable_haptic_feedback_summary=0x7f0900dc;
/** Title and summary for 'enable haptic feedback' preference checkbox
*/
- public static final int enable_haptic_feedback_title=0x7f0900d7;
+ public static final int enable_haptic_feedback_title=0x7f0900db;
public static final int eq=0x7f09006d;
/** The fast scroll thumb will show one character from this string depending on the position in the list
*/
public static final int fast_scroll_alphabet=0x7f090066;
public static final int flip_to_pause=0x7f0900b4;
public static final int flip_to_pause_summary=0x7f0900b5;
+ public static final int flow=0x7f0900ba;
+ public static final int flow_summary=0x7f0900bb;
public static final int full_np_summary=0x7f0900a5;
public static final int full_np_title=0x7f0900a4;
public static final int fullscreen_np_summary=0x7f0900a9;
@@ -540,21 +530,21 @@ public final class R { public static final int gesture_color_picker_title=0x7f090075;
/** Category title for gestures in music settings
*/
- public static final int gestures_category_title=0x7f0900d5;
+ public static final int gestures_category_title=0x7f0900d9;
/** Context menu entries for 'edit gestures' activity
*/
- public static final int gestures_customize=0x7f0900db;
- public static final int gestures_error_library=0x7f0900e3;
+ public static final int gestures_customize=0x7f0900df;
+ public static final int gestures_error_library=0x7f0900e7;
/** Error messages for 'edit gestures' activity
*/
- public static final int gestures_error_loading=0x7f0900e2;
+ public static final int gestures_error_loading=0x7f0900e6;
/** Loading text for 'edit gestures' activity
*/
- public static final int gestures_loading=0x7f0900da;
- public static final int gestures_reset=0x7f0900dc;
+ public static final int gestures_loading=0x7f0900de;
+ public static final int gestures_reset=0x7f0900e0;
/** Alert dialog text to confirm desire to reset all gestures to default
*/
- public static final int gestures_reset_all_alert=0x7f0900df;
+ public static final int gestures_reset_all_alert=0x7f0900e3;
/** Menu item that takes the user back to the top level screen of the music player
*/
public static final int goto_start=0x7f090003;
@@ -602,7 +592,7 @@ public final class R { public static final int no_videos_title=0x7f090020;
/** Used for the 2nd and 3rd line (artist and album) in the notification area item for the music app
*/
- public static final int notification_artist_album=0x7f0900fe;
+ public static final int notification_artist_album=0x7f090102;
/** title of the "current playlist" screen when not in party shuffle mode
*/
public static final int nowplaying_title=0x7f090013;
@@ -627,8 +617,8 @@ public final class R { public static final int np_media_share_title=0x7f090086;
public static final int np_progress_summary=0x7f09009b;
public static final int np_progress_title=0x7f09009a;
- public static final int np_swipe_gesture_title=0x7f0900c2;
- public static final int np_swipe_gesture_title_summary=0x7f0900c3;
+ public static final int np_swipe_gesture_title=0x7f0900c6;
+ public static final int np_swipe_gesture_title_summary=0x7f0900c7;
public static final int np_tv=0x7f090090;
public static final int np_tv_album=0x7f090092;
public static final int np_tv_album_summary=0x7f090095;
@@ -646,7 +636,7 @@ public final class R { */
public static final int party_shuffle_off=0x7f090005;
public static final int party_shuffle_on=0x7f090006;
- public static final int partyshuffle_title=0x7f0900fc;
+ public static final int partyshuffle_title=0x7f090100;
/** Menu item to play back all the songs in the currently showing list in list order
*/
public static final int play_all=0x7f090009;
@@ -662,8 +652,8 @@ public final class R { /** Transient popup message shown after renaming a playlist
*/
public static final int playlist_renamed_message=0x7f090026;
- public static final int playlist_ui_summary=0x7f0900cb;
- public static final int playlist_ui_title=0x7f0900ca;
+ public static final int playlist_ui_summary=0x7f0900cf;
+ public static final int playlist_ui_title=0x7f0900ce;
/** Category label on Library screen
*/
public static final int playlists_menu=0x7f090019;
@@ -676,16 +666,16 @@ public final class R { /** The name of the pseudo-playlist that holds all the podcasts, shown in title bar of songs list
*/
public static final int podcasts_title=0x7f09002a;
- public static final int pref_summary_theme_package=0x7f0900eb;
- public static final int pref_summary_theme_preview=0x7f0900ed;
- public static final int pref_summary_theme_settings=0x7f0900e9;
- public static final int pref_themes_apply_theme=0x7f0900ee;
- public static final int pref_themes_get_themes=0x7f0900ef;
- public static final int pref_title_theme_package=0x7f0900ea;
- public static final int pref_title_theme_preview=0x7f0900ec;
+ public static final int pref_summary_theme_package=0x7f0900ef;
+ public static final int pref_summary_theme_preview=0x7f0900f1;
+ public static final int pref_summary_theme_settings=0x7f0900ed;
+ public static final int pref_themes_apply_theme=0x7f0900f2;
+ public static final int pref_themes_get_themes=0x7f0900f3;
+ public static final int pref_title_theme_package=0x7f0900ee;
+ public static final int pref_title_theme_preview=0x7f0900f0;
/** Theme preferences
*/
- public static final int pref_title_theme_settings=0x7f0900e8;
+ public static final int pref_title_theme_settings=0x7f0900ec;
/** Context menu item
*/
public static final int queue=0x7f090043;
@@ -701,14 +691,14 @@ public final class R { /** Prompt in dialog when renaming a playlist, used when the current name the new name are different. The user will enter the new name of the playlist in a textfield underneath this prompt.
Prompt in dialog when renaming a playlist, and the entered name is different from the old one.
*/
- public static final int rename_playlist_diff_prompt=0x7f0900fb;
+ public static final int rename_playlist_diff_prompt=0x7f0900ff;
/** Playlist context menu item to rename the selected playlist
*/
public static final int rename_playlist_menu=0x7f090024;
/** Prompt in dialog when renaming a playlist, used when the current name and the new name are the same. The user will enter the new name of the playlist in a textfield underneath this prompt.
Prompt in dialog when renaming a playlist, and the entered name is the same as the old one.
*/
- public static final int rename_playlist_same_prompt=0x7f0900fa;
+ public static final int rename_playlist_same_prompt=0x7f0900fe;
/** Toast after turning repeat all on
*/
public static final int repeat_all_notif=0x7f09003d;
@@ -796,21 +786,21 @@ public final class R { public static final int set_ring=0x7f090070;
/** Menu text for the music settings item [CHAR LIMIT=15]
*/
- public static final int settings=0x7f0900bc;
+ public static final int settings=0x7f0900c0;
/** Color Picker Dialog
*/
- public static final int settings_bg_color_confirm=0x7f0900f1;
- public static final int settings_bg_color_dialog=0x7f0900f3;
- public static final int settings_default_color_confirm=0x7f0900f2;
+ public static final int settings_bg_color_confirm=0x7f0900f5;
+ public static final int settings_bg_color_dialog=0x7f0900f7;
+ public static final int settings_default_color_confirm=0x7f0900f6;
public static final int shake_action_summary_bg=0x7f090079;
public static final int shake_action_title_bg=0x7f090078;
- public static final int shaker_summary=0x7f0900d2;
- public static final int shaker_summary_artist=0x7f0900cd;
- public static final int shaker_summary_nowplaying=0x7f0900d0;
- public static final int shaker_summary_playlist=0x7f0900ce;
- public static final int shaker_title=0x7f0900d1;
- public static final int shaker_title_artist=0x7f0900cc;
- public static final int shaker_title_nowplaying=0x7f0900cf;
+ public static final int shaker_summary=0x7f0900d6;
+ public static final int shaker_summary_artist=0x7f0900d1;
+ public static final int shaker_summary_nowplaying=0x7f0900d4;
+ public static final int shaker_summary_playlist=0x7f0900d2;
+ public static final int shaker_title=0x7f0900d5;
+ public static final int shaker_title_artist=0x7f0900d0;
+ public static final int shaker_title_nowplaying=0x7f0900d3;
public static final int share=0x7f09006c;
public static final int shop=0x7f09006e;
public static final int shop_min=0x7f09006f;
@@ -834,8 +824,8 @@ public final class R { public static final int small_np_ui_summary=0x7f09007f;
public static final int small_np_window_summary=0x7f09007d;
public static final int small_np_window_title=0x7f09007c;
- public static final int song_ui_summary=0x7f0900c9;
- public static final int song_ui_title=0x7f0900c8;
+ public static final int song_ui_summary=0x7f0900cd;
+ public static final int song_ui_title=0x7f0900cc;
/** Menu in music picker to sort the list by album name.
*/
public static final int sort_by_album=0x7f090061;
@@ -860,6 +850,8 @@ public final class R { public static final int swipe_up_gesture=0x7f09009c;
public static final int tab_anim_summary=0x7f0900af;
public static final int tab_anim_title=0x7f0900ae;
+ public static final int tick=0x7f0900bc;
+ public static final int tick_summary=0x7f0900bd;
/** Category label on Library screen
*/
public static final int tracks_menu=0x7f090017;
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/ic_dialog_alert_holo_dark.png b/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/ic_dialog_alert_holo_dark.png Binary files differnew file mode 100644 index 0000000..f0ba889 --- /dev/null +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/ic_dialog_alert_holo_dark.png diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/ic_menu_moreoverflow_normal_holo_dark.png b/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/ic_menu_moreoverflow_normal_holo_dark.png Binary files differnew file mode 100644 index 0000000..39bdcb7 --- /dev/null +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-hdpi/ic_menu_moreoverflow_normal_holo_dark.png diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-mdpi/ic_dialog_alert_holo_dark.png b/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-mdpi/ic_dialog_alert_holo_dark.png Binary files differnew file mode 100644 index 0000000..75d9db7 --- /dev/null +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-mdpi/ic_dialog_alert_holo_dark.png diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-mdpi/ic_menu_moreoverflow_normal_holo_dark.png b/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-mdpi/ic_menu_moreoverflow_normal_holo_dark.png Binary files differnew file mode 100644 index 0000000..ba704b6 --- /dev/null +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-mdpi/ic_menu_moreoverflow_normal_holo_dark.png diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-xhdpi/ic_dialog_alert_holo_dark.png b/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-xhdpi/ic_dialog_alert_holo_dark.png Binary files differnew file mode 100644 index 0000000..f906e2a --- /dev/null +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-xhdpi/ic_dialog_alert_holo_dark.png diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-xhdpi/ic_menu_moreoverflow_normal_holo_dark.png b/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-xhdpi/ic_menu_moreoverflow_normal_holo_dark.png Binary files differnew file mode 100644 index 0000000..cf028c8 --- /dev/null +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/res/drawable-xhdpi/ic_menu_moreoverflow_normal_holo_dark.png diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/layout-land/audio_player_common.xml b/CyanogenMod-android_packages_apps_Music-41e85d6/res/layout-land/audio_player_common.xml index b27f86d..9d94cdc 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/layout-land/audio_player_common.xml +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/res/layout-land/audio_player_common.xml @@ -12,11 +12,11 @@ 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.
+ limitations under the License.
-->
<merge xmlns:android="http://schemas.android.com/apk/res/android" >
-
+
<SeekBar
android:id="@android:id/progress"
style="?android:attr/progressBarStyleHorizontal"
@@ -61,7 +61,8 @@ <com.android.music.RepeatingImageButton
android:id="@+id/prev"
style="@android:style/MediaButton.Previous"
- android:background="@drawable/btn_bg" />
+ android:background="@drawable/btn_bg"
+ android:src="@drawable/ic_appwidget_music_prev" />
<ImageButton
android:id="@+id/pause"
@@ -71,7 +72,8 @@ <com.android.music.RepeatingImageButton
android:id="@+id/next"
style="@android:style/MediaButton.Next"
- android:background="@drawable/btn_bg" />
+ android:background="@drawable/btn_bg"
+ android:src="@drawable/ic_appwidget_music_next" />
<ImageButton
android:id="@+id/repeat_normal"
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/layout-land/media_picker_activity.xml b/CyanogenMod-android_packages_apps_Music-41e85d6/res/layout-land/media_picker_activity.xml index 6cc03f5..95e2c0b 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/layout-land/media_picker_activity.xml +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/res/layout-land/media_picker_activity.xml @@ -16,6 +16,7 @@ --> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/album_tab" android:layout_width="match_parent" android:layout_height="match_parent" android:background="#111111" diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/layout-land/media_picker_activity_expanding.xml b/CyanogenMod-android_packages_apps_Music-41e85d6/res/layout-land/media_picker_activity_expanding.xml index 11b25af..522d6c8 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/layout-land/media_picker_activity_expanding.xml +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/res/layout-land/media_picker_activity_expanding.xml @@ -16,6 +16,7 @@ --> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/artist_tab" android:layout_width="match_parent" android:layout_height="match_parent" android:background="#ff000000" diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/layout/album_appwidget4x2.xml b/CyanogenMod-android_packages_apps_Music-41e85d6/res/layout/album_appwidget4x2.xml index ea9e867..8c138be 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/layout/album_appwidget4x2.xml +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/res/layout/album_appwidget4x2.xml @@ -10,6 +10,7 @@ -->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/four_by_two"
android:layout_width="match_parent"
android:layout_height="180dip"
android:background="@drawable/appwidget_bg"
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/layout/audio_player_common.xml b/CyanogenMod-android_packages_apps_Music-41e85d6/res/layout/audio_player_common.xml index a14412f..507d589 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/layout/audio_player_common.xml +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/res/layout/audio_player_common.xml @@ -21,7 +21,8 @@ android:id="@android:id/progress" style="?android:attr/progressBarStyleHorizontal" android:layout_width="match_parent" - android:layout_height="wrap_content" /> + android:layout_height="wrap_content" + android:progressDrawable="@drawable/progress_horizontal" /> <LinearLayout android:layout_width="match_parent" diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/layout/extra_controls.xml b/CyanogenMod-android_packages_apps_Music-41e85d6/res/layout/extra_controls.xml index d5c4368..4f85fdb 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/layout/extra_controls.xml +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/res/layout/extra_controls.xml @@ -83,6 +83,7 @@ android:visibility="gone" >
<ImageButton
+ android:id="@+id/shop_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@null"
@@ -113,6 +114,7 @@ android:visibility="gone" >
<ImageButton
+ android:id="@+id/ring_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@null"
@@ -204,6 +206,7 @@ android:visibility="gone" >
<ImageButton
+ android:id="@+id/delete_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@null"
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/layout/media_picker_activity.xml b/CyanogenMod-android_packages_apps_Music-41e85d6/res/layout/media_picker_activity.xml index fa137c1..823375f 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/layout/media_picker_activity.xml +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/res/layout/media_picker_activity.xml @@ -16,6 +16,7 @@ --> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/album_tab" android:layout_width="match_parent" android:layout_height="match_parent" android:background="#111111" @@ -31,9 +32,10 @@ android:layout_width="match_parent" android:layout_height="0dip" android:layout_weight="1" - android:cacheColorHint="#00000000" + android:cacheColorHint="@null" android:drawSelectorOnTop="true" android:fastScrollEnabled="true" + android:scrollingCache="true" android:textSize="18sp" /> <include layout="@layout/nowplaying" /> diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/layout/media_picker_activity_expanding.xml b/CyanogenMod-android_packages_apps_Music-41e85d6/res/layout/media_picker_activity_expanding.xml index d37bd1c..c9c2786 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/layout/media_picker_activity_expanding.xml +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/res/layout/media_picker_activity_expanding.xml @@ -16,6 +16,7 @@ --> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/artist_tab" android:layout_width="match_parent" android:layout_height="match_parent" android:background="#ff000000" @@ -31,11 +32,12 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:layout_weight="1" - android:cacheColorHint="#00000000" + android:cacheColorHint="@null" android:drawSelectorOnTop="true" android:fastScrollEnabled="true" android:indicatorLeft="8dip" android:indicatorRight="52dip" + android:scrollingCache="true" android:textSize="18sp" /> <include layout="@layout/nowplaying" /> diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/layout/nowplaying.xml b/CyanogenMod-android_packages_apps_Music-41e85d6/res/layout/nowplaying.xml index 3186f3b..54754e2 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/layout/nowplaying.xml +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/res/layout/nowplaying.xml @@ -19,7 +19,9 @@ style="?android:attr/progressBarStyleHorizontal"
android:layout_width="match_parent"
android:layout_height="5dip"
- android:layout_below="@+id/info_divider" />
+ android:progressDrawable="@drawable/progress_horizontal"
+ android:visibility="gone" />
+
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="fill_parent"
@@ -142,6 +144,15 @@ android:layout_gravity="center|right"
android:background="@drawable/btn_bg"
android:src="@drawable/ic_ab_search_holo_dark" />
+
+ <ImageButton
+ android:id="@+id/overFlow"
+ android:layout_width="56dip"
+ android:layout_height="match_parent"
+ android:layout_gravity="center|right"
+ android:background="@drawable/btn_bg"
+ android:src="@drawable/ic_menu_moreoverflow_normal_holo_dark"
+ android:visibility="gone" />
</LinearLayout>
</LinearLayout>
\ No newline at end of file diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/layout/track_list_item_child.xml b/CyanogenMod-android_packages_apps_Music-41e85d6/res/layout/track_list_item_child.xml index a6b3a8c..4a2d35d 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/layout/track_list_item_child.xml +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/res/layout/track_list_item_child.xml @@ -17,6 +17,7 @@ */ --> <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/child_item" android:layout_width="match_parent" android:layout_height="64dip" android:background="@drawable/bg_stripes_repeat" diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/layout/track_list_item_group.xml b/CyanogenMod-android_packages_apps_Music-41e85d6/res/layout/track_list_item_group.xml index 8bc4533..f80be87 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/layout/track_list_item_group.xml +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/res/layout/track_list_item_group.xml @@ -17,6 +17,7 @@ */ --> <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/group_item" android:layout_width="match_parent" android:layout_height="64dip" android:background="#111111" diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values/strings.xml b/CyanogenMod-android_packages_apps_Music-41e85d6/res/values/strings.xml index 0853d77..c448a98 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/values/strings.xml +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/res/values/strings.xml @@ -404,6 +404,10 @@ <string name="home_art_summary">Set your home screen wallpaper to the current album art while playing</string> <string name="lock">Lock Screen Controls</string> <string name="lock_summary">Enables lock screen controls</string> + <string name="flow">Menu Button</string> + <string name="flow_summary">Courtesy for Galaxy Nexus users</string> + <string name="tick">Ticker Text</string> + <string name="tick_summary">Display a short preview of your notification\'s content </string> <!-- Menu text for the item controlling the audio effects panel [CHAR LIMIT=15] --> <string name="effectspanel">Sound effects</string> <string name="effectspanel_summary">FX Booster, Bass boost, 3D effect, etc</string> diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/res/xml/settings.xml b/CyanogenMod-android_packages_apps_Music-41e85d6/res/xml/settings.xml index d4f8fd5..25fb0d4 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/res/xml/settings.xml +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/res/xml/settings.xml @@ -7,7 +7,7 @@ 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. */
+ language governing permissions and * limitations under the License. */
-->
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
@@ -132,6 +132,11 @@ android:key="cbProgress"
android:summary="@string/np_progress_summary"
android:title="@string/np_progress_title" />
+ <CheckBoxPreference
+ android:defaultValue="false"
+ android:key="cbFlow"
+ android:summary="@string/flow_summary"
+ android:title="@string/flow" />
</PreferenceCategory>
<PreferenceCategory android:title="@string/np_tv" >
<CheckBoxPreference
@@ -204,6 +209,11 @@ android:key="cbStatusNonya"
android:summary="@string/status_bar_nonya_summary"
android:title="@string/status_bar_nonya_title" />
+ <CheckBoxPreference
+ android:defaultValue="true"
+ android:key="cbStatusTicker"
+ android:summary="@string/tick_summary"
+ android:title="@string/tick" />
</PreferenceCategory>
<PreferenceCategory android:title="@string/status_bar_text_views" >
<CheckBoxPreference
@@ -249,17 +259,15 @@ android:title="@string/back_button_action" />
<CheckBoxPreference
- android:defaultValue="true"
+ android:defaultValue="false"
android:key="cbEnterNowPlaying"
android:summary="@string/full_np_summary"
android:title="@string/full_np_title" />
-
<CheckBoxPreference
android:defaultValue="true"
android:key="cbLock"
android:summary="@string/lock_summary"
android:title="@string/lock" />
-
<CheckBoxPreference
android:defaultValue="false"
android:key="cbHomeAlbumArt"
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/src/com/android/music/AlbumBrowserActivity.java b/CyanogenMod-android_packages_apps_Music-41e85d6/src/com/android/music/AlbumBrowserActivity.java index c38be6c..c732494 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/src/com/android/music/AlbumBrowserActivity.java +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/src/com/android/music/AlbumBrowserActivity.java @@ -29,6 +29,8 @@ import android.content.Intent; import android.content.IntentFilter; import android.content.ServiceConnection; import android.content.SharedPreferences; +import android.content.pm.PackageManager; +import android.content.pm.PackageManager.NameNotFoundException; import android.content.res.Configuration; import android.content.res.Resources; import android.database.Cursor; @@ -72,10 +74,13 @@ import android.widget.AlphabetIndexer; import android.widget.FrameLayout; import android.widget.ImageButton; import android.widget.ImageView; +import android.widget.LinearLayout; import android.widget.ListView; import android.widget.ProgressBar; +import android.widget.RelativeLayout; import android.widget.SectionIndexer; import android.widget.SimpleCursorAdapter; +import android.widget.TabWidget; import android.widget.TextView; import com.android.music.MusicUtils.ServiceToken; @@ -97,7 +102,20 @@ public class AlbumBrowserActivity extends ListActivity implements private ListView lv; private IMediaPlaybackService mService = null; private SharedPreferences mPreferences; + // Artist tab layout + public LinearLayout mAlbumTab; + public TabWidget mButtonBar; + public TextView mButtonBarArtist; + public TextView mButtonBarAlbum; + public TextView mButtonBarSong; + public TextView mButtonBarPlaylist; + public TextView mButtonBarNP; + public RelativeLayout mGroup; + public RelativeLayout mChild; // Smaller now playing window buttons + private LinearLayout mNowPlaying; + private ImageView mInfoDivider; + private ProgressBar mProgress; private ImageButton mDoSearch; private ImageButton mMarket; private ImageButton mNext; @@ -105,6 +123,7 @@ public class AlbumBrowserActivity extends ListActivity implements private ImageButton mPlusPlaylist; private ImageButton mPrev; private ImageButton mShare; + private ImageButton mFlow; // Shake actions public Shaker Albumshaker; private String artist_shake_actions_db; @@ -119,6 +138,10 @@ public class AlbumBrowserActivity extends ListActivity implements private String np_swipe_gesture_db; // Swipe tabs private GestureDetector swipetabs; + // ADW Theme constants + public static final int THEME_ITEM_BACKGROUND = 0; + public static final int THEME_ITEM_FOREGROUND = 1; + public static final int THEME_ITEM_TEXT_DRAWABLE = 2; public AlbumBrowserActivity() { } @@ -192,6 +215,7 @@ public class AlbumBrowserActivity extends ListActivity implements mMarket = (ImageButton) findViewById(R.id.market_music); mDoSearch = (ImageButton) findViewById(R.id.doSearch); mPlusPlaylist = (ImageButton) findViewById(R.id.plus_playlist); + mFlow = (ImageButton) findViewById(R.id.overFlow); // I found that without setting the onClickListeners in Portrait mode // only, flipping into Landscape force closes. if (getResources().getConfiguration().orientation == Configuration.ORIENTATION_PORTRAIT) { @@ -202,6 +226,7 @@ public class AlbumBrowserActivity extends ListActivity implements mNext.setOnClickListener(mMediaNext); mPrev.setOnClickListener(mMediaPrev); mShare.setOnClickListener(mShareSong); + mFlow.setOnClickListener(mOverFlow); // I only want this to show in the Playlist activity mPlusPlaylist.setVisibility(View.GONE); // Swipe gesture @@ -214,6 +239,96 @@ public class AlbumBrowserActivity extends ListActivity implements } }); } + // ADW: Load the specified theme + String themePackage = MusicUtils.getThemePackageName(this, + MusicSettingsActivity.THEME_DEFAULT); + PackageManager pm = getPackageManager(); + Resources themeResources = null; + if (!themePackage.equals(MusicSettingsActivity.THEME_DEFAULT)) { + try { + themeResources = pm.getResourcesForApplication(themePackage); + } catch (NameNotFoundException e) { + // ADW The saved theme was uninstalled so we save the + // default one + MusicUtils.setThemePackageName(this, + MusicSettingsActivity.THEME_DEFAULT); + } + } + // Set Views for themes + if (themeResources != null) { + // Artist tab + mAlbumTab = (LinearLayout) findViewById(R.id.album_tab); + mButtonBar = (TabWidget) findViewById(R.id.buttonbar); + mButtonBarArtist = (TextView) findViewById(R.id.artisttab); + mButtonBarAlbum = (TextView) findViewById(R.id.albumtab); + mButtonBarSong = (TextView) findViewById(R.id.songtab); + mButtonBarPlaylist = (TextView) findViewById(R.id.playlisttab); + mButtonBarNP = (TextView) findViewById(R.id.nowplayingtab); + mGroup = (RelativeLayout) findViewById(R.id.group_item); + mChild = (RelativeLayout) findViewById(R.id.child_item); + ArtistAlbumBrowserActivity + .loadThemeResource(themeResources, themePackage, + "tab_album", mAlbumTab, THEME_ITEM_BACKGROUND); + ArtistAlbumBrowserActivity.loadThemeResource(themeResources, + themePackage, "child_bg", mChild, THEME_ITEM_BACKGROUND); + ArtistAlbumBrowserActivity.loadThemeResource(themeResources, + themePackage, "buttonbar", mButtonBar, + THEME_ITEM_BACKGROUND); + ArtistAlbumBrowserActivity.loadThemeResource(themeResources, + themePackage, "tab_bg_artist", mButtonBarArtist, + THEME_ITEM_BACKGROUND); + ArtistAlbumBrowserActivity.loadThemeResource(themeResources, + themePackage, "tab_bg_album", mButtonBarAlbum, + THEME_ITEM_BACKGROUND); + ArtistAlbumBrowserActivity.loadThemeResource(themeResources, + themePackage, "tab_bg_song", mButtonBarSong, + THEME_ITEM_BACKGROUND); + ArtistAlbumBrowserActivity.loadThemeResource(themeResources, + themePackage, "tab_bg_playlist", mButtonBarPlaylist, + THEME_ITEM_BACKGROUND); + ArtistAlbumBrowserActivity.loadThemeResource(themeResources, + themePackage, "tab_bg_nowplaying", mButtonBarNP, + THEME_ITEM_BACKGROUND); + // Small now playing window + mNowPlaying = (LinearLayout) findViewById(R.id.nowplaying); + mInfoDivider = (ImageView) findViewById(R.id.info_divider); + mProgress = (ProgressBar) findViewById(R.id.progress); + mShare = (ImageButton) findViewById(R.id.share_song); + mPlay = (ImageButton) findViewById(R.id.media_play); + mNext = (ImageButton) findViewById(R.id.media_next); + mPrev = (ImageButton) findViewById(R.id.media_prev); + mMarket = (ImageButton) findViewById(R.id.market_music); + mDoSearch = (ImageButton) findViewById(R.id.doSearch); + mFlow = (ImageButton) findViewById(R.id.overFlow); + if (getResources().getConfiguration().orientation == Configuration.ORIENTATION_PORTRAIT) { + ArtistAlbumBrowserActivity.loadThemeResource(themeResources, + themePackage, "snp_background", mNowPlaying, + THEME_ITEM_BACKGROUND); + ArtistAlbumBrowserActivity.loadThemeResource(themeResources, + themePackage, "snp_progress", mProgress, + THEME_ITEM_BACKGROUND); + ArtistAlbumBrowserActivity.loadThemeResource(themeResources, + themePackage, "snp_info_divider", mInfoDivider, + THEME_ITEM_BACKGROUND); + ArtistAlbumBrowserActivity.loadThemeResource(themeResources, + themePackage, "snp_share", mShare, + THEME_ITEM_FOREGROUND); + ArtistAlbumBrowserActivity.loadThemeResource(themeResources, + themePackage, "snp_play", mPlay, THEME_ITEM_FOREGROUND); + ArtistAlbumBrowserActivity.loadThemeResource(themeResources, + themePackage, "snp_next", mNext, THEME_ITEM_FOREGROUND); + ArtistAlbumBrowserActivity.loadThemeResource(themeResources, + themePackage, "snp_prev", mPrev, THEME_ITEM_FOREGROUND); + ArtistAlbumBrowserActivity.loadThemeResource(themeResources, + themePackage, "snp_market", mMarket, + THEME_ITEM_FOREGROUND); + ArtistAlbumBrowserActivity.loadThemeResource(themeResources, + themePackage, "snp_search", mDoSearch, + THEME_ITEM_FOREGROUND); + ArtistAlbumBrowserActivity.loadThemeResource(themeResources, + themePackage, "snp_flow", mFlow, THEME_ITEM_FOREGROUND); + } + } mAdapter = (AlbumListAdapter) getLastNonConfigurationInstance(); if (mAdapter == null) { @@ -481,6 +596,11 @@ public class AlbumBrowserActivity extends ListActivity implements return currentTrackMessage; } + private View.OnClickListener mOverFlow = new View.OnClickListener() { + public void onClick(View v) { + openOptionsMenu(); + } + }; private View.OnClickListener mDoSearchListener = new View.OnClickListener() { public void onClick(View v) { onSearchRequested(); @@ -1048,6 +1168,34 @@ public class AlbumBrowserActivity extends ListActivity implements vh.mContextMenu = (FrameLayout) v .findViewById(R.id.second_column_icon); vh.mContextMenu.setOnClickListener(mCML); + // ADW: Load the specified theme + String themePackage = MusicUtils.getThemePackageName(context, + MusicSettingsActivity.THEME_DEFAULT); + PackageManager pm = context.getPackageManager(); + Resources themeResources = null; + if (!themePackage.equals(MusicSettingsActivity.THEME_DEFAULT)) { + try { + themeResources = pm + .getResourcesForApplication(themePackage); + } catch (NameNotFoundException e) { + // ADW The saved theme was uninstalled so we save the + // default one + MusicUtils.setThemePackageName(context, + MusicSettingsActivity.THEME_DEFAULT); + } + } + if (themeResources != null) { + int line1 = themeResources.getIdentifier( + "album_tab_artist_name_color", "color", themePackage); + if (line1 != 0) { + vh.line1.setTextColor(themeResources.getColor(line1)); + } + int line2 = themeResources.getIdentifier( + "album_tab_album_name_color", "color", themePackage); + if (line2 != 0) { + vh.line2.setTextColor(themeResources.getColor(line2)); + } + } return v; } @@ -1166,11 +1314,36 @@ public class AlbumBrowserActivity extends ListActivity implements } private void setPauseButtonImage() { + // ADW: Load the specified theme + String themePackage = MusicUtils.getThemePackageName(this, + MusicSettingsActivity.THEME_DEFAULT); + PackageManager pm = getPackageManager(); + Resources themeResources = null; + if (!themePackage.equals(MusicSettingsActivity.THEME_DEFAULT)) { + try { + themeResources = pm.getResourcesForApplication(themePackage); + } catch (NameNotFoundException e) { + // ADW The saved theme was uninstalled so we save the + // default one + MusicUtils.setThemePackageName(this, + MusicSettingsActivity.THEME_DEFAULT); + } + } try { if (mService != null && mService.isPlaying()) { mPlay.setImageResource(R.drawable.ic_media_pause); + if (themeResources != null) { + ArtistAlbumBrowserActivity.loadThemeResource( + themeResources, themePackage, "np_pause", mPlay, + THEME_ITEM_FOREGROUND); + } } else { mPlay.setImageResource(R.drawable.ic_appwidget_music_play); + if (themeResources != null) { + ArtistAlbumBrowserActivity.loadThemeResource( + themeResources, themePackage, "np_play", mPlay, + THEME_ITEM_FOREGROUND); + } } } catch (RemoteException ex) { } diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/src/com/android/music/ArtistAlbumBrowserActivity.java b/CyanogenMod-android_packages_apps_Music-41e85d6/src/com/android/music/ArtistAlbumBrowserActivity.java index a9c86a3..39a8149 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/src/com/android/music/ArtistAlbumBrowserActivity.java +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/src/com/android/music/ArtistAlbumBrowserActivity.java @@ -27,6 +27,8 @@ import android.content.Intent; import android.content.IntentFilter; import android.content.ServiceConnection; import android.content.SharedPreferences; +import android.content.pm.PackageManager; +import android.content.pm.PackageManager.NameNotFoundException; import android.content.res.Configuration; import android.content.res.Resources; import android.database.Cursor; @@ -64,9 +66,12 @@ import android.widget.ExpandableListView.ExpandableListContextMenuInfo; import android.widget.FrameLayout; import android.widget.ImageButton; import android.widget.ImageView; +import android.widget.LinearLayout; import android.widget.ProgressBar; +import android.widget.RelativeLayout; import android.widget.SectionIndexer; import android.widget.SimpleCursorTreeAdapter; +import android.widget.TabWidget; import android.widget.TextView; import com.android.music.MusicUtils.ServiceToken; @@ -89,14 +94,29 @@ public class ArtistAlbumBrowserActivity extends ExpandableListActivity private ServiceToken mToken; private IMediaPlaybackService mService = null; private SharedPreferences mPreferences; + // Artist tab layout + public LinearLayout mArtistTab; + public TabWidget mButtonBar; + public TextView mButtonBarArtist; + public TextView mButtonBarAlbum; + public TextView mButtonBarSong; + public TextView mButtonBarPlaylist; + public TextView mButtonBarNP; + public RelativeLayout mGroup; + public RelativeLayout mChild; + public AnimationDrawable mPeak; // Smaller now playing window buttons + private LinearLayout mNowPlaying; + private ImageView mInfoDivider; + private ProgressBar mProgress; private ImageButton mDoSearch; private ImageButton mMarket; private ImageButton mNext; private ImageButton mPlay; private ImageButton mPlusPlaylist; private ImageButton mPrev; - private ImageButton mShare; + private static ImageButton mShare; + private ImageButton mFlow; // Shake actions public Shaker Artistshaker; private String artist_shake_actions_db; @@ -111,6 +131,10 @@ public class ArtistAlbumBrowserActivity extends ExpandableListActivity private String np_swipe_gesture_db; // Swipe tabs private GestureDetector swipetabs; + // ADW Theme constants + public static final int THEME_ITEM_BACKGROUND = 0; + public static final int THEME_ITEM_FOREGROUND = 1; + public static final int THEME_ITEM_TEXT_DRAWABLE = 2; /** Called when the activity is first created. */ @Override @@ -177,6 +201,7 @@ public class ArtistAlbumBrowserActivity extends ExpandableListActivity mMarket = (ImageButton) findViewById(R.id.market_music); mDoSearch = (ImageButton) findViewById(R.id.doSearch); mPlusPlaylist = (ImageButton) findViewById(R.id.plus_playlist); + mFlow = (ImageButton) findViewById(R.id.overFlow); // I found that without setting the onClickListeners in Portrait mode // only, flipping into Landscape force closes. if (getResources().getConfiguration().orientation == Configuration.ORIENTATION_PORTRAIT) { @@ -187,6 +212,7 @@ public class ArtistAlbumBrowserActivity extends ExpandableListActivity mNext.setOnClickListener(mMediaNext); mPrev.setOnClickListener(mMediaPrev); mShare.setOnClickListener(mShareSong); + mFlow.setOnClickListener(mOverFlow); // I only want this to show in the Playlist activity mPlusPlaylist.setVisibility(View.GONE); // Swipe gesture @@ -199,7 +225,84 @@ public class ArtistAlbumBrowserActivity extends ExpandableListActivity } }); } - + // ADW: Load the specified theme + String themePackage = MusicUtils.getThemePackageName(this, + MusicSettingsActivity.THEME_DEFAULT); + PackageManager pm = getPackageManager(); + Resources themeResources = null; + if (!themePackage.equals(MusicSettingsActivity.THEME_DEFAULT)) { + try { + themeResources = pm.getResourcesForApplication(themePackage); + } catch (NameNotFoundException e) { + // ADW The saved theme was uninstalled so we save the + // default one + MusicUtils.setThemePackageName(this, + MusicSettingsActivity.THEME_DEFAULT); + } + } + // Set Views for themes + if (themeResources != null) { + // Artist tab + mArtistTab = (LinearLayout) findViewById(R.id.artist_tab); + mButtonBar = (TabWidget) findViewById(R.id.buttonbar); + mButtonBarArtist = (TextView) findViewById(R.id.artisttab); + mButtonBarAlbum = (TextView) findViewById(R.id.albumtab); + mButtonBarSong = (TextView) findViewById(R.id.songtab); + mButtonBarPlaylist = (TextView) findViewById(R.id.playlisttab); + mButtonBarNP = (TextView) findViewById(R.id.nowplayingtab); + mGroup = (RelativeLayout) findViewById(R.id.group_item); + mChild = (RelativeLayout) findViewById(R.id.child_item); + loadThemeResource(themeResources, themePackage, "tab_artist", + mArtistTab, THEME_ITEM_BACKGROUND); + loadThemeResource(themeResources, themePackage, "child_bg", mChild, + THEME_ITEM_BACKGROUND); + loadThemeResource(themeResources, themePackage, "buttonbar", + mButtonBar, THEME_ITEM_BACKGROUND); + loadThemeResource(themeResources, themePackage, "tab_bg_artist", + mButtonBarArtist, THEME_ITEM_BACKGROUND); + loadThemeResource(themeResources, themePackage, "tab_bg_album", + mButtonBarAlbum, THEME_ITEM_BACKGROUND); + loadThemeResource(themeResources, themePackage, "tab_bg_song", + mButtonBarSong, THEME_ITEM_BACKGROUND); + loadThemeResource(themeResources, themePackage, "tab_bg_playlist", + mButtonBarPlaylist, THEME_ITEM_BACKGROUND); + loadThemeResource(themeResources, themePackage, + "tab_bg_nowplaying", mButtonBarNP, THEME_ITEM_BACKGROUND); + + // Small now playing window + mNowPlaying = (LinearLayout) findViewById(R.id.nowplaying); + mInfoDivider = (ImageView) findViewById(R.id.info_divider); + mProgress = (ProgressBar) findViewById(R.id.progress); + mShare = (ImageButton) findViewById(R.id.share_song); + mPlay = (ImageButton) findViewById(R.id.media_play); + mNext = (ImageButton) findViewById(R.id.media_next); + mPrev = (ImageButton) findViewById(R.id.media_prev); + mMarket = (ImageButton) findViewById(R.id.market_music); + mDoSearch = (ImageButton) findViewById(R.id.doSearch); + mFlow = (ImageButton) findViewById(R.id.overFlow); + if (getResources().getConfiguration().orientation == Configuration.ORIENTATION_PORTRAIT) { + loadThemeResource(themeResources, themePackage, + "snp_background", mNowPlaying, THEME_ITEM_BACKGROUND); + loadThemeResource(themeResources, themePackage, "snp_progress", + mProgress, THEME_ITEM_BACKGROUND); + loadThemeResource(themeResources, themePackage, + "snp_info_divider", mInfoDivider, THEME_ITEM_BACKGROUND); + loadThemeResource(themeResources, themePackage, "snp_share", + mShare, THEME_ITEM_FOREGROUND); + loadThemeResource(themeResources, themePackage, "snp_play", + mPlay, THEME_ITEM_FOREGROUND); + loadThemeResource(themeResources, themePackage, "snp_next", + mNext, THEME_ITEM_FOREGROUND); + loadThemeResource(themeResources, themePackage, "snp_prev", + mPrev, THEME_ITEM_FOREGROUND); + loadThemeResource(themeResources, themePackage, "snp_market", + mMarket, THEME_ITEM_FOREGROUND); + loadThemeResource(themeResources, themePackage, "snp_search", + mDoSearch, THEME_ITEM_FOREGROUND); + loadThemeResource(themeResources, themePackage, "snp_flow", + mFlow, THEME_ITEM_FOREGROUND); + } + } mAdapter = (ArtistAlbumListAdapter) getLastNonConfigurationInstance(); if (mAdapter == null) { // Log.i("@@@", "starting query"); @@ -212,6 +315,7 @@ public class ArtistAlbumBrowserActivity extends ExpandableListActivity setListAdapter(mAdapter); setTitle(R.string.working_artists); getArtistCursor(mAdapter.getQueryHandler(), null); + } else { mAdapter.setActivity(this); setListAdapter(mAdapter); @@ -224,6 +328,40 @@ public class ArtistAlbumBrowserActivity extends ExpandableListActivity } } + public static void loadThemeResource(Resources themeResources, + String themePackage, String item_name, View item, int themeType) { + Drawable d = null; + if (themeResources != null) { + int resource_id = themeResources.getIdentifier(item_name, + "drawable", themePackage); + if (resource_id != 0) { + try { + d = themeResources.getDrawable(resource_id); + } catch (Resources.NotFoundException e) { + return; + } + if (themeType == THEME_ITEM_FOREGROUND + && item instanceof ImageView) { + // ADW remove the old drawable + Drawable tmp = ((ImageView) item).getDrawable(); + if (tmp != null) { + tmp.setCallback(null); + tmp = null; + } + ((ImageView) item).setImageDrawable(d); + } else { + // ADW remove the old drawable + Drawable tmp = item.getBackground(); + if (tmp != null) { + tmp.setCallback(null); + tmp = null; + } + item.setBackgroundDrawable(d); + } + } + } + } + @Override public Object onRetainNonConfigurationInstance() { mAdapterSent = true; @@ -392,6 +530,11 @@ public class ArtistAlbumBrowserActivity extends ExpandableListActivity return currentTrackMessage; } + private View.OnClickListener mOverFlow = new View.OnClickListener() { + public void onClick(View v) { + openOptionsMenu(); + } + }; private View.OnClickListener mDoSearchListener = new View.OnClickListener() { public void onClick(View v) { onSearchRequested(); @@ -1044,6 +1187,37 @@ public class ArtistAlbumBrowserActivity extends ExpandableListActivity vh.mContextMenu = (FrameLayout) v .findViewById(R.id.second_column_icon); vh.mContextMenu.setOnClickListener(mCML); + + // ADW: Load the specified theme + String themePackage = MusicUtils.getThemePackageName(context, + MusicSettingsActivity.THEME_DEFAULT); + PackageManager pm = context.getPackageManager(); + Resources themeResources = null; + if (!themePackage.equals(MusicSettingsActivity.THEME_DEFAULT)) { + try { + themeResources = pm + .getResourcesForApplication(themePackage); + } catch (NameNotFoundException e) { + // ADW The saved theme was uninstalled so we save the + // default one + MusicUtils.setThemePackageName(context, + MusicSettingsActivity.THEME_DEFAULT); + } + } + if (themeResources != null) { + int line1 = themeResources.getIdentifier( + "artist_tab_artist_name_color_group", "color", + themePackage); + if (line1 != 0) { + vh.line1.setTextColor(themeResources.getColor(line1)); + } + int line2 = themeResources.getIdentifier( + "artist_tab_number_of_albums_color", "color", + themePackage); + if (line2 != 0) { + vh.line2.setTextColor(themeResources.getColor(line2)); + } + } return v; } @@ -1063,6 +1237,36 @@ public class ArtistAlbumBrowserActivity extends ExpandableListActivity vh.mContextMenu = (FrameLayout) v .findViewById(R.id.second_column_icon); vh.mContextMenu.setOnClickListener(mCML); + // ADW: Load the specified theme + String themePackage = MusicUtils.getThemePackageName(context, + MusicSettingsActivity.THEME_DEFAULT); + PackageManager pm = context.getPackageManager(); + Resources themeResources = null; + if (!themePackage.equals(MusicSettingsActivity.THEME_DEFAULT)) { + try { + themeResources = pm + .getResourcesForApplication(themePackage); + } catch (NameNotFoundException e) { + // ADW The saved theme was uninstalled so we save the + // default one + MusicUtils.setThemePackageName(context, + MusicSettingsActivity.THEME_DEFAULT); + } + } + if (themeResources != null) { + int line1 = themeResources.getIdentifier( + "artist_tab_artist_name_color_child", "color", + themePackage); + if (line1 != 0) { + vh.line1.setTextColor(themeResources.getColor(line1)); + } + int line2 = themeResources.getIdentifier( + "artist_tab_number_of_songs_color", "color", + themePackage); + if (line2 != 0) { + vh.line2.setTextColor(themeResources.getColor(line2)); + } + } return v; } @@ -1319,11 +1523,30 @@ public class ArtistAlbumBrowserActivity extends ExpandableListActivity } private void setPauseButtonImage() { + // ADW: Load the specified theme + String themePackage = MusicUtils.getThemePackageName(this, + MusicSettingsActivity.THEME_DEFAULT); + PackageManager pm = getPackageManager(); + Resources themeResources = null; + if (!themePackage.equals(MusicSettingsActivity.THEME_DEFAULT)) { + try { + themeResources = pm.getResourcesForApplication(themePackage); + } catch (NameNotFoundException e) { + // ADW The saved theme was uninstalled so we save the + // default one + MusicUtils.setThemePackageName(this, + MusicSettingsActivity.THEME_DEFAULT); + } + } try { if (mService != null && mService.isPlaying()) { mPlay.setImageResource(R.drawable.ic_media_pause); + ArtistAlbumBrowserActivity.loadThemeResource(themeResources, + themePackage, "np_pause", mPlay, THEME_ITEM_FOREGROUND); } else { mPlay.setImageResource(R.drawable.ic_appwidget_music_play); + ArtistAlbumBrowserActivity.loadThemeResource(themeResources, + themePackage, "np_play", mPlay, THEME_ITEM_FOREGROUND); } } catch (RemoteException ex) { } @@ -1481,6 +1704,5 @@ public class ArtistAlbumBrowserActivity extends ExpandableListActivity } } return super.onKeyLongPress(keyCode, event); - } } diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/src/com/android/music/MediaAppWidgetProvider4x1.java b/CyanogenMod-android_packages_apps_Music-41e85d6/src/com/android/music/MediaAppWidgetProvider4x1.java index a3134ca..b9097f1 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/src/com/android/music/MediaAppWidgetProvider4x1.java +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/src/com/android/music/MediaAppWidgetProvider4x1.java @@ -23,6 +23,8 @@ import android.content.ComponentName; import android.content.Context;
import android.content.Intent;
import android.content.SharedPreferences;
+import android.content.pm.PackageManager;
+import android.content.pm.PackageManager.NameNotFoundException;
import android.content.res.Resources;
import android.graphics.Color;
import android.net.Uri;
@@ -217,6 +219,34 @@ public class MediaAppWidgetProvider4x1 extends AppWidgetProvider { */
private void linkButtons(Context context, RemoteViews views,
boolean playerActive) {
+
+ // ADW: Load the specified theme
+ String themePackage = MusicUtils.getThemePackageName(context,
+ MusicSettingsActivity.THEME_DEFAULT);
+ PackageManager pm = context.getPackageManager();
+ Resources themeResources = null;
+ if (!themePackage.equals(MusicSettingsActivity.THEME_DEFAULT)) {
+ try {
+ themeResources = pm.getResourcesForApplication(themePackage);
+ } catch (NameNotFoundException e) {
+ // ADW The saved theme was uninstalled so we save the
+ // default one
+ MusicUtils.setThemePackageName(context,
+ MusicSettingsActivity.THEME_DEFAULT);
+ }
+ int trackName = themeResources.getIdentifier(
+ "four_by_one_track_name", "color", themePackage);
+ if (trackName != 0) {
+ views.setTextColor(R.id.trackname,
+ themeResources.getColor(trackName));
+ }
+ int artistName = themeResources.getIdentifier(
+ "four_by_one_artist_name", "color", themePackage);
+ if (artistName != 0) {
+ views.setTextColor(R.id.artistname,
+ themeResources.getColor(artistName));
+ }
+ }
// Connect up various buttons and touch events
Intent intent;
PendingIntent pendingIntent;
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/src/com/android/music/MediaAppWidgetProvider4x2.java b/CyanogenMod-android_packages_apps_Music-41e85d6/src/com/android/music/MediaAppWidgetProvider4x2.java index 510ae31..21c4420 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/src/com/android/music/MediaAppWidgetProvider4x2.java +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/src/com/android/music/MediaAppWidgetProvider4x2.java @@ -23,6 +23,8 @@ import android.content.ComponentName; import android.content.Context;
import android.content.Intent;
import android.content.SharedPreferences;
+import android.content.pm.PackageManager;
+import android.content.pm.PackageManager.NameNotFoundException;
import android.content.res.Resources;
import android.graphics.Color;
import android.net.Uri;
@@ -40,6 +42,9 @@ public class MediaAppWidgetProvider4x2 extends AppWidgetProvider { public static final String CMDAPPWIDGETUPDATE = "appwidgetupdate4x2";
+ // ADW Theme constants
+ public static final int THEME_ITEM_BACKGROUND = 0;
+ public static final int THEME_ITEM_FOREGROUND = 1;
private static MediaAppWidgetProvider4x2 sInstance;
static synchronized MediaAppWidgetProvider4x2 getInstance() {
@@ -249,6 +254,7 @@ public class MediaAppWidgetProvider4x2 extends AppWidgetProvider { linkButtons(service, views, playing);
pushUpdate(service, appWidgetIds, views);
+
}
/**
@@ -261,6 +267,41 @@ public class MediaAppWidgetProvider4x2 extends AppWidgetProvider { */
private void linkButtons(Context context, RemoteViews views,
boolean playerActive) {
+
+ // ADW: Load the specified theme
+ String themePackage = MusicUtils.getThemePackageName(context,
+ MusicSettingsActivity.THEME_DEFAULT);
+ PackageManager pm = context.getPackageManager();
+ Resources themeResources = null;
+ if (!themePackage.equals(MusicSettingsActivity.THEME_DEFAULT)) {
+ try {
+ themeResources = pm.getResourcesForApplication(themePackage);
+ } catch (NameNotFoundException e) {
+ // ADW The saved theme was uninstalled so we save the
+ // default one
+ MusicUtils.setThemePackageName(context,
+ MusicSettingsActivity.THEME_DEFAULT);
+ }
+ int albumName = themeResources.getIdentifier(
+ "four_by_two_album_name", "color", themePackage);
+ if (albumName != 0) {
+ views.setTextColor(R.id.albumname,
+ themeResources.getColor(albumName));
+ }
+ int trackName = themeResources.getIdentifier(
+ "four_by_two_track_name", "color", themePackage);
+ if (trackName != 0) {
+ views.setTextColor(R.id.trackname,
+ themeResources.getColor(trackName));
+ }
+ int artistName = themeResources.getIdentifier(
+ "four_by_two_artist_name", "color", themePackage);
+ if (artistName != 0) {
+ views.setTextColor(R.id.artistname,
+ themeResources.getColor(artistName));
+ }
+ }
+
// Connect up various buttons and touch events
Intent intent;
PendingIntent pendingIntent;
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/src/com/android/music/MediaPlaybackActivity.java b/CyanogenMod-android_packages_apps_Music-41e85d6/src/com/android/music/MediaPlaybackActivity.java index fa1dac5..f5084d1 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/src/com/android/music/MediaPlaybackActivity.java +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/src/com/android/music/MediaPlaybackActivity.java @@ -30,7 +30,10 @@ import android.content.Intent; import android.content.IntentFilter; import android.content.ServiceConnection; import android.content.SharedPreferences; +import android.content.pm.PackageManager; +import android.content.pm.PackageManager.NameNotFoundException; import android.content.res.Configuration; +import android.content.res.Resources; import android.database.Cursor; import android.gesture.GestureLibrary; import android.gesture.GestureOverlayView; @@ -107,6 +110,10 @@ public class MediaPlaybackActivity extends Activity implements MusicUtils.Defs, private LinearLayout mEQButton; private ImageButton mRepeatNormal; private ImageButton mShuffleNormal; + private ImageButton mDeleteButton; + private ImageButton mEQ; + private ImageButton mShopButton; + private ImageButton mRingButton; private LinearLayout mRingtone; private LinearLayout mShop; private LinearLayout mDelete; @@ -117,6 +124,10 @@ public class MediaPlaybackActivity extends Activity implements MusicUtils.Defs, private String shake_actions_db; // Animations private String np_animation_ui_db; + // ADW Theme constants + public static final int THEME_ITEM_BACKGROUND = 0; + public static final int THEME_ITEM_FOREGROUND = 1; + public static final int THEME_ITEM_TEXT_DRAWABLE = 2; public MediaPlaybackActivity() { } @@ -239,6 +250,94 @@ public class MediaPlaybackActivity extends Activity implements MusicUtils.Defs, mTouchSlop = ViewConfiguration.get(this).getScaledTouchSlop(); mVibrator = (Vibrator) getSystemService(Context.VIBRATOR_SERVICE); + + // ADW: Load the specified theme + String themePackage = MusicUtils.getThemePackageName(this, + MusicSettingsActivity.THEME_DEFAULT); + PackageManager pm = getPackageManager(); + Resources themeResources = null; + if (!themePackage.equals(MusicSettingsActivity.THEME_DEFAULT)) { + try { + themeResources = pm.getResourcesForApplication(themePackage); + } catch (NameNotFoundException e) { + // ADW The saved theme was uninstalled so we save the + // default one + MusicUtils.setThemePackageName(this, + MusicSettingsActivity.THEME_DEFAULT); + } + } + // Set Views for themes + if (themeResources != null) { + mShuffleButton = ((LinearLayout) findViewById(R.id.shuffle)); + mShuffleButtonText = (TextView) findViewById(R.id.shuffle_text); + mRepeatButton = ((LinearLayout) findViewById(R.id.repeat)); + mRepeatButtonText = (TextView) findViewById(R.id.repeat_text); + mShareButton = (LinearLayout) findViewById(R.id.share_extra); + mEQButton = (LinearLayout) findViewById(R.id.eq_extra); + mShuffleButtonImage = (ImageButton) findViewById(R.id.shuffle_extra_image); + mRepeatButtonImage = (ImageButton) findViewById(R.id.repeat_extra_image); + mEffectsButtonImage = (ImageButton) findViewById(R.id.eq_extra_image); + mShareButtonImage = (ImageButton) findViewById(R.id.share_extra_image); + mRingtone = (LinearLayout) findViewById(R.id.ringtone); + mShop = (LinearLayout) findViewById(R.id.shop); + mDelete = (LinearLayout) findViewById(R.id.delete_extra); + mNextButton = (RepeatingImageButton) findViewById(R.id.next); + mPrevButton = (RepeatingImageButton) findViewById(R.id.prev); + mRepeatNormal = (ImageButton) findViewById(R.id.repeat_normal); + mShuffleNormal = (ImageButton) findViewById(R.id.shuffle_normal); + mShopButton = (ImageButton) findViewById(R.id.shop_button); + mEQ = (ImageButton) findViewById(R.id.eq_extra_image); + mRingButton = (ImageButton) findViewById(R.id.ring_button); + mDeleteButton = (ImageButton) findViewById(R.id.delete_button); + SeekBar seekBar = (SeekBar) findViewById(android.R.id.progress); + // Extra Controls background + ArtistAlbumBrowserActivity.loadThemeResource(themeResources, + themePackage, "np_shuffle_bg", mShuffleButton, + THEME_ITEM_BACKGROUND); + ArtistAlbumBrowserActivity.loadThemeResource(themeResources, + themePackage, "np_repeat_bg", mRepeatButton, + THEME_ITEM_BACKGROUND); + ArtistAlbumBrowserActivity.loadThemeResource(themeResources, + themePackage, "np_share_bg", mShareButton, + THEME_ITEM_BACKGROUND); + ArtistAlbumBrowserActivity.loadThemeResource(themeResources, + themePackage, "np_market_bg", mShop, THEME_ITEM_BACKGROUND); + ArtistAlbumBrowserActivity.loadThemeResource(themeResources, + themePackage, "np_ring_bg", mRingtone, + THEME_ITEM_BACKGROUND); + ArtistAlbumBrowserActivity.loadThemeResource(themeResources, + themePackage, "np_delete_bg", mDelete, + THEME_ITEM_BACKGROUND); + ArtistAlbumBrowserActivity.loadThemeResource(themeResources, + themePackage, "np_eq_bg", mEQButton, THEME_ITEM_BACKGROUND); + // Extra Controls ImageButtons + ArtistAlbumBrowserActivity.loadThemeResource(themeResources, + themePackage, "np_market", mShopButton, + THEME_ITEM_FOREGROUND); + ArtistAlbumBrowserActivity + .loadThemeResource(themeResources, themePackage, "np_ring", + mRingButton, THEME_ITEM_FOREGROUND); + ArtistAlbumBrowserActivity.loadThemeResource(themeResources, + themePackage, "np_share", mShareButton, + THEME_ITEM_FOREGROUND); + ArtistAlbumBrowserActivity.loadThemeResource(themeResources, + themePackage, "np_eq", mEQ, THEME_ITEM_FOREGROUND); + ArtistAlbumBrowserActivity.loadThemeResource(themeResources, + themePackage, "np_delete", mDeleteButton, + THEME_ITEM_FOREGROUND); + ArtistAlbumBrowserActivity + .loadThemeResource(themeResources, themePackage, "np_prev", + mNextButton, THEME_ITEM_FOREGROUND); + ArtistAlbumBrowserActivity + .loadThemeResource(themeResources, themePackage, "np_next", + mPrevButton, THEME_ITEM_FOREGROUND); + int seeker = themeResources.getIdentifier("progress_horizontal", + "drawable", themePackage); + if (seeker != 0) { + seekBar.setProgressDrawable(themeResources.getDrawable(seeker)); + } + + } } int mInitialX = -1; @@ -1253,6 +1352,7 @@ public class MediaPlaybackActivity extends Activity implements MusicUtils.Defs, try { int shuffle = mService.getShuffleMode(); if (shuffle == MediaPlaybackService.SHUFFLE_NONE) { + ; mService.setShuffleMode(MediaPlaybackService.SHUFFLE_NORMAL); if (mService.getRepeatMode() == MediaPlaybackService.REPEAT_CURRENT) { mService.setRepeatMode(MediaPlaybackService.REPEAT_ALL); @@ -1373,6 +1473,21 @@ public class MediaPlaybackActivity extends Activity implements MusicUtils.Defs, }; private void setRepeatButtonImage() { + // ADW: Load the specified theme + String themePackage = MusicUtils.getThemePackageName(this, + MusicSettingsActivity.THEME_DEFAULT); + PackageManager pm = getPackageManager(); + Resources themeResources = null; + if (!themePackage.equals(MusicSettingsActivity.THEME_DEFAULT)) { + try { + themeResources = pm.getResourcesForApplication(themePackage); + } catch (NameNotFoundException e) { + // ADW The saved theme was uninstalled so we save the + // default one + MusicUtils.setThemePackageName(this, + MusicSettingsActivity.THEME_DEFAULT); + } + } if (mService == null) return; try { @@ -1384,6 +1499,21 @@ public class MediaPlaybackActivity extends Activity implements MusicUtils.Defs, mRepeatButtonText.setText(R.string.repeat_extra_all); mRepeatButtonText.setTextColor(getResources().getColor( R.color.ics)); + if (themeResources != null) { + ArtistAlbumBrowserActivity.loadThemeResource( + themeResources, themePackage, + "np_repeat_all_extra", mRepeatButtonImage, + THEME_ITEM_FOREGROUND); + ArtistAlbumBrowserActivity.loadThemeResource( + themeResources, themePackage, "np_repeat_all", + mRepeatNormal, THEME_ITEM_FOREGROUND); + int textColorId = themeResources.getIdentifier( + "repeat_all", "color", themePackage); + if (textColorId != 0) { + mRepeatButtonText.setTextColor(themeResources + .getColor(textColorId)); + } + } break; case MediaPlaybackService.REPEAT_CURRENT: mRepeatNormal @@ -1393,6 +1523,23 @@ public class MediaPlaybackActivity extends Activity implements MusicUtils.Defs, mRepeatButtonText.setText(R.string.repeat_extra_one); mRepeatButtonText.setTextColor(getResources().getColor( R.color.android)); + if (themeResources != null) { + ArtistAlbumBrowserActivity.loadThemeResource( + themeResources, themePackage, + "np_repeat_one_extra", mRepeatButtonImage, + THEME_ITEM_FOREGROUND); + ArtistAlbumBrowserActivity.loadThemeResource( + themeResources, themePackage, "np_repeat_one", + mRepeatNormal, THEME_ITEM_FOREGROUND); + int textColorId = themeResources.getIdentifier( + "repeat_one", "color", themePackage); + if (textColorId != 0) { + mRepeatButtonText.setTextColor(themeResources + .getColor(textColorId)); + } + + } + break; default: mRepeatNormal.setImageResource(R.drawable.ic_mp_repeat_off_btn); @@ -1400,6 +1547,21 @@ public class MediaPlaybackActivity extends Activity implements MusicUtils.Defs, .setImageResource(R.drawable.ic_mp_repeat_off_btn); mRepeatButtonText.setText(R.string.repeat_extra); mRepeatButtonText.setTextColor(Color.WHITE); + if (themeResources != null) { + ArtistAlbumBrowserActivity.loadThemeResource( + themeResources, themePackage, + "np_repeat_off_extra", mRepeatButtonImage, + THEME_ITEM_FOREGROUND); + ArtistAlbumBrowserActivity.loadThemeResource( + themeResources, themePackage, "np_repeat_off", + mRepeatNormal, THEME_ITEM_FOREGROUND); + int textColorId = themeResources.getIdentifier( + "repeat_off", "color", themePackage); + if (textColorId != 0) { + mRepeatButtonText.setTextColor(themeResources + .getColor(textColorId)); + } + } break; } } catch (RemoteException ex) { @@ -1407,6 +1569,21 @@ public class MediaPlaybackActivity extends Activity implements MusicUtils.Defs, } private void setShuffleButtonImage() { + // ADW: Load the specified theme + String themePackage = MusicUtils.getThemePackageName(this, + MusicSettingsActivity.THEME_DEFAULT); + PackageManager pm = getPackageManager(); + Resources themeResources = null; + if (!themePackage.equals(MusicSettingsActivity.THEME_DEFAULT)) { + try { + themeResources = pm.getResourcesForApplication(themePackage); + } catch (NameNotFoundException e) { + // ADW The saved theme was uninstalled so we save the + // default one + MusicUtils.setThemePackageName(this, + MusicSettingsActivity.THEME_DEFAULT); + } + } if (mService == null) return; try { @@ -1418,6 +1595,21 @@ public class MediaPlaybackActivity extends Activity implements MusicUtils.Defs, .setImageResource(R.drawable.ic_mp_shuffle_off_btn); mShuffleButtonText.setTextColor(Color.WHITE); mShuffleButtonText.setText(R.string.shuffle_extra); + if (themeResources != null) { + ArtistAlbumBrowserActivity.loadThemeResource( + themeResources, themePackage, + "np_shuffle_extra_off", mShuffleButtonImage, + THEME_ITEM_FOREGROUND); + ArtistAlbumBrowserActivity.loadThemeResource( + themeResources, themePackage, "np_shuffle_off", + mShuffleNormal, THEME_ITEM_FOREGROUND); + int textColorId = themeResources.getIdentifier( + "shuffle_off", "color", themePackage); + if (textColorId != 0) { + mShuffleButtonText.setTextColor(themeResources + .getColor(textColorId)); + } + } break; case MediaPlaybackService.SHUFFLE_AUTO: mShuffleNormal @@ -1427,6 +1619,21 @@ public class MediaPlaybackActivity extends Activity implements MusicUtils.Defs, mShuffleButtonText.setTextColor(getResources().getColor( R.color.android)); mShuffleButtonText.setText(R.string.party_shuffle); + if (themeResources != null) { + ArtistAlbumBrowserActivity.loadThemeResource( + themeResources, themePackage, + "np_party_shuffle_extra", mShuffleButtonImage, + THEME_ITEM_FOREGROUND); + ArtistAlbumBrowserActivity.loadThemeResource( + themeResources, themePackage, "np_party_shuffle", + mShuffleNormal, THEME_ITEM_FOREGROUND); + int textColorId = themeResources.getIdentifier( + "party_shuffle", "color", themePackage); + if (textColorId != 0) { + mShuffleButtonText.setTextColor(themeResources + .getColor(textColorId)); + } + } break; default: mShuffleNormal @@ -1436,6 +1643,21 @@ public class MediaPlaybackActivity extends Activity implements MusicUtils.Defs, mShuffleButtonText.setTextColor(getResources().getColor( R.color.ics)); mShuffleButtonText.setText(R.string.shuffle_on_notif); + if (themeResources != null) { + ArtistAlbumBrowserActivity.loadThemeResource( + themeResources, themePackage, + "np_shuffle_extra_on", mShuffleButtonImage, + THEME_ITEM_FOREGROUND); + ArtistAlbumBrowserActivity.loadThemeResource( + themeResources, themePackage, "np_shuffle_on", + mShuffleNormal, THEME_ITEM_FOREGROUND); + int textColorId = themeResources.getIdentifier( + "shuffle_on", "color", themePackage); + if (textColorId != 0) { + mShuffleButtonText.setTextColor(themeResources + .getColor(textColorId)); + } + } break; } @@ -1446,12 +1668,33 @@ public class MediaPlaybackActivity extends Activity implements MusicUtils.Defs, } private void setPauseButtonImage() { + // ADW: Load the specified theme + String themePackage = MusicUtils.getThemePackageName(this, + MusicSettingsActivity.THEME_DEFAULT); + PackageManager pm = getPackageManager(); + Resources themeResources = null; + if (!themePackage.equals(MusicSettingsActivity.THEME_DEFAULT)) { + try { + themeResources = pm.getResourcesForApplication(themePackage); + } catch (NameNotFoundException e) { + // ADW The saved theme was uninstalled so we save the + // default one + MusicUtils.setThemePackageName(this, + MusicSettingsActivity.THEME_DEFAULT); + } + } try { if (mService != null && mService.isPlaying()) { mPauseButton.setImageResource(R.drawable.ic_media_pause); + ArtistAlbumBrowserActivity.loadThemeResource(themeResources, + themePackage, "np_pause", mPauseButton, + THEME_ITEM_FOREGROUND); } else { mPauseButton .setImageResource(R.drawable.ic_appwidget_music_play); + ArtistAlbumBrowserActivity.loadThemeResource(themeResources, + themePackage, "np_play", mPauseButton, + THEME_ITEM_FOREGROUND); } } catch (RemoteException ex) { } @@ -1485,6 +1728,21 @@ public class MediaPlaybackActivity extends Activity implements MusicUtils.Defs, } private long refreshNow() { + // ADW: Load the specified theme + String themePackage = MusicUtils.getThemePackageName(this, + MusicSettingsActivity.THEME_DEFAULT); + PackageManager pm = getPackageManager(); + Resources themeResources = null; + if (!themePackage.equals(MusicSettingsActivity.THEME_DEFAULT)) { + try { + themeResources = pm.getResourcesForApplication(themePackage); + } catch (NameNotFoundException e) { + // ADW The saved theme was uninstalled so we save the + // default one + MusicUtils.setThemePackageName(this, + MusicSettingsActivity.THEME_DEFAULT); + } + } if (mService == null) return 500; try { @@ -1496,6 +1754,21 @@ public class MediaPlaybackActivity extends Activity implements MusicUtils.Defs, if (mService.isPlaying()) { mCurrentTime.setTextColor(Color.WHITE); + if (themeResources != null) { + int textColorId = themeResources.getIdentifier( + "current_time_color", "color", themePackage); + if (textColorId != 0) { + mCurrentTime.setTextColor(themeResources + .getColor(textColorId)); + } + int totalColor = themeResources.getIdentifier( + "remaining_time_color", "color", themePackage); + if (totalColor != 0) { + mTotalTime.setTextColor(themeResources + .getColor(totalColor)); + } + } + } else { // blink the counter @@ -1503,6 +1776,22 @@ public class MediaPlaybackActivity extends Activity implements MusicUtils.Defs, mCurrentTime .setTextColor(col == Color.WHITE ? getResources() .getColor(R.color.ics) : Color.WHITE); + if (themeResources != null) { + int textColorId = themeResources.getIdentifier( + "current_time_color_paused", "color", + themePackage); + if (textColorId != 0) { + mCurrentTime.setTextColor(themeResources + .getColor(textColorId)); + } + int totalColor = themeResources.getIdentifier( + "remaining_time_color_paused", "color", + themePackage); + if (totalColor != 0) { + mTotalTime.setTextColor(themeResources + .getColor(totalColor)); + } + } remaining = 500; } @@ -1639,6 +1928,21 @@ public class MediaPlaybackActivity extends Activity implements MusicUtils.Defs, } private void updateTrackInfo() { + // ADW: Load the specified theme + String themePackage = MusicUtils.getThemePackageName(this, + MusicSettingsActivity.THEME_DEFAULT); + PackageManager pm = getPackageManager(); + Resources themeResources = null; + if (!themePackage.equals(MusicSettingsActivity.THEME_DEFAULT)) { + try { + themeResources = pm.getResourcesForApplication(themePackage); + } catch (NameNotFoundException e) { + // ADW The saved theme was uninstalled so we save the + // default one + MusicUtils.setThemePackageName(this, + MusicSettingsActivity.THEME_DEFAULT); + } + } if (mService == null) { return; } @@ -1683,6 +1987,50 @@ public class MediaPlaybackActivity extends Activity implements MusicUtils.Defs, mAlbumArtHandler.removeMessages(GET_ALBUM_ART); mAlbumArtHandler.obtainMessage(GET_ALBUM_ART, new AlbumSongIdWrapper(albumid, songid)).sendToTarget(); + + if (getResources().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE) { + if (themeResources != null) { + int trackColor = themeResources.getIdentifier( + "track_color_land", "color", themePackage); + if (trackColor != 0) { + mTrackName.setTextColor(themeResources + .getColor(trackColor)); + } + int artistColor = themeResources.getIdentifier( + "artist_color_land", "color", themePackage); + if (artistColor != 0) { + mArtistName.setTextColor(themeResources + .getColor(artistColor)); + } + int albumColor = themeResources.getIdentifier( + "album_color_land", "color", themePackage); + if (albumColor != 0) { + mAlbumName.setTextColor(themeResources + .getColor(albumColor)); + } + } + } else { + if (themeResources != null) { + int trackColor = themeResources.getIdentifier( + "track_name_color", "color", themePackage); + if (trackColor != 0) { + mTrackName.setTextColor(themeResources + .getColor(trackColor)); + } + int artistColor = themeResources.getIdentifier( + "artist_name_color", "color", themePackage); + if (artistColor != 0) { + mArtistName.setTextColor(themeResources + .getColor(artistColor)); + } + int albumColor = themeResources.getIdentifier( + "album_name_color", "color", themePackage); + if (albumColor != 0) { + mAlbumName.setTextColor(themeResources + .getColor(albumColor)); + } + } + } } mDuration = mService.duration(); mTotalTime.setText(MusicUtils diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/src/com/android/music/MediaPlaybackService.java b/CyanogenMod-android_packages_apps_Music-41e85d6/src/com/android/music/MediaPlaybackService.java index f2d3dcf..fa2047a 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/src/com/android/music/MediaPlaybackService.java +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/src/com/android/music/MediaPlaybackService.java @@ -208,14 +208,15 @@ public class MediaPlaybackService extends Service implements .getInstance(); // interval after which we stop the service when idle - private static final int IDLE_DELAY = 60000; + private static final int IDLE_DELAY = 6000; + + // used to track current volume + private float mCurrentVolume = 1.0f; private RemoteControlClient mRemoteControlClient; private Timer timer = new Timer(); private Handler mMediaplayerHandler = new Handler() { - float mCurrentVolume = 1.0f; - @Override public void handleMessage(Message msg) { MusicUtils @@ -1023,6 +1024,10 @@ public class MediaPlaybackService extends Service implements i.putExtra("dur", duration()); i.putExtra("albumLong", getAlbumId()); i.putExtra("trackLong", getAudioId()); + if (mPlayList != null) + i.putExtra("ListSize", Long.valueOf(mPlayList.length)); + else + i.putExtra("ListSize", Long.valueOf(mPlayListLen)); sendStickyBroadcast(i); if (what.equals(PLAYSTATE_CHANGED)) { mRemoteControlClient @@ -1438,6 +1443,7 @@ public class MediaPlaybackService extends Service implements MusicSettingsActivity.KEY_ENABLE_STATUS_PREV_BUTTON, false); mPreferences.getBoolean( MusicSettingsActivity.KEY_ENABLE_STATUS_PLAY_BUTTON, false); + mPreferences.getBoolean(MusicSettingsActivity.KEY_TICK, false); if (preferences.getBoolean( MusicSettingsActivity.KEY_ENABLE_STATUS_PREV_BUTTON, false)) { @@ -1568,6 +1574,9 @@ public class MediaPlaybackService extends Service implements status.contentView = views; status.flags |= Notification.FLAG_ONGOING_EVENT; status.icon = R.drawable.stat_notify_musicplayer; + if (preferences.getBoolean(MusicSettingsActivity.KEY_TICK, true)) { + status.tickerText = getTrackName() + " by " + getArtistName(); + } status.contentIntent = PendingIntent.getActivity(this, 0, new Intent("com.android.music.PLAYBACK_VIEWER") .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK), 0); @@ -2435,6 +2444,7 @@ public class MediaPlaybackService extends Service implements public void setVolume(float vol) { mMediaPlayer.setVolume(vol, vol); + mCurrentVolume = vol; } public void setAudioSessionId(int sessionId) { diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/src/com/android/music/MusicSettingsActivity.java b/CyanogenMod-android_packages_apps_Music-41e85d6/src/com/android/music/MusicSettingsActivity.java index 36ccd83..4371578 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/src/com/android/music/MusicSettingsActivity.java +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/src/com/android/music/MusicSettingsActivity.java @@ -35,6 +35,7 @@ import android.content.pm.PackageInfo; import android.content.pm.PackageManager;
import android.content.pm.PackageManager.NameNotFoundException;
import android.content.pm.ResolveInfo;
+import android.content.res.Resources;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.media.audiofx.AudioEffect;
@@ -83,6 +84,7 @@ public class MusicSettingsActivity extends PreferenceActivity implements static final String KEY_ENABLE_STATUS_PLAY_BUTTON = "cbStatusPlay";
static final String KEY_ENABLE_SHARE_BUTTON = "cbShare";
static final String KEY_ENABLE_PROGRESS_BAR = "cbProgress";
+ static final String KEY_ENABLE_OVER_FLOW = "cbFlow";
static final String KEY_ENABLE_STATUS_NEXT_BUTTON = "cbStatusNext";
static final String KEY_ENABLE_STATUS_PREV_BUTTON = "cbStatusPrev";
@@ -130,6 +132,7 @@ public class MusicSettingsActivity extends PreferenceActivity implements public static final String KEY_SOUND_EFFECT = "eqEffects";
public static final String KEY_FEEDBACK = "feedback";
public static final String KEY_FLIP = "cbFlip";
+ public static final String KEY_TICK = "cbStatusTicker";
long[] mHits = new long[3];
private static final String LOG_TAG = "EasterEgg";
@@ -145,9 +148,12 @@ public class MusicSettingsActivity extends PreferenceActivity implements static final String BG_PHOTO_FILE = "home_art";
static final String TEMP_PHOTO_FILE = "home";
+ public AlertDialog themeAlert;
+
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
+
PreferenceManager preferenceManager = getPreferenceManager();
preferenceManager.setSharedPreferencesName(PREFERENCES_FILE);
addPreferencesFromResource(R.xml.settings);
@@ -185,6 +191,35 @@ public class MusicSettingsActivity extends PreferenceActivity implements });
final AlertDialog alert = builder.create();
+ AlertDialog.Builder lock = new AlertDialog.Builder(this);
+ lock.setTitle("Requires Restart");
+ lock.setIcon(R.drawable.ic_dialog_alert_holo_dark);
+ lock.setMessage(
+ "Music needs to stop completely and restart to let the changes take effect")
+ .setCancelable(false)
+ .setPositiveButton("Okay",
+ new DialogInterface.OnClickListener() {
+ public void onClick(DialogInterface dialog, int id) {
+ // This isn't a good practice, but we need to
+ // restart the
+ // service completely to see the change
+ // immediately
+ System.exit(0);
+ }
+ })
+ .setNegativeButton("Cancel",
+ new DialogInterface.OnClickListener() {
+ public void onClick(DialogInterface dialog, int id) {
+ dialog.cancel();
+ if (lk.isChecked()) {
+ lk.setChecked(false);
+ } else {
+ lk.setChecked(true);
+ }
+ }
+ });
+ final AlertDialog lockAlert = lock.create();
+
cp.setOnPreferenceClickListener(new OnPreferenceClickListener() {
public boolean onPreferenceClick(final Preference preference) {
CheckBoxPreference cbp = (CheckBoxPreference) preference;
@@ -201,10 +236,7 @@ public class MusicSettingsActivity extends PreferenceActivity implements lk.setOnPreferenceClickListener(new OnPreferenceClickListener() {
public boolean onPreferenceClick(final Preference preference) {
- // This isn't a good practice, but we need to restart the
- // service completely to see the change immediately
- System.exit(0);
-
+ lockAlert.show();
return true;
}
});
@@ -219,8 +251,7 @@ public class MusicSettingsActivity extends PreferenceActivity implements }
// ADW: theme settings
SharedPreferences sp = getPreferenceManager().getSharedPreferences();
- final String themePackage = sp.getString(THEME_KEY,
- MusicSettingsActivity.THEME_DEFAULT);
+ final String themePackage = sp.getString(THEME_KEY, THEME_DEFAULT);
ListPreference themeLp = (ListPreference) findPreference(THEME_KEY);
themeLp.setOnPreferenceChangeListener(new OnPreferenceChangeListener() {
public boolean onPreferenceChange(Preference preference,
@@ -343,17 +374,46 @@ public class MusicSettingsActivity extends PreferenceActivity implements String packageName = themePreview.getValue().toString();
// this time we really save the themepackagename
SharedPreferences sp = getPreferenceManager().getSharedPreferences();
- SharedPreferences.Editor editor = sp.edit();
+ final SharedPreferences.Editor editor = sp.edit();
editor.putString("themePackageName", packageName);
// and update the preferences from the theme
// TODO:ADW maybe this should be optional for the user
if (!packageName.equals(MusicSettingsActivity.THEME_DEFAULT)) {
- // Add stuff
+ Resources themeResources = null;
+ try {
+ themeResources = getPackageManager()
+ .getResourcesForApplication(packageName.toString());
+ } catch (NameNotFoundException e) {
+ // e.printStackTrace();
+ }
} else {
- // Add stuff
+
}
- editor.commit();
- finish();
+ AlertDialog.Builder theme = new AlertDialog.Builder(this);
+ theme.setTitle("Requires Restart");
+ theme.setIcon(R.drawable.ic_dialog_alert_holo_dark);
+ theme.setMessage(
+ "Music needs to stop completely and restart to let the changes take effect")
+ .setCancelable(false)
+ .setPositiveButton("Okay",
+ new DialogInterface.OnClickListener() {
+ public void onClick(DialogInterface dialog, int id) {
+ editor.commit();
+ // This isn't a good practice, but we need to
+ // restart the
+ // service completely to see the change
+ // immediately
+ System.exit(0);
+ }
+ })
+ .setNegativeButton("Cancel",
+ new DialogInterface.OnClickListener() {
+ public void onClick(DialogInterface dialog, int id) {
+ dialog.cancel();
+ }
+ });
+ themeAlert = theme.create();
+ themeAlert.show();
}
public void getThemes(View v) {
diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/src/com/android/music/MusicUtils.java b/CyanogenMod-android_packages_apps_Music-41e85d6/src/com/android/music/MusicUtils.java index 1b0631c..2e4e8d7 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/src/com/android/music/MusicUtils.java +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/src/com/android/music/MusicUtils.java @@ -38,6 +38,8 @@ import android.content.Intent; import android.content.ServiceConnection; import android.content.SharedPreferences; import android.content.SharedPreferences.Editor; +import android.content.pm.PackageManager; +import android.content.pm.PackageManager.NameNotFoundException; import android.content.res.Resources; import android.database.Cursor; import android.graphics.Bitmap; @@ -940,14 +942,19 @@ public class MusicUtils { sService.play(); } catch (RemoteException ex) { } finally { - if (mPreferences.getBoolean( - MusicSettingsActivity.KEY_ENTER_FULL_NOW_PLAYING, true)) { - Intent intent = new Intent("com.android.music.PLAYBACK_VIEWER") - .setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP); - context.startActivity(intent); - } else { - // Sketch + Intent intent = new Intent("com.android.music.PLAYBACK_VIEWER") + .setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP); + try { + if (mPreferences + .getBoolean( + MusicSettingsActivity.KEY_ENTER_FULL_NOW_PLAYING, + false)) { + context.startActivity(intent); + } + } catch (NullPointerException e) { + } + } } @@ -1295,6 +1302,21 @@ public class MusicUtils { return null; } + public static String getThemePackageName(Context context, + String default_theme) { + SharedPreferences sp = context.getSharedPreferences( + MusicSettingsActivity.PREFERENCES_FILE, Context.MODE_PRIVATE); + return sp.getString("themePackageName", default_theme); + } + + public static void setThemePackageName(Context context, String packageName) { + SharedPreferences sp = context.getSharedPreferences( + MusicSettingsActivity.PREFERENCES_FILE, Context.MODE_PRIVATE); + SharedPreferences.Editor editor = sp.edit(); + editor.putString("themePackageName", packageName); + editor.commit(); + } + static int getIntPref(Context context, String name, int def) { SharedPreferences prefs = context.getSharedPreferences( context.getPackageName(), Context.MODE_PRIVATE); @@ -1380,6 +1402,7 @@ public class MusicUtils { public static boolean mMediaShare; public static boolean mAlbumText; public static boolean mInfoDivider; + public static boolean mOverFlow; static boolean updateButtonBar(final Activity a, int highlight) { final TabWidget ll = (TabWidget) a.findViewById(R.id.buttonbar); @@ -1483,6 +1506,21 @@ public class MusicUtils { if (nowPlayingView == null) { return; } + // ADW: Load the specified theme + String themePackage = MusicUtils.getThemePackageName(a, + MusicSettingsActivity.THEME_DEFAULT); + PackageManager pm = a.getPackageManager(); + Resources themeResources = null; + if (!themePackage.equals(MusicSettingsActivity.THEME_DEFAULT)) { + try { + themeResources = pm.getResourcesForApplication(themePackage); + } catch (NameNotFoundException e) { + // ADW The saved theme was uninstalled so we save the + // default one + MusicUtils.setThemePackageName(a, + MusicSettingsActivity.THEME_DEFAULT); + } + } try { Intent intent = a.getIntent(); if (intent != null) { @@ -1494,6 +1532,7 @@ public class MusicUtils { .findViewById(R.id.progress); ImageView mDivider = (ImageView) a .findViewById(R.id.info_divider); + ImageButton mFlow = (ImageButton) a.findViewById(R.id.overFlow); ImageButton mMarket = (ImageButton) a .findViewById(R.id.market_music); ImageButton mPlay = (ImageButton) a @@ -1528,12 +1567,43 @@ public class MusicUtils { } artist.setText(artistName.toUpperCase()); + if (themeResources != null) { + int titleColor = themeResources.getIdentifier( + "snp_track_name_color", "color", themePackage); + if (titleColor != 0) { + title.setTextColor(themeResources.getColor(titleColor)); + } + int artistColor = themeResources.getIdentifier( + "snp_artist_name_color", "color", themePackage); + if (artistColor != 0) { + artist.setTextColor(themeResources + .getColor(artistColor)); + } + int albumColor = themeResources.getIdentifier( + "snp_album_name_color", "color", themePackage); + if (albumColor != 0) { + albumname.setTextColor(themeResources + .getColor(albumColor)); + int seeker = themeResources.getIdentifier( + "snp_progress_horizontal", "drawable", + themePackage); + if (seeker != 0) { + mProgress.setProgressDrawable(themeResources + .getDrawable(seeker)); + } + } + } + // I have these set in updateNowPlaying() so everything will // take effect without having to restart the app. The actions // are set individually in each tab activity, however. That // should be cleaned up and unified. mPreferences = a.getSharedPreferences( MusicSettingsActivity.PREFERENCES_FILE, a.MODE_PRIVATE); + mMarketSearch = mPreferences + .getBoolean( + MusicSettingsActivity.KEY_ENTER_FULL_NOW_PLAYING, + false); mMarketSearch = mPreferences.getBoolean( MusicSettingsActivity.KEY_ENABLE_MARKET_SERACH, false); mMediaPlay = mPreferences.getBoolean( @@ -1548,8 +1618,16 @@ public class MusicUtils { MusicSettingsActivity.KEY_ENABLE_ALBUM_TEXT, false); mInfoDivider = mPreferences.getBoolean( MusicSettingsActivity.KEY_ENABLE_PROGRESS_BAR, false); + mOverFlow = mPreferences.getBoolean( + MusicSettingsActivity.KEY_ENABLE_PROGRESS_BAR, false); + if (mPreferences.getBoolean( + MusicSettingsActivity.KEY_ENABLE_OVER_FLOW, false)) { + mFlow.setVisibility(View.VISIBLE); + } else { + mFlow.setVisibility(View.GONE); + } if (mPreferences.getBoolean( - MusicSettingsActivity.KEY_ENABLE_PROGRESS_BAR, true)) { + MusicSettingsActivity.KEY_ENABLE_PROGRESS_BAR, false)) { mProgress.setVisibility(View.VISIBLE); mDivider.setVisibility(View.GONE); } else { diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/src/com/android/music/PlaylistBrowserActivity.java b/CyanogenMod-android_packages_apps_Music-41e85d6/src/com/android/music/PlaylistBrowserActivity.java index f0c2bd3..40c658c 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/src/com/android/music/PlaylistBrowserActivity.java +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/src/com/android/music/PlaylistBrowserActivity.java @@ -30,7 +30,10 @@ import android.content.Intent; import android.content.IntentFilter; import android.content.ServiceConnection; import android.content.SharedPreferences; +import android.content.pm.PackageManager; +import android.content.pm.PackageManager.NameNotFoundException; import android.content.res.Configuration; +import android.content.res.Resources; import android.database.Cursor; import android.database.MatrixCursor; import android.database.MergeCursor; @@ -61,9 +64,12 @@ import android.widget.AdapterView.AdapterContextMenuInfo; import android.widget.FrameLayout; import android.widget.ImageButton; import android.widget.ImageView; +import android.widget.LinearLayout; import android.widget.ListView; import android.widget.ProgressBar; +import android.widget.RelativeLayout; import android.widget.SimpleCursorAdapter; +import android.widget.TabWidget; import android.widget.TextView; import android.widget.Toast; @@ -89,7 +95,20 @@ public class PlaylistBrowserActivity extends ListActivity implements private ServiceToken mOSC; private IMediaPlaybackService mService = null; private SharedPreferences mPreferences; + // Artist tab layout + public LinearLayout mPlaylistTab; + public TabWidget mButtonBar; + public TextView mButtonBarArtist; + public TextView mButtonBarAlbum; + public TextView mButtonBarSong; + public TextView mButtonBarPlaylist; + public TextView mButtonBarNP; + public RelativeLayout mGroup; + public RelativeLayout mChild; // Smaller now playing window buttons + private LinearLayout mNowPlaying; + private ImageView mInfoDivider; + private ProgressBar mProgress; private ImageButton mDoSearch; private ImageButton mMarket; private ImageButton mNext; @@ -97,6 +116,7 @@ public class PlaylistBrowserActivity extends ListActivity implements private ImageButton mPlusPlaylist; private ImageButton mPrev; private ImageButton mShare; + private ImageButton mFlow; // Shake actions public Shaker Playlistshaker; private String artist_shake_actions_db; @@ -111,6 +131,10 @@ public class PlaylistBrowserActivity extends ListActivity implements private String np_swipe_gesture_db; // Swipe tabs private GestureDetector swipetabs; + // ADW Theme constants + public static final int THEME_ITEM_BACKGROUND = 0; + public static final int THEME_ITEM_FOREGROUND = 1; + public static final int THEME_ITEM_TEXT_DRAWABLE = 2; public PlaylistBrowserActivity() { } @@ -135,6 +159,7 @@ public class PlaylistBrowserActivity extends ListActivity implements requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS); requestWindowFeature(Window.FEATURE_NO_TITLE); setVolumeControlStream(AudioManager.STREAM_MUSIC); + mOSC = MusicUtils.bindToService(this, osc); mToken = MusicUtils.bindToService(this, new ServiceConnection() { public void onServiceConnected(ComponentName classname, IBinder obj) { if (Intent.ACTION_VIEW.equals(action)) { @@ -243,6 +268,7 @@ public class PlaylistBrowserActivity extends ListActivity implements mMarket = (ImageButton) findViewById(R.id.market_music); mDoSearch = (ImageButton) findViewById(R.id.doSearch); mPlusPlaylist = (ImageButton) findViewById(R.id.plus_playlist); + mFlow = (ImageButton) findViewById(R.id.overFlow); // I found that without setting the onClickListeners in Portrait mode // only, flipping into Landscape force closes. if (getResources().getConfiguration().orientation == Configuration.ORIENTATION_PORTRAIT) { @@ -254,6 +280,7 @@ public class PlaylistBrowserActivity extends ListActivity implements mNext.setOnClickListener(mMediaNext); mPrev.setOnClickListener(mMediaPrev); mShare.setOnClickListener(mShareSong); + mFlow.setOnClickListener(mOverFlow); // I only want this to show in the Playlist activity if (mPreferences.getBoolean( MusicSettingsActivity.KEY_ENABLE_NEW_PLAYLIST_BUTTON, true)) { @@ -270,6 +297,102 @@ public class PlaylistBrowserActivity extends ListActivity implements } }); } + // ADW: Load the specified theme + String themePackage = MusicUtils.getThemePackageName(this, + MusicSettingsActivity.THEME_DEFAULT); + PackageManager pm = getPackageManager(); + Resources themeResources = null; + if (!themePackage.equals(MusicSettingsActivity.THEME_DEFAULT)) { + try { + themeResources = pm.getResourcesForApplication(themePackage); + } catch (NameNotFoundException e) { + // ADW The saved theme was uninstalled so we save the + // default one + MusicUtils.setThemePackageName(this, + MusicSettingsActivity.THEME_DEFAULT); + } + } + // Set Views for themes + if (themeResources != null) { + // Artist tab + mPlaylistTab = (LinearLayout) findViewById(R.id.album_tab); + mButtonBar = (TabWidget) findViewById(R.id.buttonbar); + mButtonBarArtist = (TextView) findViewById(R.id.artisttab); + mButtonBarAlbum = (TextView) findViewById(R.id.albumtab); + mButtonBarSong = (TextView) findViewById(R.id.songtab); + mButtonBarPlaylist = (TextView) findViewById(R.id.playlisttab); + mButtonBarNP = (TextView) findViewById(R.id.nowplayingtab); + mGroup = (RelativeLayout) findViewById(R.id.group_item); + mChild = (RelativeLayout) findViewById(R.id.child_item); + ArtistAlbumBrowserActivity.loadThemeResource(themeResources, + themePackage, "tab_playlist", mPlaylistTab, + THEME_ITEM_BACKGROUND); + ArtistAlbumBrowserActivity.loadThemeResource(themeResources, + themePackage, "group_bg", mGroup, THEME_ITEM_BACKGROUND); + ArtistAlbumBrowserActivity.loadThemeResource(themeResources, + themePackage, "child_bg", mChild, THEME_ITEM_BACKGROUND); + ArtistAlbumBrowserActivity.loadThemeResource(themeResources, + themePackage, "buttonbar", mButtonBar, + THEME_ITEM_BACKGROUND); + ArtistAlbumBrowserActivity.loadThemeResource(themeResources, + themePackage, "tab_bg_artist", mButtonBarArtist, + THEME_ITEM_BACKGROUND); + ArtistAlbumBrowserActivity.loadThemeResource(themeResources, + themePackage, "tab_bg_album", mButtonBarAlbum, + THEME_ITEM_BACKGROUND); + ArtistAlbumBrowserActivity.loadThemeResource(themeResources, + themePackage, "tab_bg_song", mButtonBarSong, + THEME_ITEM_BACKGROUND); + ArtistAlbumBrowserActivity.loadThemeResource(themeResources, + themePackage, "tab_bg_playlist", mButtonBarPlaylist, + THEME_ITEM_BACKGROUND); + ArtistAlbumBrowserActivity.loadThemeResource(themeResources, + themePackage, "tab_bg_nowplaying", mButtonBarNP, + THEME_ITEM_BACKGROUND); + // Small now playing window + mNowPlaying = (LinearLayout) findViewById(R.id.nowplaying); + mInfoDivider = (ImageView) findViewById(R.id.info_divider); + mProgress = (ProgressBar) findViewById(R.id.progress); + mShare = (ImageButton) findViewById(R.id.share_song); + mPlay = (ImageButton) findViewById(R.id.media_play); + mNext = (ImageButton) findViewById(R.id.media_next); + mPrev = (ImageButton) findViewById(R.id.media_prev); + mMarket = (ImageButton) findViewById(R.id.market_music); + mDoSearch = (ImageButton) findViewById(R.id.doSearch); + mFlow = (ImageButton) findViewById(R.id.overFlow); + mPlusPlaylist = (ImageButton) findViewById(R.id.plus_playlist); + if (getResources().getConfiguration().orientation == Configuration.ORIENTATION_PORTRAIT) { + ArtistAlbumBrowserActivity.loadThemeResource(themeResources, + themePackage, "snp_background", mNowPlaying, + THEME_ITEM_BACKGROUND); + ArtistAlbumBrowserActivity.loadThemeResource(themeResources, + themePackage, "snp_progress", mProgress, + THEME_ITEM_BACKGROUND); + ArtistAlbumBrowserActivity.loadThemeResource(themeResources, + themePackage, "snp_info_divider", mInfoDivider, + THEME_ITEM_BACKGROUND); + ArtistAlbumBrowserActivity.loadThemeResource(themeResources, + themePackage, "snp_share", mShare, + THEME_ITEM_FOREGROUND); + ArtistAlbumBrowserActivity.loadThemeResource(themeResources, + themePackage, "snp_play", mPlay, THEME_ITEM_FOREGROUND); + ArtistAlbumBrowserActivity.loadThemeResource(themeResources, + themePackage, "snp_next", mNext, THEME_ITEM_FOREGROUND); + ArtistAlbumBrowserActivity.loadThemeResource(themeResources, + themePackage, "snp_prev", mPrev, THEME_ITEM_FOREGROUND); + ArtistAlbumBrowserActivity.loadThemeResource(themeResources, + themePackage, "snp_market", mMarket, + THEME_ITEM_FOREGROUND); + ArtistAlbumBrowserActivity.loadThemeResource(themeResources, + themePackage, "snp_search", mDoSearch, + THEME_ITEM_FOREGROUND); + ArtistAlbumBrowserActivity.loadThemeResource(themeResources, + themePackage, "snp_flow", mFlow, THEME_ITEM_FOREGROUND); + ArtistAlbumBrowserActivity.loadThemeResource(themeResources, + themePackage, "snp_plus_playlist", mPlusPlaylist, + THEME_ITEM_FOREGROUND); + } + } } // Tab Swipe @@ -431,7 +554,11 @@ public class PlaylistBrowserActivity extends ListActivity implements ; } }; - + private View.OnClickListener mOverFlow = new View.OnClickListener() { + public void onClick(View v) { + openOptionsMenu(); + } + }; private View.OnClickListener mDoSearchListener = new View.OnClickListener() { public void onClick(View v) { onSearchRequested(); @@ -553,14 +680,6 @@ public class PlaylistBrowserActivity extends ListActivity implements }; @Override - public void onStart() { - super.onStart(); - // This is needed to allow the media buttons on the small now playing - // window to be controlled. - mOSC = MusicUtils.bindToService(this, osc); - } - - @Override public void onResume() { super.onResume(); @@ -1001,6 +1120,23 @@ public class PlaylistBrowserActivity extends ListActivity implements @Override public void bindView(View view, Context context, Cursor cursor) { + // ADW: Load the specified theme + String themePackage = MusicUtils.getThemePackageName(context, + MusicSettingsActivity.THEME_DEFAULT); + PackageManager pm = context.getPackageManager(); + Resources themeResources = null; + if (!themePackage.equals(MusicSettingsActivity.THEME_DEFAULT)) { + try { + themeResources = pm + .getResourcesForApplication(themePackage); + } catch (NameNotFoundException e) { + // ADW The saved theme was uninstalled so we save the + // default one + MusicUtils.setThemePackageName(context, + MusicSettingsActivity.THEME_DEFAULT); + } + } + TextView tv = (TextView) view.findViewById(R.id.line1); String name = cursor.getString(mTitleIdx); @@ -1011,8 +1147,19 @@ public class PlaylistBrowserActivity extends ListActivity implements ImageView iv = (ImageView) view.findViewById(R.id.icon); if (id == RECENTLY_ADDED_PLAYLIST) { iv.setImageResource(R.drawable.ic_mp_playlist_recently_added_list); + if (themeResources != null) { + ArtistAlbumBrowserActivity.loadThemeResource( + themeResources, themePackage, + "playlist_recently_added", iv, + THEME_ITEM_FOREGROUND); + } } else { iv.setImageResource(R.drawable.ic_mp_playlist_list); + if (themeResources != null) { + ArtistAlbumBrowserActivity.loadThemeResource( + themeResources, themePackage, "playlist_list", iv, + THEME_ITEM_FOREGROUND); + } } ViewGroup.LayoutParams p = iv.getLayoutParams(); p.width = ViewGroup.LayoutParams.WRAP_CONTENT; @@ -1027,6 +1174,15 @@ public class PlaylistBrowserActivity extends ListActivity implements .findViewById(R.id.second_column_icon); iv.setVisibility(View.GONE); mContextMenu.setOnClickListener(mCML); + if (themeResources != null) { + + int line1 = themeResources.getIdentifier( + "playlist_tab_playlist_name_color", "color", + themePackage); + if (line1 != 0) { + tv.setTextColor(themeResources.getColor(line1)); + } + } } @Override @@ -1077,11 +1233,30 @@ public class PlaylistBrowserActivity extends ListActivity implements } private void setPauseButtonImage() { + // ADW: Load the specified theme + String themePackage = MusicUtils.getThemePackageName(this, + MusicSettingsActivity.THEME_DEFAULT); + PackageManager pm = getPackageManager(); + Resources themeResources = null; + if (!themePackage.equals(MusicSettingsActivity.THEME_DEFAULT)) { + try { + themeResources = pm.getResourcesForApplication(themePackage); + } catch (NameNotFoundException e) { + // ADW The saved theme was uninstalled so we save the + // default one + MusicUtils.setThemePackageName(this, + MusicSettingsActivity.THEME_DEFAULT); + } + } try { if (mService != null && mService.isPlaying()) { mPlay.setImageResource(R.drawable.ic_media_pause); + ArtistAlbumBrowserActivity.loadThemeResource(themeResources, + themePackage, "np_pause", mPlay, THEME_ITEM_FOREGROUND); } else { mPlay.setImageResource(R.drawable.ic_appwidget_music_play); + ArtistAlbumBrowserActivity.loadThemeResource(themeResources, + themePackage, "np_play", mPlay, THEME_ITEM_FOREGROUND); } } catch (RemoteException ex) { } diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/src/com/android/music/PreviewPreference.java b/CyanogenMod-android_packages_apps_Music-41e85d6/src/com/android/music/PreviewPreference.java index 03a8c20..6ede95d 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/src/com/android/music/PreviewPreference.java +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/src/com/android/music/PreviewPreference.java @@ -12,7 +12,6 @@ import android.view.View; import android.widget.Button; import android.widget.ImageView; import android.widget.TextView; -import com.android.music.R; public class PreviewPreference extends Preference { private CharSequence themeName; diff --git a/CyanogenMod-android_packages_apps_Music-41e85d6/src/com/android/music/TrackBrowserActivity.java b/CyanogenMod-android_packages_apps_Music-41e85d6/src/com/android/music/TrackBrowserActivity.java index 6d6160a..a3f20ac 100644 --- a/CyanogenMod-android_packages_apps_Music-41e85d6/src/com/android/music/TrackBrowserActivity.java +++ b/CyanogenMod-android_packages_apps_Music-41e85d6/src/com/android/music/TrackBrowserActivity.java @@ -32,7 +32,10 @@ import android.content.Intent; import android.content.IntentFilter; import android.content.ServiceConnection; import android.content.SharedPreferences; +import android.content.pm.PackageManager; +import android.content.pm.PackageManager.NameNotFoundException; import android.content.res.Configuration; +import android.content.res.Resources; import android.database.AbstractCursor; import android.database.CharArrayBuffer; import android.database.Cursor; @@ -71,8 +74,10 @@ import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.ListView; import android.widget.ProgressBar; +import android.widget.RelativeLayout; import android.widget.SectionIndexer; import android.widget.SimpleCursorAdapter; +import android.widget.TabWidget; import android.widget.TextView; import com.android.music.MusicUtils.ServiceToken; @@ -115,7 +120,20 @@ public class TrackBrowserActivity extends ListActivity implements private ServiceToken mOSC; private IMediaPlaybackService mService = null; private SharedPreferences mPreferences; + // Artist tab layout + public LinearLayout mSongTab; + public TabWidget mButtonBar; + public TextView mButtonBarArtist; + public TextView mButtonBarAlbum; + public TextView mButtonBarSong; + public TextView mButtonBarPlaylist; + public TextView mButtonBarNP; + public RelativeLayout mGroup; + public RelativeLayout mChild; // Smaller now playing window buttons + private LinearLayout mNowPlaying; + private ImageView mInfoDivider; + private ProgressBar mProgress; private ImageButton mDoSearch; private ImageButton mMarket; private ImageButton mNext; @@ -123,6 +141,7 @@ public class TrackBrowserActivity extends ListActivity implements private ImageButton mPlusPlaylist; private ImageButton mPrev; private ImageButton mShare; + private ImageButton mFlow; // Shake actions public Shaker Trackshaker; private String artist_shake_actions_db; @@ -137,6 +156,10 @@ public class TrackBrowserActivity extends ListActivity implements private String np_swipe_gesture_db; // Swipe tabs private GestureDetector swipetabs; + // ADW Theme constants + public static final int THEME_ITEM_BACKGROUND = 0; + public static final int THEME_ITEM_FOREGROUND = 1; + public static final int THEME_ITEM_TEXT_DRAWABLE = 2; public TrackBrowserActivity() { } @@ -203,6 +226,8 @@ public class TrackBrowserActivity extends ListActivity implements setContentView(R.layout.media_picker_activity); mToken = MusicUtils.bindToService(this, this); + // We have to bind to osc to control the music, but we need to keep the + // previous line to load the list view. mOSC = MusicUtils.bindToService(this, osc); mUseLastListPos = MusicUtils.updateButtonBar(this, R.id.songtab); @@ -261,6 +286,7 @@ public class TrackBrowserActivity extends ListActivity implements mMarket = (ImageButton) findViewById(R.id.market_music); mDoSearch = (ImageButton) findViewById(R.id.doSearch); mPlusPlaylist = (ImageButton) findViewById(R.id.plus_playlist); + mFlow = (ImageButton) findViewById(R.id.overFlow); // I found that without setting the onClickListeners in Portrait mode // only, flipping into Landscape force closes. if (getResources().getConfiguration().orientation == Configuration.ORIENTATION_PORTRAIT) { @@ -271,6 +297,7 @@ public class TrackBrowserActivity extends ListActivity implements mNext.setOnClickListener(mMediaNext); mPrev.setOnClickListener(mMediaPrev); mShare.setOnClickListener(mShareSong); + mFlow.setOnClickListener(mOverFlow); // I only want this to show in the Playlist activity mPlusPlaylist.setVisibility(View.GONE); // Swipe gesture @@ -283,7 +310,97 @@ public class TrackBrowserActivity extends ListActivity implements } }); } - + // ADW: Load the specified theme + String themePackage = MusicUtils.getThemePackageName(this, + MusicSettingsActivity.THEME_DEFAULT); + PackageManager pm = getPackageManager(); + Resources themeResources = null; + if (!themePackage.equals(MusicSettingsActivity.THEME_DEFAULT)) { + try { + themeResources = pm.getResourcesForApplication(themePackage); + } catch (NameNotFoundException e) { + // ADW The saved theme was uninstalled so we save the + // default one + MusicUtils.setThemePackageName(this, + MusicSettingsActivity.THEME_DEFAULT); + } + } + // Set Views for themes + if (themeResources != null) { + // Artist tab + mSongTab = (LinearLayout) findViewById(R.id.album_tab); + mButtonBar = (TabWidget) findViewById(R.id.buttonbar); + mButtonBarArtist = (TextView) findViewById(R.id.artisttab); + mButtonBarAlbum = (TextView) findViewById(R.id.albumtab); + mButtonBarSong = (TextView) findViewById(R.id.songtab); + mButtonBarPlaylist = (TextView) findViewById(R.id.playlisttab); + mButtonBarNP = (TextView) findViewById(R.id.nowplayingtab); + mGroup = (RelativeLayout) findViewById(R.id.group_item); + mChild = (RelativeLayout) findViewById(R.id.child_item); + ArtistAlbumBrowserActivity.loadThemeResource(themeResources, + themePackage, "tab_song", mSongTab, THEME_ITEM_BACKGROUND); + ArtistAlbumBrowserActivity.loadThemeResource(themeResources, + themePackage, "group_bg", mGroup, THEME_ITEM_BACKGROUND); + ArtistAlbumBrowserActivity.loadThemeResource(themeResources, + themePackage, "child_bg", mChild, THEME_ITEM_BACKGROUND); + ArtistAlbumBrowserActivity.loadThemeResource(themeResources, + themePackage, "buttonbar", mButtonBar, + THEME_ITEM_BACKGROUND); + ArtistAlbumBrowserActivity.loadThemeResource(themeResources, + themePackage, "tab_bg_artist", mButtonBarArtist, + THEME_ITEM_BACKGROUND); + ArtistAlbumBrowserActivity.loadThemeResource(themeResources, + themePackage, "tab_bg_album", mButtonBarAlbum, + THEME_ITEM_BACKGROUND); + ArtistAlbumBrowserActivity.loadThemeResource(themeResources, + themePackage, "tab_bg_song", mButtonBarSong, + THEME_ITEM_BACKGROUND); + ArtistAlbumBrowserActivity.loadThemeResource(themeResources, + themePackage, "tab_bg_playlist", mButtonBarPlaylist, + THEME_ITEM_BACKGROUND); + ArtistAlbumBrowserActivity.loadThemeResource(themeResources, + themePackage, "tab_bg_nowplaying", mButtonBarNP, + THEME_ITEM_BACKGROUND); + // Small now playing window + mNowPlaying = (LinearLayout) findViewById(R.id.nowplaying); + mInfoDivider = (ImageView) findViewById(R.id.info_divider); + mProgress = (ProgressBar) findViewById(R.id.progress); + mShare = (ImageButton) findViewById(R.id.share_song); + mPlay = (ImageButton) findViewById(R.id.media_play); + mNext = (ImageButton) findViewById(R.id.media_next); + mPrev = (ImageButton) findViewById(R.id.media_prev); + mMarket = (ImageButton) findViewById(R.id.market_music); + mDoSearch = (ImageButton) findViewById(R.id.doSearch); + mFlow = (ImageButton) findViewById(R.id.overFlow); + if (getResources().getConfiguration().orientation == Configuration.ORIENTATION_PORTRAIT) { + ArtistAlbumBrowserActivity.loadThemeResource(themeResources, + themePackage, "snp_background", mNowPlaying, + THEME_ITEM_BACKGROUND); + ArtistAlbumBrowserActivity.loadThemeResource(themeResources, + themePackage, "snp_progress", mProgress, + THEME_ITEM_BACKGROUND); + ArtistAlbumBrowserActivity.loadThemeResource(themeResources, + themePackage, "snp_info_divider", mInfoDivider, + THEME_ITEM_BACKGROUND); + ArtistAlbumBrowserActivity.loadThemeResource(themeResources, + themePackage, "snp_share", mShare, + THEME_ITEM_FOREGROUND); + ArtistAlbumBrowserActivity.loadThemeResource(themeResources, + themePackage, "snp_play", mPlay, THEME_ITEM_FOREGROUND); + ArtistAlbumBrowserActivity.loadThemeResource(themeResources, + themePackage, "snp_next", mNext, THEME_ITEM_FOREGROUND); + ArtistAlbumBrowserActivity.loadThemeResource(themeResources, + themePackage, "snp_prev", mPrev, THEME_ITEM_FOREGROUND); + ArtistAlbumBrowserActivity.loadThemeResource(themeResources, + themePackage, "snp_market", mMarket, + THEME_ITEM_FOREGROUND); + ArtistAlbumBrowserActivity.loadThemeResource(themeResources, + themePackage, "snp_search", mDoSearch, + THEME_ITEM_FOREGROUND); + ArtistAlbumBrowserActivity.loadThemeResource(themeResources, + themePackage, "snp_flow", mFlow, THEME_ITEM_FOREGROUND); + } + } // don't set the album art until after the view has been layed out mTrackList.post(new Runnable() { @@ -500,6 +617,11 @@ public class TrackBrowserActivity extends ListActivity implements return currentTrackMessage; } + private View.OnClickListener mOverFlow = new View.OnClickListener() { + public void onClick(View v) { + openOptionsMenu(); + } + }; private View.OnClickListener mDoSearchListener = new View.OnClickListener() { public void onClick(View v) { onSearchRequested(); @@ -899,9 +1021,50 @@ public class TrackBrowserActivity extends ListActivity implements mDeletedOneRow = true; } else { // update a saved playlist - MediaStore.Audio.Playlists.Members - .moveItem(getContentResolver(), - Long.valueOf(mPlaylist), from, to); + Uri baseUri = MediaStore.Audio.Playlists.Members.getContentUri( + "external", Long.valueOf(mPlaylist)); + ContentValues values = new ContentValues(); + String where = MediaStore.Audio.Playlists.Members._ID + "=?"; + String[] wherearg = new String[1]; + ContentResolver res = getContentResolver(); + int colidx = mTrackCursor + .getColumnIndexOrThrow(MediaStore.Audio.Playlists.Members.PLAY_ORDER); + if (from < to) { + // move the item to somewhere later in the list + mTrackCursor.moveToPosition(to); + long toidx = mTrackCursor.getLong(colidx); + mTrackCursor.moveToPosition(from); + values.put(MediaStore.Audio.Playlists.Members.PLAY_ORDER, + toidx); + wherearg[0] = mTrackCursor.getString(0); + res.update(baseUri, values, where, wherearg); + for (int i = from + 1; i <= to; i++) { + mTrackCursor.moveToPosition(i); + values.put( + MediaStore.Audio.Playlists.Members.PLAY_ORDER, + i - 1); + wherearg[0] = mTrackCursor.getString(0); + res.update(baseUri, values, where, wherearg); + } + } else if (from > to) { + // move the item to somewhere earlier in the list + mTrackCursor.moveToPosition(to); + long toidx = mTrackCursor.getLong(colidx); + mTrackCursor.moveToPosition(from); + values.put(MediaStore.Audio.Playlists.Members.PLAY_ORDER, + toidx); + wherearg[0] = mTrackCursor.getString(0); + res.update(baseUri, values, where, wherearg); + for (int i = from - 1; i >= to; i--) { + mTrackCursor.moveToPosition(i); + values.put( + MediaStore.Audio.Playlists.Members.PLAY_ORDER, + i + 1); + wherearg[0] = mTrackCursor.getString(0); + res.update(baseUri, values, where, wherearg); + } + } + } } }; @@ -956,9 +1119,9 @@ public class TrackBrowserActivity extends ListActivity implements if (action.equals(MediaPlaybackService.PLAYSTATE_CHANGED)) { setPauseButtonImage(); } - } - if (!mEditMode) { - MusicUtils.updateNowPlaying(TrackBrowserActivity.this); + if (!mEditMode) { + MusicUtils.updateNowPlaying(TrackBrowserActivity.this); + } } } }; @@ -1897,6 +2060,39 @@ public class TrackBrowserActivity extends ListActivity implements vh.mContextMenu = (FrameLayout) v .findViewById(R.id.second_column_icon); vh.mContextMenu.setOnClickListener(mCML); + // ADW: Load the specified theme + String themePackage = MusicUtils.getThemePackageName(context, + MusicSettingsActivity.THEME_DEFAULT); + PackageManager pm = context.getPackageManager(); + Resources themeResources = null; + if (!themePackage.equals(MusicSettingsActivity.THEME_DEFAULT)) { + try { + themeResources = pm + .getResourcesForApplication(themePackage); + } catch (NameNotFoundException e) { + // ADW The saved theme was uninstalled so we save the + // default one + MusicUtils.setThemePackageName(context, + MusicSettingsActivity.THEME_DEFAULT); + } + } + if (themeResources != null) { + int line1 = themeResources.getIdentifier( + "song_tab_track_name_color", "color", themePackage); + if (line1 != 0) { + vh.line1.setTextColor(themeResources.getColor(line1)); + } + int line2 = themeResources.getIdentifier( + "song_tab_album_name_color", "color", themePackage); + if (line2 != 0) { + vh.line2.setTextColor(themeResources.getColor(line2)); + } + int duration = themeResources.getIdentifier( + "song_tab_duration_color", "color", themePackage); + if (duration != 0) { + vh.duration.setTextColor(themeResources.getColor(duration)); + } + } return v; } @@ -2045,11 +2241,30 @@ public class TrackBrowserActivity extends ListActivity implements } private void setPauseButtonImage() { + // ADW: Load the specified theme + String themePackage = MusicUtils.getThemePackageName(this, + MusicSettingsActivity.THEME_DEFAULT); + PackageManager pm = getPackageManager(); + Resources themeResources = null; + if (!themePackage.equals(MusicSettingsActivity.THEME_DEFAULT)) { + try { + themeResources = pm.getResourcesForApplication(themePackage); + } catch (NameNotFoundException e) { + // ADW The saved theme was uninstalled so we save the + // default one + MusicUtils.setThemePackageName(this, + MusicSettingsActivity.THEME_DEFAULT); + } + } try { if (mService != null && mService.isPlaying()) { mPlay.setImageResource(R.drawable.ic_media_pause); + ArtistAlbumBrowserActivity.loadThemeResource(themeResources, + themePackage, "np_pause", mPlay, THEME_ITEM_FOREGROUND); } else { mPlay.setImageResource(R.drawable.ic_appwidget_music_play); + ArtistAlbumBrowserActivity.loadThemeResource(themeResources, + themePackage, "np_play", mPlay, THEME_ITEM_FOREGROUND); } } catch (RemoteException ex) { } |
