summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | Address widget size callback issue for small phones (issue 6670346)Adam Cohen2012-06-172-10/+4
| | | |/ / | | |/| | | | | | | | | | | | Change-Id: I76fe87e11a665844f5ce1a76e1921342c285310e
* | | | | am 15254fc3: Import translations. DO NOT MERGEYing Wang2012-06-181-2/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '15254fc386975a8ce2e171de40efd6348d7f9fbb': Import translations. DO NOT MERGE
| * | | | Import translations. DO NOT MERGEYing Wang2012-06-181-2/+2
| |/ / / | | | | | | | | | | | | Change-Id: If95a78aef4c480a3b9f39189c124c8ad423cb8bd
* | | | am 7e4e4ba4: Merge "Removing logging in AppsCustomizePagedView (Bug ↵Winson Chung2012-06-144-42/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | 6597629)" into jb-dev * commit '7e4e4ba494e50d918a1573b2fa601c561037deae': Removing logging in AppsCustomizePagedView (Bug 6597629)
| * | | Merge "Removing logging in AppsCustomizePagedView (Bug 6597629)" into jb-devWinson Chung2012-06-144-42/+0
| |\ \ \ | | |/ / | |/| |
| | * | Removing logging in AppsCustomizePagedView (Bug 6597629)Winson Chung2012-06-114-42/+0
| | | | | | | | | | | | | | | | Change-Id: I58313d3b3536d3ee7eaae8459fbded41dc5dadec
* | | | am a35a7807: Merge "Fix NPE" into jb-devMichael Jurka2012-06-121-2/+2
|\| | | | | | | | | | | | | | | | | | | * commit 'a35a7807c27641187e6de5dee8dcd405b683e294': Fix NPE
| * | | Merge "Fix NPE" into jb-devMichael Jurka2012-06-111-2/+2
| |\ \ \ | | |/ / | |/| |
| | * | Fix NPEMichael Jurka2012-06-111-2/+2
| | | | | | | | | | | | | | | | | | | | Bug: 6643246 Change-Id: I0b3fed0fa4e4fc5f4e1eccc97c0ec8f23e55024d
* | | | am 898f152d: Merge "Adding additional synchronized blocks when committing ↵Winson Chung2012-06-122-11/+15
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | changes to the new-apps list. (Bug 6621553)" into jb-dev * commit '898f152d79e06828675361a176772cdf1cef56ca': Adding additional synchronized blocks when committing changes to the new-apps list. (Bug 6621553)
| * | | Merge "Adding additional synchronized blocks when committing changes to the ↵Winson Chung2012-06-112-11/+15
| |\ \ \ | | | | | | | | | | | | | | | new-apps list. (Bug 6621553)" into jb-dev
| | * | | Adding additional synchronized blocks when committing changes to the ↵Winson Chung2012-06-112-11/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | new-apps list. (Bug 6621553) Change-Id: Ia2553321230fec4202fa064cdc66ffd13d005281
* | | | | am db2bfa05: Merge "Fixing issue where play icon disappears after hitting ↵Winson Chung2012-06-121-3/+10
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | home (Bug 6636269)" into jb-dev * commit 'db2bfa05062b492664eff85c87dc6b725a9c983c': Fixing issue where play icon disappears after hitting home (Bug 6636269)
| * | | | Merge "Fixing issue where play icon disappears after hitting home (Bug ↵Winson Chung2012-06-111-3/+10
| |\ \ \ \ | | | | | | | | | | | | | | | | | | 6636269)" into jb-dev
| | * | | | Fixing issue where play icon disappears after hitting home (Bug 6636269)Winson Chung2012-06-081-3/+10
| | |/ / / | | | | | | | | | | | | | | | Change-Id: I1d1df992495413b3e8962dca8995602ae0aa2ca7
* | | | | am 12dd20d5: Merge "Fixing issue where we were not always invalidating the ↵Winson Chung2012-06-121-30/+26
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | page data when setting apps. (Bug 6549598)" into jb-dev * commit '12dd20d59bb8c2dbc957d171f091b78998f2015b': Fixing issue where we were not always invalidating the page data when setting apps. (Bug 6549598)
| * | | | Merge "Fixing issue where we were not always invalidating the page data when ↵Winson Chung2012-06-111-30/+26
| |\ \ \ \ | | | | | | | | | | | | | | | | | | setting apps. (Bug 6549598)" into jb-dev
| | * | | | Fixing issue where we were not always invalidating the page data when ↵Winson Chung2012-06-081-30/+26
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | setting apps. (Bug 6549598) Change-Id: I2fff41e87465608a21ffb7c91e988b33f8d54ee3
* | | | | am bc786aba: Merge "Removing logging (issue 6583911)" into jb-devAdam Cohen2012-06-111-23/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit 'bc786aba72a24ac956edde8b91a64ca6a80d9d5c': Removing logging (issue 6583911)
| * | | | Merge "Removing logging (issue 6583911)" into jb-devAdam Cohen2012-06-111-23/+0
| |\ \ \ \
| | * | | | Removing logging (issue 6583911)Adam Cohen2012-06-041-23/+0
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1f5579d13af1b3daa0734e04d72f60ac8075f29b
* | | | | | am 94309887: Improving overscroll paramaters for 7-inch devicesAdam Cohen2012-06-114-2/+13
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '94309887fe7ebcbb7236da2b261546be9649f7de': Improving overscroll paramaters for 7-inch devices
| * | | | | Improving overscroll paramaters for 7-inch devicesAdam Cohen2012-06-084-2/+13
| | |_|/ / | |/| | | | | | | | | | | | | Change-Id: Iba805137fca121bab7675eac22236af9642c27bb
* | | | | 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
| | | | | |\ \ \