Merge lp://staging/~karni/ubuntuone-android-files/purchase-storage into lp://staging/ubuntuone-android-files
Proposed by
Michał Karnicki
| Status: | Merged |
|---|---|
| Approved by: | Chad Miller |
| Approved revision: | 221 |
| Merged at revision: | 222 |
| Proposed branch: | lp://staging/~karni/ubuntuone-android-files/purchase-storage |
| Merge into: | lp://staging/ubuntuone-android-files |
| Diff against target: |
608 lines (+510/-2) 8 files modified
AndroidManifest.xml.in (+6/-0) HACKING.txt (+9/-0) res/layout/activity_store.xml (+12/-0) res/values/strings.xml (+10/-1) res/xml/preferences.xml (+4/-0) setup.sh (+1/-1) src/com/ubuntuone/android/files/ui/PreferencesActivity.java (+13/-0) src/com/ubuntuone/android/files/ui/StoreActivity.java (+455/-0) |
| To merge this branch: | bzr merge lp://staging/~karni/ubuntuone-android-files/purchase-storage |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Chad Miller (community) | Approve | ||
|
Review via email:
|
|||
Description of the change
Allow purchase of storage in-app (with embedded WebView). With Analytics.
To post a comment you must log in.
Revision history for this message
| Chad Miller (cmiller) | # |
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
