summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am ab864720: am ddfe9821: Remove unused importMichael Jurka2012-08-161-1/+0
|\ | | | | | | | | * commit 'ab864720166bfe1bfa13505ac6e3ce43a0e4ea90': Remove unused import
| * 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
* | | Import translations. DO NOT MERGEBaligh Uddin2012-08-161-1/+1
| | | | | | | | | | | | | | | Change-Id: I1d357a84b3ae26d7999900ef910e8d7480071f03 Auto-generated-cl: translation import
* | | am d634dee1: am 5c768e2f: Removing debugging background.Winson Chung2012-08-091-1/+0
|\| | | | | | | | | | | | | | * commit 'd634dee10dd779af6aa213f3b6c255a52f10bf01': Removing debugging background.
| * | 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 f2d3248c: am 2a6d78ef: Merge "Initial changes for new 10inch layout." ↵Winson Chung2012-08-0815-158/+221
|\| | | | | | | | | | | | | | | | | | | | into jb-mr1-dev * commit 'f2d3248c305f2147925cd01674a81d9f9b60e4d7': Initial changes for new 10inch layout.
| * | 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 7ba833ea: am 33650301: Set permission [UN]INSTALL_SHORTCUT ↵Nick Kralevich2012-08-081-2/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | protectionLevel to \'dangerous\' * commit '7ba833ea7f053b1073bce618a864bdd0a7e6ebe5': Set permission [UN]INSTALL_SHORTCUT protectionLevel to 'dangerous'
| * | | 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 a6104e29: am 1637d6d6: Fix adding widgets without config activitiesMichael Jurka2012-08-031-0/+3
|\| | | | | | | | | | | | | | * commit 'a6104e290aed6d7f83223946e6c199191e645ee5': Fix adding widgets without config activities
| * | 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 cb4a1e65: (-s ours) am 8a7d620a: am 4124016a: (-s ours) Reconcile with ↵The Android Open Source Project2012-07-310-0/+0
|\| | | | | | | | | | | | | | | | | jb-mr0-release - do not merge * commit 'cb4a1e65ff9e416d5a6a56628cc8732aa5066761':
| * | 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 abb3d697: am 0bcb5d90: Merge "Explicitly export content providers" into ↵Nick Kralevich2012-07-301-0/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jb-mr1-dev * commit 'abb3d697c872dbc29ce5cfa376369e724c7e362c': Explicitly export content providers
| * | | | | 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 1de99398: am 1ef9e3d7: am 857b2ef0: am 2efda95e: Fixing landscape delete ↵Winson Chung2012-07-301-0/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | drop target padding. * commit '1de99398c31e726ce168b4d92af3601922e1d025': Fixing landscape delete drop target padding.
| * | | | | | 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 3e956208: am 062347a0: am 115b146c: Reconcile with jb-mr0-release jb-releaseThe Android Open Source Project2012-07-270-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '3e956208e08b54792209a38bd4e3a01f8fe64109':
| * | | | | 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 89ab04fa: am 281bcdb9: am 59fe4f10: am 8e1b4f65: am fa4086dd: Fixing ↵Winson Chung2012-07-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | issue where selected tab did not match AllApps page upon rotation. * commit '89ab04fad414d8619437fce158c7671ae0a107a3':
| * | | | | | | | 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 be8aa3a8: am 80e055ee: am efbe739a: am b8da744b: am 8ed3752f: Fix issue ↵Adam Cohen2012-07-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | where widget resize frame overlaps widget (issue 6493388) * commit 'be8aa3a8093f541402eded22e84b05ed0768e5b2':
| * | | | | | | | 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 bf29b8cd: am 3551e3cc: am 8165f0dd: resolve conflicts ↵Ed Heyl2012-07-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | w/4f174f1d27adbde6f50e11ee3a8eaf162a030284 * commit 'bf29b8cdd643947579b94911d387fbbf66f2096c':
| * | | | | | | | | am 3551e3cc: am 8165f0dd: resolve conflicts ↵Ed Heyl2012-07-260-0/+0
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | w/4f174f1d27adbde6f50e11ee3a8eaf162a030284 * commit '3551e3cc6ca5ad0a39e22453a0665d0c55766ee3':
* | | | | | | | | | | am 1e3839b2: am 524809ba: am 90abcc94: resolved conflicts ↵Ed Heyl2012-07-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | w/0ede734d0780a968c9c345f99a18f9f8b9fc02cd * commit '1e3839b21858ad0ff80470ac345151880653e24c':
| * | | | | | | | | | am 524809ba: am 90abcc94: resolved conflicts ↵Ed Heyl2012-07-260-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | w/0ede734d0780a968c9c345f99a18f9f8b9fc02cd * commit '524809ba1d68b2a0164e399a490df8e63eda8258':
* | | | | | | | | | | | am 60beeda7: (-s ours) am 0f76b9ad: Import translations. DO NOT MERGEYing Wang2012-07-260-0/+0
|\| | | | | | | | | | | | |_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | * commit '60beeda72609b4193cdda312c368e4daf319ffa2':
| * | | | | | | | | | am 0f76b9ad: Import translations. DO NOT MERGEYing Wang2012-07-261-1/+1
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0f76b9ad711221725b8b7fa1d2f396a35e8daeb2': Import translations. DO NOT MERGE
* | | | | | | | | | | | 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.