summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Reconcile with jb-releaseThe Android Open Source Project2012-06-110-0/+0
|\
| * merge in jb-release history after reset to jb-devThe Android Automerger2012-06-110-0/+0
| |\
| | * merge in jb-release history after reset to jb-devThe Android Automerger2012-06-080-0/+0
| | |\
* | | \ am 5262bb3c: Merge "Fixing regression in transition after returning to home f...Winson Chung2012-06-081-12/+6
|\ \ \ \ | |/ / /
| * | | Merge "Fixing regression in transition after returning to home from another a...Winson Chung2012-06-081-12/+6
| |\ \ \
| | * | | Fixing regression in transition after returning to home from another app. (Bu...Winson Chung2012-06-071-12/+6
* | | | | am 8ec23033: Fix subtle folder jank related to previous changeAdam Cohen2012-06-081-6/+9
|\ \ \ \ \ | |/ / / /
| * | | | Fix subtle folder jank related to previous changeAdam Cohen2012-06-081-6/+9
* | | | | am ec3f3b92: Merge "Fix two pieces of folder jank" into jb-devAdam Cohen2012-06-083-23/+85
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Fix two pieces of folder jank" into jb-devAdam Cohen2012-06-083-23/+85
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Fix two pieces of folder jankAdam Cohen2012-06-073-23/+85
| | |/ /
* | | | am 07e4579f: Merge "Fixing issue where we weren\'t invalidating the correct p...Michael Jurka2012-06-071-0/+1
|\ \ \ \ | |/ / /
| * | | Merge "Fixing issue where we weren't invalidating the correct press feedback ...Michael Jurka2012-06-071-0/+1
| |\ \ \
| | * | | Fixing issue where we weren't invalidating the correct press feedback layout ...Winson Chung2012-06-071-0/+1
| | |/ /
* | | | am f615f710: allow voice search in recent appsAndy Huang2012-06-071-4/+2
|\ \ \ \ | |/ / /
| * | | allow voice search in recent appsAndy Huang2012-06-071-4/+2
| |/ /
| | |
| \ \
*-. \ \ Reconcile with jb-release nakasi-factoryrom-releaseThe Android Open Source Project2012-06-070-0/+0
|\ \ \ \ | | |_|/ | |/| |
| | * | Fixing issue with resource ids. (Bug 6532243)Winson Chung2012-05-313-0/+24
| * | | merge in jb-release history after reset to jb-devThe Android Automerger2012-06-070-0/+0
| |\ \ \ | | |_|/ | |/| |
| | * | Fixing ConcurrentModificationException (issue 6619380)Adam Cohen2012-06-063-34/+24
| | * | Defer loading widget previews until after All Apps transitionMichael Jurka2012-06-061-2/+13
| | * | merge in jb-release history after reset to jb-devThe Android Automerger2012-06-060-0/+0
| | |\ \
| | | * | Fix workaround for crashing on rotation. (Bug 6611883)Adam Cohen2012-06-051-11/+18
| | | * | Workaround for crashing on rotation. (Bug 6611883)Winson Chung2012-06-051-1/+2
| | | * | merge in jb-release history after reset to jb-devThe Android Automerger2012-06-050-0/+0
| | | |\ \
| | | | * \ merge in jb-release history after reset to jb-devThe Android Automerger2012-06-030-0/+0
| | | | |\ \
| | | | | * \ merge in jb-release history after reset to jb-devThe Android Automerger2012-05-310-0/+0
| | | | | |\ \
* | | | | | \ \ am 47824440: Merge "Synchronizing on the new-apps list before modifying it. (...Winson Chung2012-06-0612-29/+35
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge "Synchronizing on the new-apps list before modifying it. (Bug 6621553)"...Winson Chung2012-06-0612-29/+35
| |\ \ \ \ \ \ \
| | * | | | | | | Synchronizing on the new-apps list before modifying it. (Bug 6621553)Winson Chung2012-06-0612-29/+35
* | | | | | | | | am 57660325: Merge "Update 600dp clings." into jb-devAndrew Flynn2012-06-062-2/+4
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge "Update 600dp clings." into jb-devAndrew Flynn2012-06-062-2/+4
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Update 600dp clings.Andrew Flynn2012-06-062-2/+4
| | | |/ / / / / / | | |/| | | | | |
* | | | | | | | | am 3d50932a: Fixing ConcurrentModificationException (issue 6619380)Adam Cohen2012-06-063-34/+24
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Fixing ConcurrentModificationException (issue 6619380)Adam Cohen2012-06-063-34/+24
* | | | | | | | | am 5b7fcb7a: Merge "Defer loading widget previews until after All Apps transi...Michael Jurka2012-06-061-2/+13
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge "Defer loading widget previews until after All Apps transition" into jb...Michael Jurka2012-06-061-2/+13
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Defer loading widget previews until after All Apps transitionMichael Jurka2012-06-061-2/+13
| | | |_|/ / / / / | | |/| | | | | |
* | | | | | | | | am b21b749b: Import translations. DO NOT MERGEEric Fischer2012-06-061-3/+3
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Import translations. DO NOT MERGEEric Fischer2012-06-061-3/+3
| | |/ / / / / / | |/| | | | | |
* | | | | | | | am fa31ac21: Merge "Revert "Lock launcher to portrait on devices less than sw...Jeff Brown2012-06-051-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge "Revert "Lock launcher to portrait on devices less than sw720dp"" into ...Jeff Brown2012-06-051-1/+1
| |\ \ \ \ \ \ \
| | * | | | | | | Revert "Lock launcher to portrait on devices less than sw720dp"Jeff Brown2012-06-041-1/+1
* | | | | | | | | am 5637b87d: Fix workaround for crashing on rotation. (Bug 6611883)Adam Cohen2012-06-051-11/+18
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Fix workaround for crashing on rotation. (Bug 6611883)Adam Cohen2012-06-051-11/+18
* | | | | | | | | am 67640c0c: Workaround for crashing on rotation. (Bug 6611883)Winson Chung2012-06-051-1/+2
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Workaround for crashing on rotation. (Bug 6611883)Winson Chung2012-06-051-1/+2
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | am e6d3361e: Merge "Don\'t set hard width/height for cling OK button." into j...Andrew Flynn2012-06-052-4/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge "Don't set hard width/height for cling OK button." into jb-devAndrew Flynn2012-06-052-4/+0
| |\ \ \ \ \ \ \
| | * | | | | | | Don't set hard width/height for cling OK button.Andrew Flynn2012-06-052-4/+0
| | | |_|/ / / / | | |/| | | | |