Merge lp://staging/~karni/ubuntuone-android-music/build-setup into lp://staging/ubuntuone-android-music/v2
Proposed by
Michał Karnicki
| Status: | Merged |
|---|---|
| Merged at revision: | 37 |
| Proposed branch: | lp://staging/~karni/ubuntuone-android-music/build-setup |
| Merge into: | lp://staging/ubuntuone-android-music/v2 |
| Diff against target: |
1125 lines (+448/-221) 23 files modified
.bzrignore (+1/-0) ant.properties (+18/-0) build.xml (+120/-15) project.properties (+5/-2) src/com/ubuntuone/android/music/UbuntuOneMusic.java (+2/-2) src/com/ubuntuone/android/music/ui/AlbumsFragment.java (+2/-0) src/com/ubuntuone/android/music/ui/ArtistsFragment.java (+2/-0) src/com/ubuntuone/android/music/ui/HomeActivity.java (+1/-1) src/com/ubuntuone/android/music/ui/SongsFragment.java (+1/-1) src/com/ubuntuone/android/music/util/AccountUtils.java (+14/-5) src/com/ubuntuone/android/music/util/U1ImageDownloader.java (+7/-4) test/ant.properties (+1/-1) test/build.xml (+1/-1) test/src/com/ubuntuone/android/music/MockData.java (+185/-0) test/src/com/ubuntuone/android/music/UbuntuOneMusicTest.java (+0/-10) test/src/com/ubuntuone/android/music/provider/MockData.java (+0/-163) test/src/com/ubuntuone/android/music/provider/MusicProviderMockDataTestBase.java (+2/-0) test/src/com/ubuntuone/android/music/provider/MusicProviderQueryTest.java (+1/-0) test/src/com/ubuntuone/android/music/provider/MusicProviderUtilsTest.java (+1/-0) test/src/com/ubuntuone/android/music/ui/ArtistsPageTest.java (+25/-3) test/src/com/ubuntuone/android/music/ui/HomeActivityTest.java (+17/-6) test/src/com/ubuntuone/android/music/ui/SongsPageTest.java (+18/-7) tools.sh (+24/-0) |
| To merge this branch: | bzr merge lp://staging/~karni/ubuntuone-android-music/build-setup |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Roberto Alsina (community) | Approve | ||
|
Review via email:
|
|||
Description of the change
Added build setup.
Minor debug build changes, FragmentViewPager bug workaround.
To post a comment you must log in.
Revision history for this message
| Roberto Alsina (ralsina) | # |
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
