← Back to branch summary

~ubuntuone-hackers/ubuntuone-android-contacts/trunk

~ubuntuone-hackers/ubuntuone-android-contacts/trunk

« back to all changes in this revision

Viewing changes to src/com/ubuntuone/android/contacts/funambol/activities/settings/

Committer: stuart.langridge at canonical
Date: 2010-08-23 13:38:11 UTC
mfrom: (374.1.11 mk2)
Revision ID: stuart.langridge@canonical.com-20100823133811-w79w654khg33n5g1

merge lp:~sil/ubuntuone-android-contacts/get-login-from-edge-uoc

files added:
res/layout/ubuntuone_funambol_account.xml

src/com/ubuntuone

src/com/ubuntuone/android

src/com/ubuntuone/android/contacts

src/com/ubuntuone/android/contacts/funambol

src/com/ubuntuone/android/contacts/funambol/activities

src/com/ubuntuone/android/contacts/funambol/activities/AndroidAccountScreen.java

src/com/ubuntuone/android/contacts/funambol/activities/settings

src/com/ubuntuone/android/contacts/funambol/activities/settings/AndroidAccountView.java

files modified:
AndroidManifest.xml

localization/lang-en.properties

res/drawable/logo.png

src/com/funambol/android/AndroidCustomization.java

src/com/funambol/android/activities/settings/AndroidAccountSettingsTab.java

Show diffs side-by-side

added added

removed removed

src/com/ubuntuone/android/contacts/funambol/activities/settings/

Older »