Merge lp://staging/~karni/ubuntuone-android-files/autoupload-frequency into lp://staging/ubuntuone-android-files
Proposed by
Michał Karnicki
| Status: | Merged |
|---|---|
| Merged at revision: | 307 |
| Proposed branch: | lp://staging/~karni/ubuntuone-android-files/autoupload-frequency |
| Merge into: | lp://staging/ubuntuone-android-files |
| Diff against target: |
1200 lines (+173/-554) 15 files modified
AndroidManifest.xml (+3/-2) res/values/arrays.xml (+0/-11) res/values/themes.xml (+7/-2) res/xml/preferences.xml (+0/-7) src/com/ubuntuone/android/files/Alarms.java (+1/-122) src/com/ubuntuone/android/files/Preferences.java (+36/-28) src/com/ubuntuone/android/files/UbuntuOneFiles.java (+40/-8) src/com/ubuntuone/android/files/activity/FilesActivity.java (+24/-45) src/com/ubuntuone/android/files/activity/PreferencesActivity.java (+24/-181) src/com/ubuntuone/android/files/activity/ShortcutsActivity.java (+3/-10) src/com/ubuntuone/android/files/receiver/NetworkReceiver.java (+1/-1) src/com/ubuntuone/android/files/receiver/SystemReceiver.java (+22/-36) src/com/ubuntuone/android/files/service/MetaService.java (+7/-17) src/com/ubuntuone/android/files/service/UpDownServiceHelper.java (+5/-10) src/com/ubuntuone/android/files/util/StorageInfo.java (+0/-74) |
| To merge this branch: | bzr merge lp://staging/~karni/ubuntuone-android-files/autoupload-frequency |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Chad Miller | Pending | ||
|
Review via email:
|
|||
Description of the change
- Drop periodic auto-uploads. Attempt instant upload whenever possible.
- Move StorageInfo config file contents back to application settings.
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
