summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Import revised translations.Eric Fischer2011-11-107-34/+24
| | | | Change-Id: Id043c66c0446498c7e4e55ea9e0d913a3b803ffb
* am b37d23b0: am 929fff0e: Potential fix for launcher lockup (5369863)Michael Jurka2011-11-090-0/+0
|\ | | | | | | | | * commit 'b37d23b02867811cf15299645d73ba3b2856d59a': Potential fix for launcher lockup (5369863)
| * am 929fff0e: Potential fix for launcher lockup (5369863)Michael Jurka2011-11-090-0/+0
| |\ | | | | | | | | | | | | * commit '929fff0e747f1361db19e62f8a1e462cffc0a7b6': Potential fix for launcher lockup (5369863)
| | * Potential fix for launcher lockup (5369863)Michael Jurka2011-11-071-100/+100
| | | | | | | | | | | | - also, removing unused parameters and doing some function renames
* | | am 2632ca01: Merge "Ensuring disabled apps don\'t appear in workspace ↵Adam Cohen2011-11-071-0/+13
|\| | | | | | | | | | | | | | | | | | | | (issue: 5557311)" into ics-mr1 * commit '2632ca01e1127a33845f832b60be3df24d73b0f4': Ensuring disabled apps don't appear in workspace (issue: 5557311)
| * | Merge "Ensuring disabled apps don't appear in workspace (issue: 5557311)" ↵Adam Cohen2011-11-071-0/+13
| |\ \ | | | | | | | | | | | | into ics-mr1
| | * | Ensuring disabled apps don't appear in workspace (issue: 5557311)Adam Cohen2011-11-071-0/+13
| | | | | | | | | | | | | | | | Change-Id: I4a016b200945779f6e73b9c9d1c2a13c2b0fdef9
* | | | am a0654a35: Merge "Altering touch feedback for qsb assets. (Bug: 5560273)" ↵Winson Chung2011-11-076-18/+48
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | into ics-mr1 * commit 'a0654a3523cecfaa0800086753b8738ce3bc1d35': Altering touch feedback for qsb assets. (Bug: 5560273)
| * | | Merge "Altering touch feedback for qsb assets. (Bug: 5560273)" into ics-mr1Winson Chung2011-11-076-18/+48
| |\ \ \
| | * | | Altering touch feedback for qsb assets. (Bug: 5560273)Winson Chung2011-11-036-18/+48
| | |/ / | | | | | | | | | | | | | | | | | | | | - Removing some dead code Change-Id: If6f3ffcf28249ca08c23089acb5bcd501b455119
* | | | am 6c53e555: (-s ours) Merge "Import revised translations. DO NOT MERGE" ↵Eric Fischer2011-11-070-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | into ics-mr1 * commit '6c53e555e9358ea41aec28d8098623a35f24e32f': Import revised translations. DO NOT MERGE
| * | | Merge "Import revised translations. DO NOT MERGE" into ics-mr1Eric Fischer2011-11-0711-116/+66
| |\ \ \
| | * | | Import revised translations. DO NOT MERGEEric Fischer2011-11-0711-116/+66
| | |/ / | | | | | | | | | | | | Change-Id: I2e8275f3d8c160bf32154ec0d9f63fa34d077bf9
* | | | Reconcile with ics-mr1-releaseThe Android Open Source Project2011-11-070-0/+0
|\ \ \ \ | | | | | | | | | | | | | | | Change-Id: I89b1421563c2b3e43421e1a8c04b484b450f5327
| * \ \ \ merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-11-060-0/+0
| |\ \ \ \ | | |/ / / | |/| | |
* | | | | am acec6719: Merge "Cleaning up overscroll effect in launcher workspace" ↵Adam Cohen2011-11-054-13/+79
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into ics-mr1 * commit 'acec6719208a59ccf32bfd4f46e383c9400945d9': Cleaning up overscroll effect in launcher workspace
| * | | | Merge "Cleaning up overscroll effect in launcher workspace" into ics-mr1Adam Cohen2011-11-044-13/+79
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Cleaning up overscroll effect in launcher workspaceAdam Cohen2011-11-034-13/+79
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -> Making sure workspace is drawn above the hotseat and qsb -> Dimming the dock divider and page indicator during overscroll Change-Id: I40766aa88e58db2d102c11d1ae8b2455aa459a07
* | | | | Reconcile with ics-mr1-releaseThe Android Open Source Project2011-11-040-0/+0
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | Change-Id: I037563d8ac58380fbe57a781c0b9da3dd7b7c255
| * | | | 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
| | | | | | | | | | | | | | |\ \ \
| | | | | | | | | | | | | | | * \ \ merge in ics-release history after reset to masterThe Android Automerger2011-10-120-0/+0
| | | | | | | | | | | | | | | |\ \ \
| | | | | | | | | | | | | | | | * \ \ merge in ics-release history after reset to masterThe Android Automerger2011-10-110-0/+0
| | | | | | | | | | | | | | | | |\ \ \
| | | | | | | | | | | | | | | | | * \ \ merge in ics-release history after reset to masterThe Android Automerger2011-10-090-0/+0
| | | | | | | | | | | | | | | | | |\ \ \
| | | | | | | | | | | | | | | | | | * \ \ merge in ics-release history after reset to masterThe Android Automerger2011-10-060-0/+0
| | | | | | | | | | | | | | | | | | |\ \ \
| | | | | | | | | | | | | | | | | | | * \ \ merge in ics-release history after reset to masterThe Android Automerger2011-10-050-0/+0
| | | | | | | | | | | | | | | | | | | |\ \ \
| | | | | | | | | | | | | | | | | | | | * \ \ merge in ics-release history after reset to masterThe Android Automerger2011-10-040-0/+0
| | | | | | | | | | | | | | | | | | | | |\ \ \
| | | | | | | | | | | | | | | | | | | | | * \ \ merge in ics-release history after reset to masterThe Android Automerger2011-10-030-0/+0
| | | | | | | | | | | | | | | | | | | | | |\ \ \
| | | | | | | | | | | | | | | | | | | | | | * \ \ merge in ics-release history after reset to masterThe Android Automerger2011-09-300-0/+0
| | | | | | | | | | | | | | | | | | | | | | |\ \ \
| | | | | | | | | | | | | | | | | | | | | | | * \ \ merge in ics-release history after reset to masterThe Android Automerger2011-09-280-0/+0
| | | | | | | | | | | | | | | | | | | | | | | |\ \ \
| | | | | | | | | | | | | | | | | | | | | | | | * \ \ merge in ics-release history after reset to masterThe Android Automerger2011-09-280-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | |\ \ \
| | | | | | | | | | | | | | | | | | | | | | | | | * \ \ merge in ics-release history after reset to masterThe Android Automerger2011-09-270-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \
| | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ merge in ics-release history after reset to masterThe Android Automerger2011-09-250-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | * | | Updating default workspace, fixing missing Browser icon. (5358657)Winson Chung2011-09-221-18/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ibdfbc5084afacfa951355e2e7582d5a86fd742a5
| | | | | | | | | | | | | | | | | | | | | | | | | | | * | | merge in ics-release history after reset to masterThe Android Automerger2011-09-220-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ merge in ics-release history after reset to masterThe Android Automerger2011-09-210-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ merge in ics-release history after reset to masterThe Android Automerger2011-09-200-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \