Merge lp://staging/~karni/ubuntuone-android-files/photo-watch-and-config into lp://staging/ubuntuone-android-files
Proposed by
Michał Karnicki
| Status: | Superseded |
|---|---|
| Proposed branch: | lp://staging/~karni/ubuntuone-android-files/photo-watch-and-config |
| Merge into: | lp://staging/ubuntuone-android-files |
| Diff against target: |
2899 lines (+1544/-560) 35 files modified
AndroidManifest.xml (+38/-2) res/layout-land/tutorial_page.xml (+3/-1) res/layout/action_bar.xml (+16/-0) res/layout/activity_autoupload_customize.xml (+16/-0) res/layout/activity_autoupload_setup.xml (+16/-0) res/layout/fragment_autoupload_customize.xml (+125/-0) res/layout/fragment_autoupload_setup.xml (+162/-0) res/layout/list_row_watched_folder.xml (+12/-0) res/values/arrays.xml (+0/-11) res/values/colors.xml (+2/-0) res/values/strings.xml (+28/-2) res/values/themes.xml (+7/-2) res/xml/preferences.xml (+10/-8) src/com/ubuntuone/android/files/Alarms.java (+1/-122) src/com/ubuntuone/android/files/Preferences.java (+41/-28) src/com/ubuntuone/android/files/UbuntuOneFiles.java (+42/-8) src/com/ubuntuone/android/files/activity/AutoUploadCustomizeActivity.java (+32/-0) src/com/ubuntuone/android/files/activity/AutoUploadSetupActivity.java (+29/-0) src/com/ubuntuone/android/files/activity/FilesActivity.java (+24/-45) src/com/ubuntuone/android/files/activity/PreferencesActivity.java (+80/-175) src/com/ubuntuone/android/files/activity/ShortcutsActivity.java (+3/-10) src/com/ubuntuone/android/files/fragment/AutoUploadCustomizeFragment.java (+166/-0) src/com/ubuntuone/android/files/fragment/AutoUploadSetupFragment.java (+146/-0) src/com/ubuntuone/android/files/provider/MetaContract.java (+59/-0) src/com/ubuntuone/android/files/provider/MetaDatabase.java (+27/-0) src/com/ubuntuone/android/files/provider/MetaProvider.java (+35/-1) 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/MediaCatcher.java (+5/-1) src/com/ubuntuone/android/files/service/MediaScanService.java (+85/-0) src/com/ubuntuone/android/files/service/MediaWatchService.java (+232/-0) src/com/ubuntuone/android/files/service/MetaService.java (+7/-23) src/com/ubuntuone/android/files/service/UpDownServiceHelper.java (+5/-10) src/com/ubuntuone/android/files/util/MediaProviderUtils.java (+67/-0) src/com/ubuntuone/android/files/util/StorageInfo.java (+0/-74) |
| To merge this branch: | bzr merge lp://staging/~karni/ubuntuone-android-files/photo-watch-and-config |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Chad Miller | Pending | ||
|
Review via email:
|
|||
Description of the change
This branch changes the way we detect new photos.
- Added new auto upload configuration screen
- Added watched folder configuration
- Added new MediaWatchService, which utilizes FileObserver object per each watched folder.
To post a comment you must log in.
Unmerged revisions
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
