Merge commit 'af5b4cb27709e2e3d6c419e81ac87363e701ce5d' into eclair-mr2
* commit 'af5b4cb27709e2e3d6c419e81ac87363e701ce5d':
Fix 2305903 Scrolling trackball upwards at the top of the app menu selects app at the bottom left
Merge commit 'a276fc59f535a2fb05701e8f49bb7adf4cefb3b2' into eclair-mr2
* commit 'a276fc59f535a2fb05701e8f49bb7adf4cefb3b2':
Fix 2306862 - Launcher2 crashed: in libs/rs. Uploading texture without a context.
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
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.
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().
at the bottom of app drawer
This includes some contortions to get it not to perform the vibrate
haptic feedback then.
(By the way, it appears that we're vibrating on the add context menu
long press, so also do it when when we show the previews.
It's now sending them. The beeping and vibrating accessibility things
work, but we only have prebuilts for the speech one and it's not saying
anything and I can't debug it, so this will have to do.
We still won't be able to show a thumbnail, of course, but now instead of
crashing the picker we leave an empty box and write out a helpful Log.e such
as:
09-21 15:11:45.624: ERROR/Launcher(1539): Error decoding thumbnail resId=2130837544 for wallpaper #14
(Related to http://b/2113687.)
Now, home always goes to the center worksapce screen and back from an
app goes to all apps if it was open.
Getting that animations smooth took a little bit of work.
Also cherry-picks this from launcher 1
Fix issue #2133206: dialogs/menus should auto-dismiss when screen turns off
Close things out in various ways. This should be done for Launcher2 as well.
Change-Id: Id4f1c78e35180b437144c54ddcbf10069cc09071
Conflicts:
AndroidManifest.xml
src/com/android/launcher2/Launcher.java
Bjorn Bringert
Joe Onorato
Romain Guy
Jason Sams
Android (Google) Code Review
Daniel Sandler