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
Merge commit 'cb878268233ddd71011645bbbf03614f43855356' into eclair-mr2-plus-aosp
* commit 'cb878268233ddd71011645bbbf03614f43855356':
Final final set of wallpapers.
Merge commit '4634af5de99153cea5d602a1ce2a50ae2bcd991d' into eclair-mr2
* commit '4634af5de99153cea5d602a1ce2a50ae2bcd991d':
Final final set of wallpapers.
Merge commit '7a51fbbfb55c30921f0677b84483ef030e397d6f'
* commit '7a51fbbfb55c30921f0677b84483ef030e397d6f':
Fix 2271080 - .lang.IllegalArgumentException: no dialog with id 1 was ever shown via
Merge commit '419a204638c1cfb941c35837f7b8636c0ab8ec1e'
* commit '419a204638c1cfb941c35837f7b8636c0ab8ec1e':
Fix bug 2271894 - Odd animation when press home button from app that wasn't in center home screen
Merge commit '7331e95ec1021860de76d5c3e7a1193afe38be96'
* commit '7331e95ec1021860de76d5c3e7a1193afe38be96':
Fix 2274291 - back key doesn't go from all apps to workspace
Merge commit 'a1f60aaf295d1b16d2fa2eb87c74490876f3ea6d'
* commit 'a1f60aaf295d1b16d2fa2eb87c74490876f3ea6d':
Fix 2271141 - Pressing the bottom corner of the screen when the applications menu is visible will
Merge commit 'c3549480e903d22cada75ed34ac6b2ea2e5f92bb' into eclair-mr2-plus-aosp
* commit 'c3549480e903d22cada75ed34ac6b2ea2e5f92bb':
Fix 2271080 - .lang.IllegalArgumentException: no dialog with id 1 was ever shown via
Merge commit '920beea4547a199a882894eb511ff4d7d85c0c87' into eclair-mr2-plus-aosp
* commit '920beea4547a199a882894eb511ff4d7d85c0c87':
Fix bug 2271894 - Odd animation when press home button from app that wasn't in center home screen
Merge commit '3035b5c7be5543c77f6a90d647c5e2da78077d1b' into eclair-mr2-plus-aosp
* commit '3035b5c7be5543c77f6a90d647c5e2da78077d1b':
Fix 2274291 - back key doesn't go from all apps to workspace
Merge commit 'c38160c86ba022430cb00e4a1c5555391f9a2ec3' into eclair-mr2-plus-aosp
* commit 'c38160c86ba022430cb00e4a1c5555391f9a2ec3':
Fix 2271141 - Pressing the bottom corner of the screen when the applications menu is visible will
Merge commit 'cc19a53d6149491e58d2c2a749345a70b7492ec8' into eclair-mr2
* commit 'cc19a53d6149491e58d2c2a749345a70b7492ec8':
Fix 2271080 - .lang.IllegalArgumentException: no dialog with id 1 was ever shown via
Merge commit '14f122bf847e50a3e7730ccbe57abc25d086a01b' into eclair-mr2
* commit '14f122bf847e50a3e7730ccbe57abc25d086a01b':
Fix bug 2271894 - Odd animation when press home button from app that wasn't in center home screen
Merge commit '88ec0990c66702158d3c7f2f6ef5c03531978247' into eclair-mr2
* commit '88ec0990c66702158d3c7f2f6ef5c03531978247':
Fix 2274291 - back key doesn't go from all apps to workspace
Merge commit '61597bd5fdc4f8704478101c1ae166ab2d0c503c' into eclair-mr2
* commit '61597bd5fdc4f8704478101c1ae166ab2d0c503c':
Fix 2271141 - Pressing the bottom corner of the screen when the applications menu is visible will
Bjorn Bringert
Jason Sams
Joe Onorato
Android (Google) Code Review
Romain Guy
The Android Automerger