Merge lp://staging/~karni/ubuntuone-android-files/custom-autoupload-dir into lp://staging/ubuntuone-android-files
Proposed by
Michał Karnicki
| Status: | Merged |
|---|---|
| Approved by: | Chad Miller |
| Approved revision: | 218 |
| Merged at revision: | 218 |
| Proposed branch: | lp://staging/~karni/ubuntuone-android-files/custom-autoupload-dir |
| Merge into: | lp://staging/ubuntuone-android-files |
| Diff against target: |
499 lines (+205/-53) 8 files modified
AndroidManifest.xml.in (+5/-0) res/menu/options_menu_pick_auto_upload.xml (+11/-0) res/values/strings.xml (+14/-0) res/xml/preferences.xml (+27/-16) src/com/ubuntuone/android/files/Preferences.java (+22/-7) src/com/ubuntuone/android/files/service/MetaService.java (+31/-23) src/com/ubuntuone/android/files/ui/FilesActivity.java (+74/-7) src/com/ubuntuone/android/files/ui/PreferencesActivity.java (+21/-0) |
| To merge this branch: | bzr merge lp://staging/~karni/ubuntuone-android-files/custom-autoupload-dir |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Chad Miller (community) | Approve | ||
|
Review via email:
|
|||
Description of the change
Allow selecting custom photo auto upload directory.
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
UPLOAD_