summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Import translations. DO NOT MERGE"Baligh Uddin2013-05-311-2/+2
|\
| * Import translations. DO NOT MERGEBaligh Uddin2013-05-291-2/+2
| | | | | | | | | | Change-Id: I19c5f6393e20c8582ed93f87f5373a55e1dbe537 Auto-generated-cl: translation import
* | Fix for issue 7178173, item disappearing from folderAdam Cohen2013-05-302-15/+21
|/ | | | Change-Id: I8e4e2f04053a2fc29ca38dc130f39c57c5c019f7
* am 08732898: (-s ours) Reconcile with jb-mr2-release - do not mergeThe Android Open Source Project2013-05-290-0/+0
|\ | | | | | | * commit '087328986922a36bef6f1829790e0840516405a4':
| * Reconcile with jb-mr2-release - do not mergeThe Android Open Source Project2013-05-290-0/+0
| |\ | | | | | | | | | Change-Id: Ib54cc659fb7a4fc18df8f98b1c12547d46e23e8e
| | * merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-05-290-0/+0
| | |\
* | | | am dee6975a: am 8a196351: Fixing issue where FastBitmapDrawable is not ↵Winson Chung2013-05-281-1/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | scaling the drawing into the correct bounds. (Bug 9075810) * commit 'dee6975aaab2eeea21aa02bb4fc7f844e016048c': Fixing issue where FastBitmapDrawable is not scaling the drawing into the correct bounds. (Bug 9075810)
| * | | am 8a196351: Fixing issue where FastBitmapDrawable is not scaling the ↵Winson Chung2013-05-281-1/+2
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | drawing into the correct bounds. (Bug 9075810) * commit '8a196351ef7e100857e6c6d5b344d1d780584887': Fixing issue where FastBitmapDrawable is not scaling the drawing into the correct bounds. (Bug 9075810)
| | * | Fixing issue where FastBitmapDrawable is not scaling the drawing into the ↵Winson Chung2013-05-281-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | correct bounds. (Bug 9075810) Change-Id: I3a72f51d6b3c934a5fa42a3478dcb2c363047957
* | | | am 9be6ae72: (-s ours) Reconcile with jb-mr2-release - do not mergeThe Android Open Source Project2013-05-210-0/+0
|\| | | | | | | | | | | | | | | * commit '9be6ae7264fd203f353a37604a50a963e5814143':
| * | | Reconcile with jb-mr2-release - do not mergeThe Android Open Source Project2013-05-210-0/+0
| |\ \ \ | | | |/ | | |/| | | | | Change-Id: I0aa0d8aac380b7cf08b0fcefe06005c7903bf21a
| | * | merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-05-210-0/+0
| | |\ \ | | | |/ | | |/|
* | | | am dba56d08: am 2b030fd2: Merge "Persist list of shortcuts to install on ↵Michael Jurka2013-05-201-7/+106
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | home workspace" into jb-mr2-dev * commit 'dba56d0812f3f769c7006b65ee27b920bc4f2672': Persist list of shortcuts to install on home workspace
| * | | am 2b030fd2: Merge "Persist list of shortcuts to install on home workspace" ↵Michael Jurka2013-05-201-7/+106
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | into jb-mr2-dev * commit '2b030fd2737bff44d570cb786cc9bc6c22557436': Persist list of shortcuts to install on home workspace
| | * | Merge "Persist list of shortcuts to install on home workspace" into jb-mr2-devMichael Jurka2013-05-201-7/+106
| | |\ \
| | | * | Persist list of shortcuts to install on home workspaceMichael Jurka2013-05-201-7/+106
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 8707110 Change-Id: I6740350040dceb0edaf4295d6a5af62a088a3055
* | | | | am 3c73e01b: am c402cd99: Fixing slow binding when returning to LauncherMichael Jurka2013-05-204-56/+112
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '3c73e01b11cb77b6727e851f54843387bd3198fb': Fixing slow binding when returning to Launcher
| * | | | am c402cd99: Fixing slow binding when returning to LauncherMichael Jurka2013-05-204-56/+112
| |\| | | | | | | | | | | | | | | | | | | | | | | * commit 'c402cd9992d431b6beacdf3c75e31cf103e230cb': Fixing slow binding when returning to Launcher
| | * | | Fixing slow binding when returning to LauncherMichael Jurka2013-05-204-56/+112
| | |/ / | | | | | | | | | | | | | | | | | | | | Bug: 8978842 Bug: 8660324 Change-Id: Idfa37c05ed299faa465ea66de4b43d30da77ecbc
* | | | am e29b9ae4: (-s ours) Reconcile with jb-mr2-release - do not mergeThe Android Open Source Project2013-05-170-0/+0
|\| | | | | | | | | | | | | | | * commit 'e29b9ae47bc21bb582dd6a0fb57796c09d3c8722':
| * | | Reconcile with jb-mr2-release - do not mergeThe Android Open Source Project2013-05-170-0/+0
| |\ \ \ | | | |/ | | |/| | | | | Change-Id: I777d9066b0b198cfcb65bd17b8206d9d046b8d51
| | * | merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-05-160-0/+0
| | |\ \ | | | |/ | | |/|
* | | | am 9ad2c67a: (-s ours) Reconcile with jb-mr2-release - do not mergeThe Android Open Source Project2013-05-160-0/+0
|\| | | | | | | | | | | | | | | * commit '9ad2c67ab0da915134dc6020f57cce8f7cb30c70':
| * | | Reconcile with jb-mr2-release - do not mergeThe Android Open Source Project2013-05-160-0/+0
| |\ \ \ | | | |/ | | |/| | | | | Change-Id: Idda6bd6033cfd90ecd4a54ccd3e286940ad12d5a
| | * | merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-05-150-0/+0
| | |\ \
| | | * \ merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-05-090-0/+0
| | | |\ \
| | | | * \ merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-05-080-0/+0
| | | | |\ \
| | | | | * \ merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-05-070-0/+0
| | | | | |\ \
| | | | | | * \ merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-05-060-0/+0
| | | | | | |\ \
| | | | | | | * \ merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-04-300-0/+0
| | | | | | | |\ \
| | | | | | | | * \ merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-04-290-0/+0
| | | | | | | | |\ \
| | | | | | | | | * \ merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-04-250-0/+0
| | | | | | | | | |\ \
| | | | | | | | | | * \ merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-04-240-0/+0
| | | | | | | | | | |\ \
| | | | | | | | | | | * \ merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-04-230-0/+0
| | | | | | | | | | | |\ \
| | | | | | | | | | | | * \ merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-04-220-0/+0
| | | | | | | | | | | | |\ \
| | | | | | | | | | | | | * \ merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-04-170-0/+0
| | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | * \ merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-04-160-0/+0
| | | | | | | | | | | | | | |\ \
* | | | | | | | | | | | | | | | | am 43b596b4: am 447bf84d: Debug time spent in onResumeMichael Jurka2013-05-152-1/+24
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '43b596b4b96b7cba7164291b52787e5c62098fd8': Debug time spent in onResume
| * | | | | | | | | | | | | | | | am 447bf84d: Debug time spent in onResumeMichael Jurka2013-05-152-1/+24
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '447bf84d2454ac28ac26d70feea8139ed986c321': Debug time spent in onResume
| | * | | | | | | | | | | | | | | Debug time spent in onResumeMichael Jurka2013-05-152-1/+24
| | |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 8660324 Also, fix regression where new app icons didn't bounce/animate in Bug: 8707110
* | | | | | | | | | | | | | | | am 659784dc: am 94dcefa4: Merge "Fix bug where apps weren\'t appearing on ↵Michael Jurka2013-05-142-19/+64
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | workspace after being installed" into jb-mr2-dev * commit '659784dc297e6062a7c1cfb6b0c5c200bf809ad1': Fix bug where apps weren't appearing on workspace after being installed
| * | | | | | | | | | | | | | | am 94dcefa4: Merge "Fix bug where apps weren\'t appearing on workspace after ↵Michael Jurka2013-05-142-19/+64
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | being installed" into jb-mr2-dev * commit '94dcefa43564a5f6de4ea1be91b624110d024ed0': Fix bug where apps weren't appearing on workspace after being installed
| | * | | | | | | | | | | | | | Merge "Fix bug where apps weren't appearing on workspace after being ↵Michael Jurka2013-05-142-19/+64
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | installed" into jb-mr2-dev
| | | * | | | | | | | | | | | | | Fix bug where apps weren't appearing on workspace after being installedMichael Jurka2013-05-142-19/+64
| | | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 8707110 Change-Id: Ib50e0c600a4a77450127f3947aa894346dc99a5a
* | | | | | | | | | | | | | | | am 07381ae4: am cdbbab76: Fixing NPE in Workspace.removeItemsByPackageName() ↵Winson Chung2013-05-141-3/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (Bug 8942242) * commit '07381ae4e4a24466c6f2d81a3e6736c9fda5bb19': Fixing NPE in Workspace.removeItemsByPackageName() (Bug 8942242)
| * | | | | | | | | | | | | | | am cdbbab76: Fixing NPE in Workspace.removeItemsByPackageName() (Bug 8942242)Winson Chung2013-05-141-3/+3
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'cdbbab76e1e6e2819c16e0c2d3b528cf4ecd48c5': Fixing NPE in Workspace.removeItemsByPackageName() (Bug 8942242)
| | * | | | | | | | | | | | | | Fixing NPE in Workspace.removeItemsByPackageName() (Bug 8942242)Winson Chung2013-05-131-3/+3
| | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1f63e548caa4b00b7166db4a53307c80650d8907
* | | | | | | | | | | | | | | am 42e22357: am 56d796a9: Merge "Fixing issue where updating the visibility ↵Winson Chung2013-05-087-63/+114
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | of one application can trigger all icons to disappear. (Bug 8757421)" into jb-mr2-dev * commit '42e2235780046beba1ea3162f615cef06cf97728': Fixing issue where updating the visibility of one application can trigger all icons to disappear. (Bug 8757421)
| * | | | | | | | | | | | | | am 56d796a9: Merge "Fixing issue where updating the visibility of one ↵Winson Chung2013-05-087-63/+114
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | application can trigger all icons to disappear. (Bug 8757421)" into jb-mr2-dev * commit '56d796a9b09725fc44714bc2216d6bc6c4746b95': Fixing issue where updating the visibility of one application can trigger all icons to disappear. (Bug 8757421)
| | * | | | | | | | | | | | | Merge "Fixing issue where updating the visibility of one application can ↵Winson Chung2013-05-087-63/+114
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | trigger all icons to disappear. (Bug 8757421)" into jb-mr2-dev