Merge commit '811954cf77a702663b237165ab1b11a600b73d0d' into eclair-mr2
* commit '811954cf77a702663b237165ab1b11a600b73d0d':
Clean up name of static wallpapers.
Merge commit '87a8000440d92be900a997f89b21e3261df872f0' into eclair-mr2-plus-aosp
* commit '87a8000440d92be900a997f89b21e3261df872f0':
Bug 2290800 - Use a collator to sort the app labels.
Merge commit 'b0c27f254a9929be208d5e04554f438076c833bc' into eclair-mr2
* commit 'b0c27f254a9929be208d5e04554f438076c833bc':
Bug 2290800 - Use a collator to sort the app labels.
Merge commit '6b642891b9f24edc1020ee93a5d8049b0bef8c06'
* commit '6b642891b9f24edc1020ee93a5d8049b0bef8c06':
Rename special dump properity so we can set it on user builds.
Merge commit 'f3e114265bc3fe843330eeb31a6c6c7364e9bf31' into eclair-mr2-plus-aosp
* commit 'f3e114265bc3fe843330eeb31a6c6c7364e9bf31':
Import revised translations. DO NOT MERGE
Merge commit '1fdde7981b5d081cc3f76fe4bac08fbe10a67a03' into eclair-mr2-plus-aosp
* commit '1fdde7981b5d081cc3f76fe4bac08fbe10a67a03':
Rename special dump properity so we can set it on user builds.
Merge commit 'eaa01f68f24d78b15275a0ee39bc2d6e53f6733e' into eclair-mr2
* commit 'eaa01f68f24d78b15275a0ee39bc2d6e53f6733e':
Import revised translations. DO NOT MERGE
Merge commit 'eb5615d1af1ef38fd934590b9aec19e1d0cd0908' into eclair-mr2
* commit 'eb5615d1af1ef38fd934590b9aec19e1d0cd0908':
Rename special dump properity so we can set it on user builds.
Merge commit '3b14a66b50f33bcc205808f035deb640d83dc2b0'
* commit '3b14a66b50f33bcc205808f035deb640d83dc2b0':
Fix bug 2248173 - all apps animates out when you return home.
Merge commit 'db1eb1bd40f68d53a89085ff10e54dc22393791d'
* commit 'db1eb1bd40f68d53a89085ff10e54dc22393791d':
Improve performance of AllApps for large numbers of apps.
Merge commit 'b2b3fc99212eb5bfe012d57d17dd9d9aff5428b4' into eclair-mr2-plus-aosp
* commit 'b2b3fc99212eb5bfe012d57d17dd9d9aff5428b4':
Fix bug 2248173 - all apps animates out when you return home.
Merge commit '3b4304ad7ad92404db8aca00cbbf5d58cfc8153c' into eclair-mr2-plus-aosp
* commit '3b4304ad7ad92404db8aca00cbbf5d58cfc8153c':
Save 4 MB of space.
Merge commit '53b11e12d428c1eac0596567025ecc15343c4cf6' into eclair-mr2-plus-aosp
* commit '53b11e12d428c1eac0596567025ecc15343c4cf6':
Update a couple of wallpapers.
Merge commit '2b68660d0a5a83a42a0cfc1e9258bbbd2b96bfc3' into eclair-mr2-plus-aosp
* commit '2b68660d0a5a83a42a0cfc1e9258bbbd2b96bfc3':
Guard against null parent in Launcher2.Search.clearAnimation()
Merge commit '52f918e43a6a34a2bca2fb95ff0c72273b59305a' into eclair-mr2-plus-aosp
* commit '52f918e43a6a34a2bca2fb95ff0c72273b59305a':
Improve performance of AllApps for large numbers of apps.
Merge commit 'dbbf45b59ed5ebb2beed15b0a169f64e0632c71f' into eclair-mr2
* commit 'dbbf45b59ed5ebb2beed15b0a169f64e0632c71f':
Fix bug 2248173 - all apps animates out when you return home.
Merge commit '09cf7d19db69dc4ac0f3457590e8df539bfec7d1' into eclair-mr2
* commit '09cf7d19db69dc4ac0f3457590e8df539bfec7d1':
Update a couple of wallpapers.
Merge commit '600f188702c1ce8e5c250ea049a5e22f4ff17577' into eclair-mr2
* commit '600f188702c1ce8e5c250ea049a5e22f4ff17577':
Guard against null parent in Launcher2.Search.clearAnimation()
Merge commit '730c408ccc76dd7da2235a9af6c84d98d19e6b72' into eclair-mr2
* commit '730c408ccc76dd7da2235a9af6c84d98d19e6b72':
Improve performance of AllApps for large numbers of apps.
Before, Launcher relied on a callback to a SearchManager.OnCancelListener to clear the search widget
animation. However, that doesn't get called if some other app opens the search dialog
before the Launcher is reopened. This change clears the animation in onResume().
Should fix http://b/issue?id=2246760
Sometimes clearAnimation() is called on the search widget
when it has no parent, e.g. when it being removed from the
home screen. This caused an NPE, because clearAnimation()
called invalidate() on the parent.
This is a partial fix for: http://b/issue?id=2246760