summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* resolved conflicts for merge of a3e22d6a to masterAndrew Flynn2012-03-0151-188/+321
|\
| * am 0dca1ec4: New small/large screen division for Launcher.Andrew Flynn2012-03-0151-200/+322
| |\
| | * New small/large screen division for Launcher.Andrew Flynn2012-02-2951-200/+322
* | | Fix bug where widget min spans weren't being loaded on workspace bindAdam Cohen2012-02-291-0/+5
* | | Merge "Fix wallpaper offsets for live wallpapers on tablet"Michael Jurka2012-02-291-25/+17
|\ \ \
| * | | Fix wallpaper offsets for live wallpapers on tabletMichael Jurka2012-02-291-25/+17
* | | | Merge "Fixing flashing icon on delete, and offset of delete animation."Winson Chung2012-02-294-38/+43
|\ \ \ \
| * | | | Fixing flashing icon on delete, and offset of delete animation.Winson Chung2012-02-294-38/+43
* | | | | Merge "Fixing NPE when null intent passed to InstallShortcutReceiver. (Bug: 6...Winson Chung2012-02-291-2/+18
|\ \ \ \ \
| * | | | | Fixing NPE when null intent passed to InstallShortcutReceiver. (Bug: 6089830)Winson Chung2012-02-291-2/+18
| |/ / / /
* / / / / Import translations. DO NOT MERGEEric Fischer2012-02-2929-174/+87
|/ / / /
* | | | Merge "Fixing drag and drop framerate regression in workspace"Adam Cohen2012-02-281-10/+20
|\ \ \ \
| * | | | Fixing drag and drop framerate regression in workspaceAdam Cohen2012-02-281-10/+20
* | | | | Merge "When adding or moving a resizable widget, the widget may resize"Adam Cohen2012-02-289-145/+425
|\| | | |
| * | | | When adding or moving a resizable widget, the widget may resizeAdam Cohen2012-02-279-145/+425
| |/ / /
* / / / Import translations. DO NOT MERGEEric Fischer2012-02-2811-61/+31
|/ / /
* | | Import translations. DO NOT MERGEEric Fischer2012-02-2749-148/+290
* | | Merge "Mark string format tokens as placeholders."Eric Fischer2012-02-251-3/+3
|\ \ \
| * | | Mark string format tokens as placeholders.Eric Fischer2012-02-241-3/+3
* | | | Fixing typo.Winson Chung2012-02-241-1/+1
* | | | Prevent build break.Winson Chung2012-02-241-1/+1
* | | | Merge "Delaying building of hardware layers when Launcher is resumed"Michael Jurka2012-02-241-18/+11
|\ \ \ \
| * | | | Delaying building of hardware layers when Launcher is resumedMichael Jurka2012-02-241-18/+11
* | | | | Merge "Fixing issue where icons can't be clicked during launcher transition."Winson Chung2012-02-242-4/+4
|\ \ \ \ \
| * | | | | Fixing issue where icons can't be clicked during launcher transition.Winson Chung2012-02-242-4/+4
* | | | | | Fix a lot of easy lint issuesMichael Jurka2012-02-2420-120/+16
|/ / / / /
* | | | | am 91685094: am 79b79dd5: Remove unused sw600dp/ strings.Andrew Flynn2012-02-2450-1250/+1
|\ \ \ \ \ | |_|/ / / |/| | / / | | |/ / | |/| |
| * | | am 79b79dd5: Remove unused sw600dp/ strings.Andrew Flynn2012-02-2450-1250/+1
| |\ \ \ | | | |/ | | |/|
| | * | Remove unused sw600dp/ strings.Andrew Flynn2012-02-2450-1250/+1
* | | | Fixing issue where dragview was jagged when scaled.Winson Chung2012-02-231-2/+2
* | | | Merge "Tweaking pickup animation, vibration and removing glow from drag view."Winson Chung2012-02-235-5/+12
|\ \ \ \
| * | | | Tweaking pickup animation, vibration and removing glow from drag view.Winson Chung2012-02-235-5/+12
* | | | | Merge "Cancel scroll indicator fade during allapps/workspace transition"Michael Jurka2012-02-231-0/+3
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Cancel scroll indicator fade during allapps/workspace transitionMichael Jurka2012-02-231-0/+3
* | | | | Lowering long press time for workspace items.Winson Chung2012-02-235-41/+121
|/ / / /
* | | | Animating the widget previews on drag from AppsCustomize.Winson Chung2012-02-235-43/+44
* | | | Fading out workspace when dragging to higlight dragged object.Winson Chung2012-02-236-9/+26
* | | | Fixing issue where widget preloading not being cleaned up on failed dropAdam Cohen2012-02-221-6/+13
* | | | Merge "Allow touches to fall through AllApps nearing end of transition (Bug: ...Winson Chung2012-02-173-28/+101
|\ \ \ \
| * | | | Allow touches to fall through AllApps nearing end of transition (Bug: 5991846...Winson Chung2012-02-173-28/+101
| | |_|/ | |/| |
* / | | Updating shared preferences on background thread to prevent StrictMode violat...Winson Chung2012-02-161-18/+21
|/ / /
* | | am 1e1a4553: am ba50bbf6: Reconcile with ics-mr1-releaseThe Android Open Source Project2012-02-160-0/+0
|\| |
| * | am ba50bbf6: Reconcile with ics-mr1-releaseThe Android Open Source Project2012-02-160-0/+0
| |\|
| | * Reconcile with ics-mr1-releaseThe Android Open Source Project2012-02-160-0/+0
| | |\
* | | | am 75c77d92: am e93b5221: Reconcile with ics-mr1-releaseThe Android Open Source Project2012-02-160-0/+0
|\| | |
| * | | am e93b5221: Reconcile with ics-mr1-releaseThe Android Open Source Project2012-02-160-0/+0
| |\ \ \
| | * \ \ Reconcile with ics-mr1-releaseThe Android Open Source Project2012-02-160-0/+0
| | |\ \ \ | | | | |/ | | | |/|
| | | * | 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
| | | | | |\ \