1
0
mirror of https://github.com/moparisthebest/k-9 synced 2024-08-13 17:03:48 -04:00
k-9/src/com/android
Jesse Vincent 9cf84ee2c8 Merge 'rename' into 'trunk'
r55941@173-101-60-247 (orig r204):  jessev | 2008-12-16 14:58:33 -0800

r55942@173-101-60-247 (orig r205):  jessev | 2008-12-16 15:07:33 -0800
* step 1 of rename
r55943@173-101-60-247 (orig r206):  jessev | 2008-12-16 15:08:52 -0800
step 2 of rename
r55944@173-101-60-247 (orig r207):  jessev | 2008-12-16 15:09:23 -0800
 oops
r55945@173-101-60-247 (orig r208):  jessev | 2008-12-16 15:34:01 -0800
* Even more progressive rename/unfork work
r55947@173-101-60-247 (orig r210):  jessev | 2008-12-16 16:16:43 -0800
* Doesn't work, but close to what danapple has recommended
r56039@173-101-60-247 (orig r213):  young.bradley | 2008-12-18 16:14:49 -0800
This is a working semi-deforked application.  i.e. most of it is still in the com.android.email namespace, but choice bits are in com.fsck.k9 so that it won't try to overwrite the builtin client.

Changes: corrected the package (or something equally simple for K9.java
build.xml has an additional stanza that copies the R.java file from fsck to android namespace, and changes the package inside the file.
AndroidManifest.xml has the package set to fsck, and all the activities are now explicity named.
r56040@173-101-60-247 (orig r214):  jessev | 2008-12-18 16:20:56 -0800
* merged from trunk as of r213
2008-12-19 00:29:29 +00:00
..
email merged from trunk as of r213 2008-12-19 00:20:56 +00:00
k9 Merge 'rename' into 'trunk' 2008-12-19 00:29:29 +00:00