Merge lp://staging/~karni/ubuntuone-android-music/playlist-ux-and-sync into lp://staging/ubuntuone-android-music/v2
Proposed by
Michał Karnicki
| Status: | Merged |
|---|---|
| Approved by: | Michał Karnicki |
| Approved revision: | 32 |
| Merged at revision: | 32 |
| Proposed branch: | lp://staging/~karni/ubuntuone-android-music/playlist-ux-and-sync |
| Merge into: | lp://staging/ubuntuone-android-music/v2 |
| Prerequisite: | lp://staging/~karni/ubuntuone-android-music/added-missing-dao |
| Diff against target: |
1525 lines (+527/-267) 25 files modified
AndroidManifest.xml (+7/-0) res/layout/activity_playlist.xml (+0/-76) res/layout/activity_playlists.xml (+13/-0) res/values/ids.xml (+1/-0) res/values/strings.xml (+5/-0) src/com/ubuntuone/android/music/adapter/U1PlaylistAdapter.java (+7/-2) src/com/ubuntuone/android/music/model/Song.java (+1/-1) src/com/ubuntuone/android/music/provider/MusicContract.java (+11/-3) src/com/ubuntuone/android/music/provider/MusicDatabase.java (+1/-0) src/com/ubuntuone/android/music/provider/MusicProvider.java (+6/-6) src/com/ubuntuone/android/music/provider/MusicProviderUtils.java (+70/-3) src/com/ubuntuone/android/music/service/MusicService.java (+16/-5) src/com/ubuntuone/android/music/service/SyncService.java (+59/-10) src/com/ubuntuone/android/music/ui/AlbumsFragment.java (+8/-1) src/com/ubuntuone/android/music/ui/HomeActivity.java (+50/-4) src/com/ubuntuone/android/music/ui/PlayerFragment.java (+1/-1) src/com/ubuntuone/android/music/ui/PlaylistActivity.java (+0/-1) src/com/ubuntuone/android/music/ui/PlaylistsActivity.java (+148/-6) src/com/ubuntuone/android/music/ui/PlaylistsFragment.java (+33/-111) src/com/ubuntuone/android/music/ui/SongsFragment.java (+58/-18) src/com/ubuntuone/android/music/ui/dialog/InfoAlertDialog.java (+12/-6) test/src/com/ubuntuone/android/music/provider/MusicProviderInsertTest.java (+2/-2) test/src/com/ubuntuone/android/music/provider/MusicProviderQueryTest.java (+4/-4) test/src/com/ubuntuone/android/music/provider/MusicProviderUtilsTest.java (+10/-7) test/src/com/ubuntuone/android/music/ui/SongsPageTest.java (+4/-0) |
| To merge this branch: | bzr merge lp://staging/~karni/ubuntuone-android-music/playlist-ux-and-sync |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Roberto Alsina (community) | Approve | ||
|
Review via email:
|
|||
Commit message
Added playlist manipulation and sync.
Description of the change
This branch allows adding and removing items from playlists, as well as sync them with U1.
Create new playlist feature is pending minor rework after recent u1-server changes rolled out.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Looks good!