summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Reconcile with jb-releaseThe Android Open Source Project2012-06-110-0/+0
|\ | | | | | | Change-Id: I0d94ab9864f2742cd8647643f3acf7cdb4e770c7
| * 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 ↵Winson Chung2012-06-081-12/+6
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | from another app. (Bug 6629707)" into jb-dev * commit '5262bb3c4c4cd4fb566a5003154fa97edcde138b': Fixing regression in transition after returning to home from another app. (Bug 6629707)
| * | | Merge "Fixing regression in transition after returning to home from another ↵Winson Chung2012-06-081-12/+6
| |\ \ \ | | | | | | | | | | | | | | | app. (Bug 6629707)" into jb-dev
| | * | | Fixing regression in transition after returning to home from another app. ↵Winson Chung2012-06-071-12/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (Bug 6629707) Change-Id: Iadb2ff5752dafdd3ff9a4854ddbd24fd2ee467a6
* | | | | am 8ec23033: Fix subtle folder jank related to previous changeAdam Cohen2012-06-081-6/+9
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '8ec2303379eb467e063113385c9514063abed787': Fix subtle folder jank related to previous change
| * | | | Fix subtle folder jank related to previous changeAdam Cohen2012-06-081-6/+9
| | | | | | | | | | | | | | | | | | | | Change-Id: I1872201eb80ad927bbdc9b95578c599a17696deb
* | | | | am ec3f3b92: Merge "Fix two pieces of folder jank" into jb-devAdam Cohen2012-06-083-23/+85
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit 'ec3f3b92f0d3e545f1921b6111a34541000f416c': Fix two pieces of folder jank
| * | | | 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
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | -> Folder icon gets clipped when animating from dock as well as a couple other cases (issue 5849615) -> Blip when creating folder (issue 6623095) Change-Id: I638c9a7876de2f87eb8e96a9eb192fa4a127fb4a
* | | | am 07e4579f: Merge "Fixing issue where we weren\'t invalidating the correct ↵Michael Jurka2012-06-071-0/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | press feedback layout (Bug: 6628324)" into jb-dev * commit '07e4579f60dc25ce1ad610d780ef62abebdaf9f4': Fixing issue where we weren't invalidating the correct press feedback layout (Bug: 6628324)
| * | | Merge "Fixing issue where we weren't invalidating the correct press feedback ↵Michael Jurka2012-06-071-0/+1
| |\ \ \ | | | | | | | | | | | | | | | layout (Bug: 6628324)" into jb-dev
| | * | | Fixing issue where we weren't invalidating the correct press feedback layout ↵Winson Chung2012-06-071-0/+1
| | |/ / | | | | | | | | | | | | | | | | | | | | (Bug: 6628324) Change-Id: I50e3ce86c2643cbbc5d87e7250e0ab4c34dbff3d
* | | | am f615f710: allow voice search in recent appsAndy Huang2012-06-071-4/+2
|\| | | | | | | | | | | | | | | | | | | * commit 'f615f710bb1a1c6fdccb538c1add4db5925d7799': allow voice search in recent apps
| * | | allow voice search in recent appsAndy Huang2012-06-071-4/+2
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | Voice search is now a fullscreen activity, and results now appear inline, so the user expectation is that it appears in the 'recent apps' list. Bug: 6491501 Change-Id: I1dfd27e19601a6876e7e1c31cbf2fea955cae899
| | |
| \ \
*-. \ \ Reconcile with jb-release nakasi-factoryrom-releaseThe Android Open Source Project2012-06-070-0/+0
|\ \ \ \ | | |_|/ | |/| | | | | | Change-Id: I21de3186d1a880575b7309675845e6b382c5882c
| | * | Fixing issue with resource ids. (Bug 6532243)Winson Chung2012-05-313-0/+24
| | | | | | | | | | | | | | | | Change-Id: Ie4a245a224038a750e60b0203003638fd561713d
| * | | 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
| | | | | | | | | | | | | | | | Change-Id: I49d293a79a463d129e829f823d6b213f3d5ffcf4
| | * | Defer loading widget previews until after All Apps transitionMichael Jurka2012-06-061-2/+13
| | | | | | | | | | | | | | | | Bug: 6615463
| | * | 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
| | | | | | | | | | | | | | | | | | | | Change-Id: Iaf9734d156e5aa48f3630f22a42e17d71af37316
| | | * | Workaround for crashing on rotation. (Bug 6611883)Winson Chung2012-06-051-1/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: Iae24d865fb5a5572c6d3e8726569d234a60ce05c
| | | * | 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
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (Bug 6621553)" into jb-dev * commit '478244409e15594ceaa7426a6a23cc805db0b1fc': Synchronizing on the new-apps list before modifying it. (Bug 6621553)
| * | | | | | | Merge "Synchronizing on the new-apps list before modifying it. (Bug ↵Winson Chung2012-06-0612-29/+35
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | 6621553)" into jb-dev
| | * | | | | | | Synchronizing on the new-apps list before modifying it. (Bug 6621553)Winson Chung2012-06-0612-29/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Minor tweak to qsb padding - Adding yet more logging for single-app-page issue Change-Id: I4272dd7a70c9ac26f026b03a1f991f14844fdb9d
* | | | | | | | | am 57660325: Merge "Update 600dp clings." into jb-devAndrew Flynn2012-06-062-2/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '5766032503a4ace048e69d6540a46134a858cbb9': Update 600dp clings.
| * | | | | | | | Merge "Update 600dp clings." into jb-devAndrew Flynn2012-06-062-2/+4
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Update 600dp clings.Andrew Flynn2012-06-062-2/+4
| | | |/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Assign minWidth to 'OK' button - Move all_apps_cling 'OK' button higher Bug: 6535310 Change-Id: Idceecb0bc4ca77c81127e7c24fce79347527e00d
* | | | | | | | | am 3d50932a: Fixing ConcurrentModificationException (issue 6619380)Adam Cohen2012-06-063-34/+24
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '3d50932a93dd367537db3548bde29d1380b371c0': Fixing ConcurrentModificationException (issue 6619380)
| * | | | | | | | Fixing ConcurrentModificationException (issue 6619380)Adam Cohen2012-06-063-34/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I49d293a79a463d129e829f823d6b213f3d5ffcf4
* | | | | | | | | am 5b7fcb7a: Merge "Defer loading widget previews until after All Apps ↵Michael Jurka2012-06-061-2/+13
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | transition" into jb-dev * commit '5b7fcb7a8bee95b5c59dd296c6b022e3d1c55102': Defer loading widget previews until after All Apps transition
| * | | | | | | | Merge "Defer loading widget previews until after All Apps transition" into ↵Michael Jurka2012-06-061-2/+13
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jb-dev
| | * | | | | | | | Defer loading widget previews until after All Apps transitionMichael Jurka2012-06-061-2/+13
| | | |_|/ / / / / | | |/| | | | | | | | | | | | | | | Bug: 6615463
* | | | | | | | | am b21b749b: Import translations. DO NOT MERGEEric Fischer2012-06-061-3/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b21b749bb333f0ba436c7e6a60a259bfd3cb3987': Import translations. DO NOT MERGE
| * | | | | | | | Import translations. DO NOT MERGEEric Fischer2012-06-061-3/+3
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | Change-Id: I5c5f651d689f9000ae91b88b32695589dcf6449d
* | | | | | | | am fa31ac21: Merge "Revert "Lock launcher to portrait on devices less than ↵Jeff Brown2012-06-051-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sw720dp"" into jb-dev * commit 'fa31ac2102a2dad041463a56048d83c2e4ce9098': Revert "Lock launcher to portrait on devices less than sw720dp"
| * | | | | | | Merge "Revert "Lock launcher to portrait on devices less than sw720dp"" into ↵Jeff Brown2012-06-051-1/+1
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | jb-dev
| | * | | | | | | Revert "Lock launcher to portrait on devices less than sw720dp"Jeff Brown2012-06-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 51726adc25b0b32e79bbf7dd912d5ebb69682767 Bug: 6580571
* | | | | | | | | am 5637b87d: Fix workaround for crashing on rotation. (Bug 6611883)Adam Cohen2012-06-051-11/+18
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '5637b87d8b71f2af1794abcd980d9d7ffacb7333': Fix workaround for crashing on rotation. (Bug 6611883)
| * | | | | | | | Fix workaround for crashing on rotation. (Bug 6611883)Adam Cohen2012-06-051-11/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iaf9734d156e5aa48f3630f22a42e17d71af37316
* | | | | | | | | am 67640c0c: Workaround for crashing on rotation. (Bug 6611883)Winson Chung2012-06-051-1/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '67640c0cbe27e6c83b69070d23ea50c4a6f18447': Workaround for crashing on rotation. (Bug 6611883)
| * | | | | | | | Workaround for crashing on rotation. (Bug 6611883)Winson Chung2012-06-051-1/+2
| | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | Change-Id: Iae24d865fb5a5572c6d3e8726569d234a60ce05c
* | | | | | | | am e6d3361e: Merge "Don\'t set hard width/height for cling OK button." into ↵Andrew Flynn2012-06-052-4/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jb-dev * commit 'e6d3361ee85bf88f1f55970d7d80a20b31ea9ea7': Don't set hard width/height for cling OK button.
| * | | | | | | 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
| | | |_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6587934 Change-Id: I0cb153006f3c852a9b7427c0944d9b55e3a955d8