summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
*-. Reconcile with jb-mr0-release jb-releaseThe Android Open Source Project2012-07-270-0/+0
|\ \ | | | | | | | | | Change-Id: I3742aff353335629ae76eacc2d92a6aed87b1ebe
| | * merge in jb-release history after reset to jb-devThe Android Automerger2012-07-240-0/+0
| | |\
| | | * merge in jb-release history after reset to jb-devThe Android Automerger2012-07-180-0/+0
| | | |\ | | | |/ | | |/|
| * | | merge in jb-mr0-release history after reset to jb-devThe Android Automerger2012-07-260-0/+0
| |\ \ \
| | * \ \ merge in jb-mr0-release history after reset to jb-devThe Android Automerger2012-07-240-0/+0
| | |\ \ \
* | | | | | am fa4086dd: Fixing issue where selected tab did not match AllApps page upon ↵Winson Chung2012-07-251-8/+5
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rotation. * commit 'fa4086ddd7ab9dd98e3ffef798a655ec07e37e14': Fixing issue where selected tab did not match AllApps page upon rotation.
| * | | | | Fixing issue where selected tab did not match AllApps page upon rotation.Winson Chung2012-07-251-8/+5
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4f32ca7cca042b94bdaea5cf259c397404546e0d
* | | | | | am 8ed3752f: Fix issue where widget resize frame overlaps widget (issue 6493388)Adam Cohen2012-07-251-6/+18
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '8ed3752f03d4b6c27297fa4fc9d4e153df47bbf3': Fix issue where widget resize frame overlaps widget (issue 6493388)
| * | | | | Fix issue where widget resize frame overlaps widget (issue 6493388)Adam Cohen2012-07-251-6/+18
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib1e53a7df49b26ecb19880e58b19876b80cfb12c
* | | | | | am c93e5ae1: Binding AllApps synchronously. (Bug 6855061)Winson Chung2012-07-256-51/+76
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c93e5ae12018bb214099ff88a48cc21580aec4c3': Binding AllApps synchronously. (Bug 6855061)
| * | | | | Binding AllApps synchronously. (Bug 6855061)Winson Chung2012-07-246-51/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Also ensuring that we restore to the settling page index if it is in motion Change-Id: I9c6760383113f7614f6cb962ab6562b0e7eb7138
* | | | | | am 1462de39: Ensuring that restoreInstanceState is being called promptly for ↵Adam Cohen2012-07-244-8/+61
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | synchronously bound page * commit '1462de39f01cec0ba785386532719cb0207dd827': Ensuring that restoreInstanceState is being called promptly for synchronously bound page
| * | | | | Ensuring that restoreInstanceState is being called promptly for ↵Adam Cohen2012-07-244-8/+61
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | synchronously bound page Change-Id: I0e71c29f553ad360ec42a6a0b2529d16cbddd437
* | | | | am a13a2f2a: Fixing issue where defered unbind was running after synchronous ↵Adam Cohen2012-07-232-0/+17
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bind. (Bug 6858398, Bug 6863181) * commit 'a13a2f2a7bd0550d1ad973f760ff25e1a4137c43': Fixing issue where defered unbind was running after synchronous bind. (Bug 6858398, Bug 6863181)
| * | | | Fixing issue where defered unbind was running after synchronous bind. (Bug ↵Adam Cohen2012-07-232-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6858398, Bug 6863181) Change-Id: I03dc3ae18528901cc88c79638a8495c1ab8d61af
* | | | | am 36e6c5bb: Disabling synchronous binding when returning home from another ↵Winson Chung2012-07-193-9/+50
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | app while orientation has changed. (Bug 6792288) * commit '36e6c5bb232f3a876753b91fb9ec604cda8664a5': Disabling synchronous binding when returning home from another app while orientation has changed. (Bug 6792288)
| * | | | Disabling synchronous binding when returning home from another app while ↵Winson Chung2012-07-193-9/+50
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | orientation has changed. (Bug 6792288) - Fixing issue where we were reverting to the first page of the workspace after launching an application from all apps, rotating, and returning home - Enabling rotation in master. Change-Id: I291b9d76b20244e9028b6f62164430bc3606644c
* | | | Reconcile with jb-mr0-releaseThe Android Open Source Project2012-07-190-0/+0
|\ \ \ \ | | |/ / | |/| | | | | | Change-Id: I8eadf20cd941fbf298677537d3771780eca0b07b
| * | | merge in jb-mr0-release history after reset to jb-devThe Android Automerger2012-07-180-0/+0
| |\ \ \ | | |/ / | |/| |
| | * | merge in jb-mr0-release history after reset to jb-devThe Android Automerger2012-07-110-0/+0
| | |\|
* | | | am d7d37b13: DO NOT MERGE Adding sycnhronous loading of current page to ↵Adam Cohen2012-07-185-443/+687
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | support seamless rotation. (Bug 6792288) * commit 'd7d37b134b7a3b12858ff099069eba369a6b5373': DO NOT MERGE Adding sycnhronous loading of current page to support seamless rotation. (Bug 6792288)
| * | | DO NOT MERGE Adding sycnhronous loading of current page to support seamless ↵Adam Cohen2012-07-185-443/+687
| |/ / | | | | | | | | | | | | | | | rotation. (Bug 6792288) Change-Id: I341160e8a604cde63443e331f762cebc1ed5ec0c
* | | am 827a5580: Fixing issue where drop target text was not showing in tablet ↵Winson Chung2012-07-112-37/+0
|\| | | | | | | | | | | | | | | | | | | | ui. (Bug 6789399) * commit '827a55807303c31ee289b352fb300f97562dfa43': Fixing issue where drop target text was not showing in tablet ui. (Bug 6789399)
| * | Fixing issue where drop target text was not showing in tablet ui. (Bug 6789399)Winson Chung2012-07-102-37/+0
| | | | | | | | | | | | Change-Id: I619f0a0118e53cfc703870fcc9083bb9bf1855b2
* | | Reconcile with jb-releaseThe Android Open Source Project2012-06-290-0/+0
|\ \ \ | | |/ | |/| | | | Change-Id: Id4de428001ead0dc7fd1cc38a594b2704e1879af
| * | merge in jb-release history after reset to jb-devThe Android Automerger2012-06-280-0/+0
| |\ \ | | |/ | |/|
| | * merge in jb-release history after reset to jb-devThe Android Automerger2012-06-260-0/+0
| | |\
* | | | am e76e36f4: Merge "Disallowing touches through the custom workspace cling. ↵Winson Chung2012-06-271-3/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | (Bug 6721250)" into jb-dev * commit 'e76e36f420c4e0ff2198eeadc86a3b2acfa2479a': Disallowing touches through the custom workspace cling. (Bug 6721250)
| * | | Merge "Disallowing touches through the custom workspace cling. (Bug ↵Winson Chung2012-06-271-3/+0
| |\ \ \ | | |/ / | |/| | | | | | 6721250)" into jb-dev
| | * | Disallowing touches through the custom workspace cling. (Bug 6721250)Winson Chung2012-06-271-3/+0
| | | | | | | | | | | | | | | | Change-Id: I0d932716f2095036ee0205f6bd0d28c6b832a9be
* | | | am 9dc25f06: Merge "Fixing concurrent modification exception when iterating ↵Winson Chung2012-06-251-3/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | through new apps list. (Bug 6621553)" into jb-dev * commit '9dc25f06a870938a2adb976194da78574825e83e': Fixing concurrent modification exception when iterating through new apps list. (Bug 6621553)
| * | | Merge "Fixing concurrent modification exception when iterating through new ↵Winson Chung2012-06-251-3/+4
| |\ \ \ | | | | | | | | | | | | | | | apps list. (Bug 6621553)" into jb-dev
| | * | | Fixing concurrent modification exception when iterating through new apps ↵Winson Chung2012-06-251-3/+4
| | |/ / | | | | | | | | | | | | | | | | | | | | list. (Bug 6621553) Change-Id: Idf4fae51c65e0e53520740dd0b2050eeac00b251
* | | | Reconcile with jb-releaseThe Android Open Source Project2012-06-190-0/+0
|\ \ \ \ | | |_|/ | |/| | | | | | Change-Id: Id1dce27a5a2dc5fd8af5cafd7501d59f54614df3
| * | | merge in jb-release history after reset to jb-devThe Android Automerger2012-06-190-0/+0
| |\ \ \ | | |/ / | |/| |
* | | | Reconcile with jb-releaseThe Android Open Source Project2012-06-190-0/+0
|\ \ \ \ | | |/ / | |/| | | | | | Change-Id: If9e036e4156d80d4990cb53a8f7a259df27fb7ce
| * | | merge in jb-release history after reset to jb-devThe Android Automerger2012-06-160-0/+0
| |\ \ \ | | |_|/ | |/| |
| | * | merge in jb-release history after reset to jb-devThe Android Automerger2012-06-120-0/+0
| | |\ \
* | | \ \ am eb04476d: Merge "Fix issue where "X" would appear over QSB bar in ↵Michael Jurka2012-06-181-2/+2
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | landscape mode" into jb-dev * commit 'eb04476def775427a4d216c9ce32e53da5ad4765': Fix issue where "X" would appear over QSB bar in landscape mode
| * | | | Merge "Fix issue where "X" would appear over QSB bar in landscape mode" into ↵Michael Jurka2012-06-181-2/+2
| |\ \ \ \ | | | | | | | | | | | | | | | | | | jb-dev
| | * | | | Fix issue where "X" would appear over QSB bar in landscape modeMichael Jurka2012-06-181-2/+2
| | | |/ / | | |/| | | | | | | | | | | | | | | | | Bug: 6655204 Change-Id: I8d456314ebba23a4c84781ee0e2cdd261784382a
* | | | | am d74389d9: Merge "Add null pointer checks to fix NPEs" into jb-devMichael Jurka2012-06-182-1/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit 'd74389d9027a128da85be151670ee43e55feaba5': Add null pointer checks to fix NPEs
| * | | | Merge "Add null pointer checks to fix NPEs" into jb-devMichael Jurka2012-06-182-1/+4
| |\ \ \ \
| | * | | | Add null pointer checks to fix NPEsMichael Jurka2012-06-182-1/+4
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6611233 Bug: 6685401 Change-Id: I804dfe0a7ad36b43168f7384ef88459d765fff6b
* | | | | am a71d745a: Merge "Address widget size callback issue for small phones ↵Adam Cohen2012-06-182-10/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (issue 6670346)" into jb-dev * commit 'a71d745ab3449c29f86aa2da8e1848d6edf40dbe': Address widget size callback issue for small phones (issue 6670346)
| * | | | Merge "Address widget size callback issue for small phones (issue 6670346)" ↵Adam Cohen2012-06-182-10/+4
| |\ \ \ \ | | | | | | | | | | | | | | | | | | into jb-dev
| | * | | | 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)