summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am 8e56a75d: Merge "Cleaning up folders for 7-inch and 10-inch UIs" into ↵Adam Cohen2012-08-167-11/+34
|\ | | | | | | | | | | | | jb-mr1-dev * commit '8e56a75db48d8d62d7defbb64d91e03d430ae67c': Cleaning up folders for 7-inch and 10-inch UIs
| * Merge "Cleaning up folders for 7-inch and 10-inch UIs" into jb-mr1-devAdam Cohen2012-08-167-11/+34
| |\
| | * Cleaning up folders for 7-inch and 10-inch UIsAdam Cohen2012-08-157-11/+34
| | | | | | | | | | | | Change-Id: I44c068ea288e4683aa7dc9e86bdac6226bb42b75
* | | am ddfe9821: Remove unused importMichael Jurka2012-08-161-1/+0
|\| | | | | | | | | | | | | | * commit 'ddfe982177ecc03469d3b7f43d639b8e2967eebe': Remove unused import
| * | Remove unused importMichael Jurka2012-08-151-1/+0
| |/ | | | | | | Change-Id: I2eaf2b33e3b61fed86a468fbd221fd12191a396f
* | am 5c768e2f: Removing debugging background.Winson Chung2012-08-091-1/+0
|\| | | | | | | | | * commit '5c768e2fac95f8b8b2d6b5c523d7e1cdc968e395': Removing debugging background.
| * Removing debugging background.Winson Chung2012-08-091-1/+0
| | | | | | | | Change-Id: I2273e126a3005b253f5bab459e5d1574c315ece0
* | am 2a6d78ef: Merge "Initial changes for new 10inch layout." into jb-mr1-devWinson Chung2012-08-0815-158/+221
|\| | | | | | | | | * commit '2a6d78ef453f48d093bf2e22e90fe99b15aba97e': Initial changes for new 10inch layout.
| * Merge "Initial changes for new 10inch layout." into jb-mr1-devWinson Chung2012-08-0815-158/+221
| |\
| | * Initial changes for new 10inch layout.Winson Chung2012-08-0815-158/+221
| | | | | | | | | | | | Change-Id: Ifaafca469df626a76ab5e16bd2f0d5afa1da172c
* | | am 33650301: Set permission [UN]INSTALL_SHORTCUT protectionLevel to ↵Nick Kralevich2012-08-081-2/+2
|\| | | | | | | | | | | | | | | | | | | | \'dangerous\' * commit '33650301a204297ea7e7ea08b485245a7c9e5968': Set permission [UN]INSTALL_SHORTCUT protectionLevel to 'dangerous'
| * | Set permission [UN]INSTALL_SHORTCUT protectionLevel to 'dangerous'Nick Kralevich2012-08-071-2/+2
| |/ | | | | | | | | Bug: 5543177 Change-Id: I8b4f1899bc898ae95f9bca004e6fa959ee078903
* | am 1637d6d6: Fix adding widgets without config activitiesMichael Jurka2012-08-031-0/+3
|\| | | | | | | | | * commit '1637d6d64ac85d75b69b90fd976ed449046ccdc6': Fix adding widgets without config activities
| * Fix adding widgets without config activitiesMichael Jurka2012-08-031-0/+3
| | | | | | | | | | | | - only affected Launcher when it wasn't on the system partition Change-Id: Ia36d5a05463d7d3af0718cf694a0692a5098fc76
* | am 8a7d620a: am 4124016a: (-s ours) Reconcile with jb-mr0-release - do not mergeThe Android Open Source Project2012-07-310-0/+0
|\| | | | | | | * commit '8a7d620aa0ad7bada6f50b757d1bc328db1fe257':
| * 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
| | | |\
* | | | | am 0bcb5d90: Merge "Explicitly export content providers" into jb-mr1-devNick Kralevich2012-07-301-0/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '0bcb5d904455c930bd2d7b68a477da2fe43dbcea': Explicitly export content providers
| * | | | 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 1ef9e3d7: am 857b2ef0: am 2efda95e: Fixing landscape delete drop target ↵Winson Chung2012-07-301-0/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | padding. * commit '1ef9e3d7a71a2759335d35682018a5cc492def93': Fixing landscape delete drop target padding.
| * | | | | 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 062347a0: am 115b146c: Reconcile with jb-mr0-release jb-releaseThe Android Open Source Project2012-07-270-0/+0
|\| | | | | | | | | | | | | | | | | | | * commit '062347a08f29408f188a07a78e0b064fc7218c30':
| * | | | 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 281bcdb9: am 59fe4f10: am 8e1b4f65: am fa4086dd: Fixing issue where ↵Winson Chung2012-07-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | selected tab did not match AllApps page upon rotation. * commit '281bcdb98db1ccd14e0e175f193af927de3d528d':
| * | | | | | | 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 80e055ee: am efbe739a: am b8da744b: am 8ed3752f: Fix issue where widget ↵Adam Cohen2012-07-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | resize frame overlaps widget (issue 6493388) * commit '80e055ee81173b554b19d6c8076d602668648445':
| * | | | | | | | 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 3551e3cc: am 8165f0dd: resolve conflicts ↵Ed Heyl2012-07-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | w/4f174f1d27adbde6f50e11ee3a8eaf162a030284 * commit '3551e3cc6ca5ad0a39e22453a0665d0c55766ee3':
| * | | | | | | | | am 8165f0dd: resolve conflicts w/4f174f1d27adbde6f50e11ee3a8eaf162a030284Ed Heyl2012-07-256-37/+58
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '8165f0dd202a2c0fbf0816f7613d66938955dc76': Binding AllApps synchronously. (Bug 6855061)
* | | | | | | | | | | am 524809ba: am 90abcc94: resolved conflicts ↵Ed Heyl2012-07-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | w/0ede734d0780a968c9c345f99a18f9f8b9fc02cd * commit '524809ba1d68b2a0164e399a490df8e63eda8258':
| * | | | | | | | | | am 90abcc94: resolved conflicts w/0ede734d0780a968c9c345f99a18f9f8b9fc02cdEd Heyl2012-07-254-7/+61
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '90abcc94258ba9d9c8b68ac9764b6ab1eba12985': Ensuring that restoreInstanceState is being called promptly for synchronously bound page
* | | | | | | | | | | | am 0f76b9ad: Import translations. DO NOT MERGEYing Wang2012-07-261-1/+1
|\| | | | | | | | | | | | |_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0f76b9ad711221725b8b7fa1d2f396a35e8daeb2': Import translations. DO NOT MERGE
| * | | | | | | | | | Import translations. DO NOT MERGEYing Wang2012-07-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I98b96f809f1f8754f63690c601b487361d0f7165 Auto-generated-cl: translation import
* | | | | | | | | | | 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 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
* | | | | | | | | 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)