summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fix launcher updating when all of an app's activities disappear.Dianne Hackborn2010-07-241-15/+13
* set up fast-forward from froyo-release to gingerbreadThe Android Open Source Project2010-06-290-0/+0
|\
| * Merge branch 'froyo' into froyo-releaseThe Android Automerger2010-06-112-7/+11
| |\
| * \ Merge branch 'froyo' into froyo-releaseThe Android Automerger2010-06-102-6/+6
| |\ \
| * \ \ Merge branch 'froyo' into froyo-releaseThe Android Automerger2010-06-081-0/+4
| |\ \ \
| * \ \ \ Merge branch 'froyo' into froyo-releaseThe Android Automerger2010-06-084-94/+98
| |\ \ \ \
| * \ \ \ \ Merge branch 'froyo' into froyo-releaseThe Android Automerger2010-06-073-62/+111
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'froyo' into froyo-releaseThe Android Automerger2010-06-035-3/+85
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'froyo' into froyo-releaseThe Android Automerger2010-05-273-2/+64
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'froyo' into froyo-releaseThe Android Automerger2010-05-253-2/+15
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'froyo' into froyo-releaseThe Android Automerger2010-05-181-0/+8
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'froyo' into froyo-releaseThe Android Automerger2010-05-171-1/+1
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'froyo' into froyo-releaseThe Android Automerger2010-05-071-1/+1
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'froyo' into froyo-releaseThe Android Automerger2010-05-055-63/+72
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'froyo' into froyo-releaseThe Android Automerger2010-05-033-7/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Filter input events and smooth out touch scrolling. Bug 2639807Adam Powell2010-04-292-12/+36
| * | | | | | | | | | | | | | Merge branch 'froyo' into froyo-releaseThe Android Automerger2010-04-2929-38/+187
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'froyo' into froyo-releaseThe Android Automerger2010-04-287-40/+84
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'froyo' into froyo-releaseThe Android Automerger2010-04-263-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Fix proguard flags.Daniel Sandler2010-04-231-0/+1
| * | | | | | | | | | | | | | | | | Merge branch 'froyo' into froyo-releaseThe Android Automerger2010-04-2346-51/+293
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'froyo' into froyo-releaseThe Android Automerger2010-04-221-8/+12
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'froyo' into froyo-releaseThe Android Automerger2010-04-213-59/+101
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'froyo' into froyo-releaseThe Android Automerger2010-04-197-44/+39
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | Sort apps in AllApps3D.setApps().Daniel Sandler2010-04-161-0/+4
| * | | | | | | | | | | | | | | | | | | | | Launcher2 performance: Don't sort apps in LauncherModel.Daniel Sandler2010-04-161-9/+2
| * | | | | | | | | | | | | | | | | | | | | Merge branch 'froyo' into froyo-releaseThe Android Automerger2010-04-157-45/+111
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'froyo' into froyo-releaseThe Android Automerger2010-04-143-3/+17
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'froyo' into froyo-releaseThe Android Automerger2010-04-121-73/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'froyo' into froyo-releaseThe Android Automerger2010-04-071-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'froyo' into froyo-releaseThe Android Automerger2010-04-064-2/+64
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'froyo' into froyo-releaseThe Android Automerger2010-04-051-3/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'froyo' into froyo-releaseThe Android Automerger2010-04-012-0/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'froyo' into froyo-releaseThe Android Automerger2010-03-297-11/+14
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge commit 'goog/master' into froyo-releaseandroid-build SharedAccount2010-03-242-11/+25
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into froyo-releaseThe Android Automerger2010-03-231-10/+40
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into froyo-releaseThe Android Automerger2010-03-231-1/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into froyo-releaseThe Android Automerger2010-03-2222-341/+436
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into froyo-releaseThe Android Automerger2010-03-182-204/+213
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into froyo-releaseThe Android Automerger2010-03-163-25/+41
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into froyo-releaseThe Android Automerger2010-03-155-19/+36
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | resolve conflictsandroid-build SharedAccount2010-03-151-38/+66
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 2509023 - NPE on upgrade to froyoJoe Onorato2010-03-111-2/+2
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unbind root script around load activities to prevent commands from being dela...Jason Sams2010-03-111-188/+200
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix 2507267 - stack overflow when adding shortcutJoe Onorato2010-03-111-1/+1
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Make the loader thread a Looper and move the package manager updates i...Joe Onorato2010-06-212-801/+788
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make the loader thread a Looper and move the package managerJoe Onorato2010-06-182-801/+788
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Import revised translationsKenny Root2010-06-201-7/+7
|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "This variable can be checked outside the lock because it's only set fr...Joe Onorato2010-06-111-6/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This variable can be checked outside the lock because it's onlyJoe Onorato2010-06-111-6/+6
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |