Re: [android-porting] Re: Overrides for code as well as resources

2010-08-22 Thread Al Sutton
It's certainly an idea which crossed my mind for this one line patch. Unfortunately we have a few other patches which are slightly larger and definitely wouldn't make it in to the mainline (one resizes the status bar to put home, back, and menu buttons in it). Al. -- * Looking for Android

Re: [android-porting] Re: Overrides for code as well as resources

2010-08-21 Thread Al Sutton
[copied to group due to using reply not reply all first time] We've ended up with a forked repository at the moment. The main problem with post checkout patching (or file copying) is that repo will then refuse to update the files due to detecting local changes. The ideal system would allow us

Re: [android-porting] Re: Overrides for code as well as resources

2010-08-21 Thread Magnus Bäck
On Saturday, August 21, 2010 at 09:51 CEST, Al Sutton a...@funkyandroid.com wrote: We've ended up with a forked repository at the moment. The main problem with post checkout patching (or file copying) is that repo will then refuse to update the files due to detecting local changes.

Re: [android-porting] Re: Overrides for code as well as resources

2010-08-21 Thread Al Sutton
[copied to list] I'm a fan of the KISS principal, so if I can reduce the number of repositories involved then I tend to head that way. One of the patches we have to make is a single line change to a two files (we could do it in one, but it's for frameworks/policies/base so we do it in both

Re: [android-porting] Re: Overrides for code as well as resources

2010-08-21 Thread Dianne Hackborn
Well you really wouldn't want to have overlay code for that kind of thing anyway, because your overlay would end up having a copy of whatever the code was at the point you made it, and wouldn't track later changes that happen to it. That's really no different than forking, but just in a less

Re: [android-porting] Re: Overrides for code as well as resources

2010-08-21 Thread Naseer Ahmed
For your particular case, I think you're better off adding a new parameter to frameworks/base/core/res/res/values/config.xml, then reading that in the policy. You could then submit this as a patch to the android mainline and if it gets accepted, you can then use a normal resource overlay for

[android-porting] Re: Overrides for code as well as resources

2010-08-20 Thread Jim Ancona
On Aug 19, 8:55 am, Al Sutton a...@funkyandroid.com wrote: Does anyone know if there is a equivalent for code? AFAIK, the only way to do this is to fork the relevant repository and then continue to merge changes from upstream. We have a similar problem with the Android on Freerunner project

Re: [android-porting] Re: Overrides for code as well as resources

2010-08-20 Thread Dianne Hackborn
I would think it would be much easier to maintain a patch on top of the platform code rather than trying to replace source files. What do you do when the platform's source changes to fix bugs or add features? A patch you can rebase... a separate source that is a copy of an earlier version of