Merge lp://staging/~karni/ubuntuone-android-files/better-share-with-u1 into lp://staging/ubuntuone-android-files
Proposed by
Michał Karnicki
| Status: | Merged |
|---|---|
| Merged at revision: | 354 |
| Proposed branch: | lp://staging/~karni/ubuntuone-android-files/better-share-with-u1 |
| Merge into: | lp://staging/ubuntuone-android-files |
| Diff against target: |
518 lines (+160/-79) 10 files modified
AndroidManifest.xml (+7/-7) res/menu/options_menu_pick_auto_upload.xml (+4/-4) res/values/strings.xml (+5/-5) src/com/ubuntuone/android/files/UbuntuOneFiles.java (+11/-2) src/com/ubuntuone/android/files/activity/FilesActivity.java (+85/-25) src/com/ubuntuone/android/files/activity/ShortcutsActivity.java (+0/-20) src/com/ubuntuone/android/files/service/MetaService.java (+0/-10) src/com/ubuntuone/android/files/service/UpDownService.java (+11/-5) src/com/ubuntuone/android/files/util/DevUtilities.java (+25/-0) src/com/ubuntuone/android/files/util/TransferUtils.java (+12/-1) |
| To merge this branch: | bzr merge lp://staging/~karni/ubuntuone-android-files/better-share-with-u1 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Chad Miller | Pending | ||
|
Review via email:
|
|||
Description of the change
Last commit is most interesting. We allow selecting a destination directory when sharing files with Ubuntu One. One or two other commits could have crept it.
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
