Ubuntu One Android Files

Merge lp://staging/~karni/ubuntuone-android-files/gd-upgrade-and-logo into lp://staging/ubuntuone-android-files

gd-upgrade-and-logo
Merge into trunk-2011

Proposed by Michał Karnicki on 2011-11-01

Status:	Merged
Merged at revision:	233
Proposed branch:	lp://staging/~karni/ubuntuone-android-files/gd-upgrade-and-logo
Merge into:	lp://staging/ubuntuone-android-files
Diff against target:	412 lines (+292/-53) 5 files modified HACKING.txt (+4/-25) gd.patch (+220/-0) res/layout/activity_list.xml (+62/-25) res/values/themes.xml (+1/-1) src/com/ubuntuone/android/files/ui/FilesActivity.java (+5/-2)
To merge this branch:	bzr merge lp://staging/~karni/ubuntuone-android-files/gd-upgrade-and-logo
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Chad Miller		2011-11-01	Pending
Review via email: mp+80857@code.staging.launchpad.net

Description of the change

This branch:
- upgrades to latest GreenDroid version
- adds gd.patch and updates HACKING.txt for easier project setup
- adds action bar logo assets*

* The xhdpi logo is 72px high, could be 80px, but I only had 72px resource at hand. Well see if we need it.

Revision history for this message

Chad Miller (cmiller) wrote on 2011-11-02:

FR resources. Does that mean that Files will claim to be translated to French in the Market?

Revision history for this message

Michał Karnicki (karni) wrote on 2011-11-03:

Right, no idea how it got to the diff file. Will fix.

Revision history for this message

Michał Karnicki (karni) wrote on 2011-11-03:

Ah, that is actually correct. The +- in the lp diff is confusing. New lines indicating I've added the patch to *remove* resources other than English. Since we've not yet translated our apps, we don't want other languages to be listed on the Market.