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
Activity#showDialog on CreateShortcut
I'm not sure how this can happen, but I think it's okay to just
drop the exception. It's all just trying to clean up anyway.
Now:
- When you're on the workspace and you press home, it animates back to the middle
- When you're in all apps and you press home, all apps animates out and the workspace
doesn't animate to the middle (it just jumps there)
- When you're in an app and you press home, it doesn't animate to the middle
- When you're in an app and you press back, it still goes to the page you were on.
Don't look at the evil hack to make it move without animating.
Merge commit 'e05f457b74a1b69133d9df81fb27d376fb625122' into eclair-mr2-plus-aosp
* commit 'e05f457b74a1b69133d9df81fb27d376fb625122':
Fix bugs 226264 and 2265943 - Home stopped responding to touch, but all-apps & notification panel
Merge commit 'a5c32d6ecc9da6d47cf59554bebf5d0dbe4f99d2' into eclair-mr2
* commit 'a5c32d6ecc9da6d47cf59554bebf5d0dbe4f99d2':
Fix bugs 226264 and 2265943 - Home stopped responding to touch, but all-apps & notification panel
still work
I knew it was a problem with mWaitingForResult, which I'm still not convinced we need, but
Jeff Sharkey was able to find repro steps, so he's my new hero. The steps were:
1. Open add menu (long pressing or menu > add)
2. Turn off the screen
3. Turn back on & unlock
4. Poof.
The problem was that when we get ACTION_CLOSE_SYSTEM_DIALOGS intents, we're dismissing the dialogs,
not canceling them. I think we actually want to cancel them, but there's no easy way to do that
with the Activity class, so just clear mWaitingForResult by hand in closeSystemDialogs().
Merge commit 'fc35534e007326676cc5a997f695a0847d2d5583'
* commit 'fc35534e007326676cc5a997f695a0847d2d5583':
Fix bug 2266095 - all apps animates out when you return home by hitting back
Merge commit '1d8c3b3b87d09c1c7d4fa84f101ce5f6c526715c'
* commit '1d8c3b3b87d09c1c7d4fa84f101ce5f6c526715c':
Add more logging for bugs 2262649, 2262272 and 2265943.
Merge commit '1d44a3f43fec2972c1b855677f010cb82919cb35' into eclair-mr2-plus-aosp
* commit '1d44a3f43fec2972c1b855677f010cb82919cb35':
Fix bug 2266095 - all apps animates out when you return home by hitting back
Merge commit '247226b1d57dfc6571bdb7c83787e63f7409f2ab' into eclair-mr2
* commit '247226b1d57dfc6571bdb7c83787e63f7409f2ab':
Fix bug 2266095 - all apps animates out when you return home by hitting back
Merge commit 'fe3276cfd9c40245d09faa8da75af61d454cfd40' into eclair-mr2-plus-aosp
* commit 'fe3276cfd9c40245d09faa8da75af61d454cfd40':
Add more logging for bugs 2262649, 2262272 and 2265943.
Merge commit '39bfc13a77b25aa9e1dc322b223030545c9af2c1' into eclair-mr2
* commit '39bfc13a77b25aa9e1dc322b223030545c9af2c1':
Add more logging for bugs 2262649, 2262272 and 2265943.
The Android Automerger
Android (Google) Code Review
Romain Guy
Jason Sams
Joe Onorato