summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am 4124016a: (-s ours) Reconcile with jb-mr0-release - do not mergeThe Android Open Source Project2012-07-310-0/+0
|\ | | | | | | * commit '4124016ae5c8174aa53433894b896604ffa52c67':
| * Reconcile with jb-mr0-release - do not mergeThe Android Open Source Project2012-07-310-0/+0
| |\ | | | | | | | | | Change-Id: I96a076254209becd703d8a61d027bd41527f58fa
| | * merge in jb-mr0-release history after reset to jb-devThe Android Automerger2012-07-310-0/+0
| | |\
* | | \ Merge "Explicitly export content providers" into jb-mr1-devNick Kralevich2012-07-301-0/+1
|\ \ \ \
| * | | | Explicitly export content providersNick Kralevich2012-07-281-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In a future version of Android, the default value for <provider android:exported> will change from true to false. Explicitly set android:exported="true" Bug: 3306452 Change-Id: I8fcce3af6949eb245ea97b6e64c191f465f0ae5f
* | | | | am 857b2ef0: am 2efda95e: Fixing landscape delete drop target padding.Winson Chung2012-07-301-0/+1
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / / | | | | * commit '857b2ef099083cb2c35ed2b03030d0b8c6c80abf': Fixing landscape delete drop target padding.
| * | | am 2efda95e: Fixing landscape delete drop target padding.Winson Chung2012-07-301-0/+1
| |\| | | | | | | | | | | | | | | | | | * commit '2efda95e5a8f1b3ef78b209a9259f7040bbf16be': Fixing landscape delete drop target padding.
| | * | Fixing landscape delete drop target padding.Winson Chung2012-07-271-0/+1
| | | | | | | | | | | | | | | | Change-Id: I17ee4c69f2f4b154a2dc19416a97d1d91b45b53a
* | | | am 115b146c: Reconcile with jb-mr0-release jb-releaseThe Android Open Source Project2012-07-270-0/+0
|\| | | | | | | | | | | | | | | * commit '115b146cc2dc4b4f9d43b4cd761727d233fc297c':
| | \ \
| | \ \
| *-. \ \ 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 59fe4f10: am 8e1b4f65: am fa4086dd: Fixing issue where selected tab did ↵Winson Chung2012-07-251-8/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | not match AllApps page upon rotation. * commit '59fe4f1023267f48cd89b132f2c5d6741028bbaf': Fixing issue where selected tab did not match AllApps page upon rotation.
| * | | | | | | am 8e1b4f65: am fa4086dd: Fixing issue where selected tab did not match ↵Winson Chung2012-07-251-8/+5
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AllApps page upon rotation. * commit '8e1b4f65383d859ca7e2ebfc9a9463c8d46271de': Fixing issue where selected tab did not match AllApps page upon rotation.
| | * | | | | | 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 efbe739a: am b8da744b: am 8ed3752f: Fix issue where widget resize frame ↵Adam Cohen2012-07-250-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | overlaps widget (issue 6493388) * commit 'efbe739a1bf087ab95dd4c0d0d0bdbf8433e871f': Fix issue where widget resize frame overlaps widget (issue 6493388)
| * | | | | | | am b8da744b: am 8ed3752f: Fix issue where widget resize frame overlaps ↵Adam Cohen2012-07-250-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | widget (issue 6493388) * commit 'b8da744b1b7aa0fb1cded734618b788af2b8911f': Fix issue where widget resize frame overlaps widget (issue 6493388)
| | * | | | | | 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 8165f0dd: resolve conflicts w/4f174f1d27adbde6f50e11ee3a8eaf162a030284Ed Heyl2012-07-256-37/+58
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '8165f0dd202a2c0fbf0816f7613d66938955dc76': Binding AllApps synchronously. (Bug 6855061)
| * | | | | | | resolve conflicts w/4f174f1d27adbde6f50e11ee3a8eaf162a030284Ed Heyl2012-07-256-37/+58
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7ecce86e58af545aa18ea25e16978a1dce9dab8e
| | * | | | | | 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 90abcc94: resolved conflicts w/0ede734d0780a968c9c345f99a18f9f8b9fc02cdEd Heyl2012-07-254-7/+61
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '90abcc94258ba9d9c8b68ac9764b6ab1eba12985': Ensuring that restoreInstanceState is being called promptly for synchronously bound page
| * | | | | | | resolved conflicts w/0ede734d0780a968c9c345f99a18f9f8b9fc02cdEd Heyl2012-07-254-7/+61
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I50900698a590e8d84a6cbcc560f95209d3a6d110
| | * | | | | | 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
* | | / / / / Import translations. DO NOT MERGEYing Wang2012-07-251-1/+1
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I98b96f809f1f8754f63690c601b487361d0f7165 Auto-generated-cl: translation import
* | | | | | am bf5529bd: am a13a2f2a: Fixing issue where defered unbind was running ↵Adam Cohen2012-07-232-0/+17
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | after synchronous bind. (Bug 6858398, Bug 6863181) * commit 'bf5529bd401ad471658b878f313e32ed8639b479': Fixing issue where defered unbind was running after synchronous bind. (Bug 6858398, Bug 6863181)
| * | | | | 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 f39ac9b2: (-s ours) am 36e6c5bb: Disabling synchronous binding when ↵Winson Chung2012-07-200-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | returning home from another app while orientation has changed. (Bug 6792288) * commit 'f39ac9b25c158200a124060b3326d0017e4eb601': Disabling synchronous binding when returning home from another app while orientation has changed. (Bug 6792288)
| * | | | | 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
* | | | | Disabling synchronous binding when returning home from another app while ↵Winson Chung2012-07-194-9/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | Import translations. DO NOT MERGEYing Wang2012-07-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I88db0bd87c0cfcb9896ea0cb6c67a1edcb9fe6bd Auto-generated-cl: translation import
* | | | | am 38beb759: Reconcile with jb-mr0-releaseThe Android Open Source Project2012-07-190-0/+0
|\| | | | | | | | | | | | | | | | | | | * commit '38beb75989f517071635750d26ae5b34ee8b4a84':
| * | | | 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 12a2c9e4: (-s ours) am d7d37b13: DO NOT MERGE Adding sycnhronous loading ↵Adam Cohen2012-07-180-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | of current page to support seamless rotation. (Bug 6792288) * commit '12a2c9e41df573166e182d5e97067bfcb535558e': DO NOT MERGE Adding sycnhronous loading of current page to support seamless rotation. (Bug 6792288)
| * | | | 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
* | | | Fixing issue where we would crash when encountering improper launcher.dbsWinson Chung2012-07-181-13/+24
| | | | | | | | | | | | | | | | Change-Id: Ib07ca56cf1a2a04e2058cc8260d5dd917d525c64
* | | | Merge "Initial changes to synchronously load workspace on rotation."Winson Chung2012-07-184-476/+715
|\ \ \ \
| * | | | Initial changes to synchronously load workspace on rotation.Winson Chung2012-07-174-476/+715
| | | | | | | | | | | | | | | | | | | | Change-Id: Ia7cf80177fd0aee88aa3f4a731f5d6dc904bea16
* | | | | Merge "Fixing issue where we were not clearing the set of removed items ↵Winson Chung2012-07-172-10/+10
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | since the last event. (Bug 6749258)"
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-27 10:03:45 +0000