Merge lp://staging/~karni/ubuntuone-android-files/analytics into lp://staging/ubuntuone-android-files
Proposed by
Michał Karnicki
| Status: | Superseded |
|---|---|
| Proposed branch: | lp://staging/~karni/ubuntuone-android-files/analytics |
| Merge into: | lp://staging/ubuntuone-android-files |
| Diff against target: |
708 lines (+193/-29) (has conflicts) 11 files modified
.classpath (+8/-0) setup.sh (+18/-4) src/com/ubuntuone/android/files/Analytics.java (+5/-0) src/com/ubuntuone/android/files/service/MetaService.java (+12/-0) src/com/ubuntuone/android/files/service/UpDownService.java (+18/-0) src/com/ubuntuone/android/files/ui/FilesActivity.java (+36/-22) src/com/ubuntuone/android/files/ui/LoginActivity.java (+11/-1) src/com/ubuntuone/android/files/ui/PreferencesActivity.java (+37/-1) src/com/ubuntuone/android/files/ui/ShortcutsActivity.java (+14/-0) src/com/ubuntuone/android/files/ui/StatusActivity.java (+17/-0) src/com/ubuntuone/android/files/ui/StorageActivity.java (+17/-1) Text conflict in .classpath Text conflict in setup.sh Text conflict in src/com/ubuntuone/android/files/ui/PreferencesActivity.java |
| To merge this branch: | bzr merge lp://staging/~karni/ubuntuone-android-files/analytics |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Chad Miller (community) | Needs Fixing | ||
|
Review via email:
|
|||
Description of the change
This branch:
- completes what Chad has started with Google Analytics
- adds more tracked events
- adds the analytics .jar download to setup.sh
mTracker had to be renamed to mPathTracker in FilesActivity, so that we stay consistent in using mTracker field name for analytics tracker.
To post a comment you must log in.
Unmerged revisions
- 186. By Michał Karnicki
-
Remove analytics from Services.
- 185. By Michał Karnicki
-
Fix quotes in setup.sh
- 184. By Michał Karnicki
-
Fix analytics API key. Review fixes. Extract the jar only, quote filename when invoking rm.
- 183. By Michał Karnicki
-
Merge trunk.
- 182. By Michał Karnicki
-
Complete and add more Google Analytics.
- 181. By Chad Miller
-
Begin analytics. Log activities as PageVisits.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
In the "unzip" in setup, you can specify a filename pattern to match to extract, and avoid the "rm". We don't know what other files that zipfile may include one day.
You don't need to quote "analytics", but you do need to quote the filename expansion!