summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Reconcile with ics-mr1-releaseThe Android Open Source Project2012-02-160-0/+0
|\ | | | | | | Change-Id: I1c11ccb0df06a34bb60db6e1f6b06d639c6abcdb
| * merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2012-02-160-0/+0
| |\
| | * merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2012-02-150-0/+0
| | |\
| | | * merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2012-02-140-0/+0
| | | |\
* | | | | am cfa1a75b: Merge "Part of fixing issue #6006757: Keyboard dismissal lags" ↵Justin Ho2012-02-161-1/+6
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into ics-mr1 * commit 'cfa1a75bd4edb3e3a9d93c8b02ab6a1ecb74e79b': Part of fixing issue #6006757: Keyboard dismissal lags
| * | | | Merge "Part of fixing issue #6006757: Keyboard dismissal lags" into ics-mr1Justin Ho2012-02-161-1/+6
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Part of fixing issue #6006757: Keyboard dismissal lagsDianne Hackborn2012-02-151-1/+6
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Have launcher delay a little before rebuilding its layers, to give the input system time to do the communication it needs with it before blocked on that work. Change-Id: Ib6f533a51c611b8c971c9ca2a1da8d53c8952b44
* | | | Merge "Fixing issue where smallest screen dim was not taking dpi into ↵Andrew Flynn2012-02-151-1/+3
|\ \ \ \ | | | | | | | | | | | | | | | account." into ics-scoop
| * | | | Fixing issue where smallest screen dim was not taking dpi into account.Winson Chung2012-02-141-1/+3
| | | | | | | | | | | | | | | | | | | | Change-Id: I1efacf693200f490c506050ce36403db224b5846
* | | | | am 2a5bc113: DO NOT MERGEMichael Jurka2012-02-141-1/+2
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / / | | | | * commit '2a5bc113b49b79c49281d5f8d8c1421d663d2ee4': DO NOT MERGE
| * / / DO NOT MERGEMichael Jurka2012-02-141-1/+2
| |/ / | | | | | | | | | | | | | | | | | | | | | Fixing animation glitch Bug #6015450 Change-Id: Iebbce7c07816b51b0fb98cd5b83ca2af2e5f76d4
* | | DO NOT MERGEWinson Chung2012-02-141-15/+7
| | | | | | | | | | | | | | | | | | Reverting: Change I3a8849a5: Cleaning up extra line related to icon density change. Change-Id: I5e8106d0f77545b80a0b21d4230cf826439ac371
* | | Revert "Should be getting launcher icon DPI from ActivityManager."Ramanan Rajeswaran2012-02-131-5/+11
| | | | | | | | | | | | This reverts commit af23500cf9eb9c05ae0b2a0ea63c96534e648004.
* | | Merge "Cleaning up extra line related to icon density change." into ics-scoopRamanan Rajeswaran2012-02-131-1/+0
|\ \ \
| * | | Cleaning up extra line related to icon density change.Winson Chung2012-02-131-1/+0
| | | | | | | | | | | | | | | | Change-Id: I3a8849a5800af1f04f097c4ce55ecf5d97292f4c
* | | | Should be getting launcher icon DPI from ActivityManager.Winson Chung2012-02-131-11/+5
|/ / / | | | | | | | | | Change-Id: Iec1b375568b421220fdbf08de6e7a697d0488e24
* | | am fb314c77: Import translations. DO NOT MERGEEric Fischer2012-02-107-19/+28
|\| | | | | | | | | | | | | | * commit 'fb314c7782682b75b1be47beac0d5f2bcef2584c': Import translations. DO NOT MERGE
| * | Import translations. DO NOT MERGEEric Fischer2012-02-087-19/+28
| | | | | | | | | | | | Change-Id: Ia1e288e37af91e079027d742c389a6ce10bd247c
* | | Reconcile with ics-mr1-releaseThe Android Open Source Project2012-02-010-0/+0
|\ \ \ | |/ / |/| / | |/ Change-Id: Ie670c123d7fe636bc2a6b441c4b42f74b1f326bc
| * merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-12-080-0/+0
|/|
| * merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-12-080-0/+0
| |\
| | * merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-12-010-0/+0
| | |\
| | | * merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-12-010-0/+0
| | | |\
| | | | * merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-11-300-0/+0
| | | | |\
| | | | | * merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-11-290-0/+0
| | | | | |\
| | | | | | * merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-11-280-0/+0
| | | | | | |\
| | | | | | | * merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-11-220-0/+0
| | | | | | | |\
| | | | | | | | * merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-11-170-0/+0
| | | | | | | | |\
| | | | | | | | | * Fix bug where all apps didn't load sometimesMichael Jurka2011-11-161-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug #5623281
| | | | | | | | | * merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-11-160-0/+0
| | | | | | | | | |\
| | | | | | | | | | * merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-11-150-0/+0
| | | | | | | | | | |\
| | | | | | | | | | | * merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-11-130-0/+0
| | | | | | | | | | | |\
| | | | | | | | | | | | * merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-11-090-0/+0
| | | | | | | | | | | | |\
| | | | | | | | | | | | | * merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-11-080-0/+0
| | | | | | | | | | | | | |\
| | | | | | | | | | | | | | * merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-11-060-0/+0
| | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | * merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-11-030-0/+0
| | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | * Tentative fix for monkey crash, issue 5556086Adam Cohen2011-11-021-5/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iea6b39133b297dc809e64a20d22156f59950db74
| | | | | | | | | | | | | | | | * merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-11-020-0/+0
| | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | * merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-11-010-0/+0
| | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | * merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-10-310-0/+0
| | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | * merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-10-300-0/+0
| | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | * merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-10-270-0/+0
| | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | * merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-10-260-0/+0
| | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-10-230-0/+0
| | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-10-200-0/+0
| | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-10-190-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-10-180-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-10-170-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-10-160-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-10-130-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | |\