summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* set up fast-forward from froyo-release to gingerbreadThe Android Open Source Project2010-06-290-0/+0
|\ | | | | | | Change-Id: Ib51715745e382bdc0cb3130afed110a6307b7059
| * 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I71a18497862a30db5ff0f52f566fb86eae213ea3
| * | | | | | | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes a crash in the new hotseat launcher icons. Change-Id: Idcb7441647f16c783a47dfe09400f04fa8980dd3
| * | | | | | | | | | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The sorting is no longer being done in LauncherModel. AA3D.addApps correctly performs an insertion sort, but setApps did not. Missing from change I77e3865b. Bug: 2562420 Change-Id: I6854c2c4a221b2c1ad123410292da1fbfece7871
| * | | | | | | | | | | | | | | | | | | | | Launcher2 performance: Don't sort apps in LauncherModel.Daniel Sandler2010-04-161-9/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AllApps2D and AllApps3D do their own sorting before display. Bug: 2562420 Change-Id: I77e3865b856a5123872bee3d8578d0596956cddd
| * | | | | | | | | | | | | | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I2af5d0c5d3c80ad598a5cd7729f8a1b9b2842502
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 2509023 - NPE on upgrade to froyoJoe Onorato2010-03-111-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I07cb4f272948062b47da8826ca917fd74ad18404
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unbind root script around load activities to prevent commands from being ↵Jason Sams2010-03-111-188/+200
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | delayed due to swap buffers. Change-Id: I9720fbe936d3cd336ca39235d0a1bba9e10d137a
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix 2507267 - stack overflow when adding shortcutJoe Onorato2010-03-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ife5bea443debd481854693b3924e72a04fb66f97
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Make the loader thread a Looper and move the package manager updates ↵Joe Onorato2010-06-212-801/+788
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into that thread as well." into gingerbread
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make the loader thread a Looper and move the package managerJoe Onorato2010-06-182-801/+788
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | updates into that thread as well. This gets rid of the ANRs that happened because both threads were holding mAllAppsListLock. Now mAllAppsList should only be touched from within the worker thread. Change-Id: Ifc4ac27e0c0a927ac66c456d097fd3d4ef6c5e1e
* / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Import revised translationsKenny Root2010-06-201-7/+7
|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8b250fac67c854a118fd481466e2e28f773e2229
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "This variable can be checked outside the lock because it's only set ↵Joe Onorato2010-06-111-6/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | from the ui thread." into froyo
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This variable can be checked outside the lock because it's onlyJoe Onorato2010-06-111-6/+6
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | set from the ui thread. This will help the ANR in LauncherModel.onReceive because if we're under contention, there's a good chance that we haven't loaded yet. It won't completely fix it, but that will take a large refactoring. Bug 2672967 Change-Id: I2c97a416767b4bb6aac0252f02e2aa2055ae8a4e
* / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix crash in getCurrentWorkspaceScreen.Joe Onorato2010-06-111-1/+5
|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 2761789 Change-Id: I9f005c876ca20f774e6d8046e34451a7fecbe805