16358 Commits

Author SHA1 Message Date
Dianne Hackborn
cbf9cb35bb Merge "Fix issue #3400119: API to specify a black background behind a window transition" 2011-03-02 17:19:39 -08:00
Dianne Hackborn
de75cb4738 Fix issue #3400119: API to specify a black background behind a window transition
There is now an API, which is used for task switching.

Also improved how we handle rotation animation when we can't take a
screen shot, to cleanly revert to the old freeze behavior.  This removes
the need to special case the emulator.

Change-Id: I7227432a2309370437ec6ac78db02c6f1e7eedd5
2011-03-02 17:15:58 -08:00
Amith Yamasani
a3c9ad7170 Merge "Fix a race condition when entering and exiting a preference fragment quickly." 2011-03-02 17:13:46 -08:00
Amith Yamasani
81d860013c Fix a race condition when entering and exiting a preference fragment quickly.
Bug: 3413715

Fragment was going through STARTED/RESUMED/STARTED/CREATED very quickly and
bindPreferences() was a delayed call that happened after mView was nullified.
Removing the MSG_BIND_PREFERENCES when view is destroyed.

Change-Id: Iec43102c004a266c412b993f17e1a8c1699fb0b1
2011-03-02 16:11:31 -08:00
Jeff Brown
192f0b0608 Merge "Fade out the mouse pointer after inactivity or other events." 2011-03-02 15:54:42 -08:00
Shimeng (Simon) Wang
0a25836486 Merge "Adjust actual scale when zoom density changes." 2011-03-02 15:45:27 -08:00
Jeff Brown
05dc66ada6 Fade out the mouse pointer after inactivity or other events.
Fades out the mouse pointer:
- after 15 seconds of inactivity normally
- after 3 seconds of inactivity in lights out mode
- after a non-modifier key down
- after a touch down

Extended the native Looper to support enqueuing time delayed
messages.  This is used by the PointerController to control
pointer fade timing.

Change-Id: I87792fea7dbe2d9376c78cf354fe3189a484d9da
2011-03-02 15:37:57 -08:00
Svetoslav Ganov
7fb34b29c6 Merge "Force close in WebView." 2011-03-02 15:24:58 -08:00
Svetoslav Ganov
fa44314d3a Force close in WebView.
bug:3504589

WebView#removeJavascriptInterface was not performing check if
a mWebViewCore instance is present. Added such a check.

Change-Id: I7f6dfe51a08f23dddf2fc94df635fdfa68e9a7cf
2011-03-02 14:54:07 -08:00
Adam Powell
e43111fad3 Merge "Fix bug 3502257 - overscroll effect api" 2011-03-02 14:41:35 -08:00
Adam Powell
07d6f7bd75 Fix bug 3502257 - overscroll effect api
Change-Id: I3bf8bb653e96151c51fb94b4571a72b210615e62
2011-03-02 14:27:30 -08:00
Shimeng (Simon) Wang
9cedbcfdf5 Adjust actual scale when zoom density changes.
Also some fine tuning of zoom scales.
1. Since overview scale will be used to determine min zoom scale, its own
computation shall be free of min zoom scale.
2. make sure mMaxZoomScale is at lease mMinZoomScale.
3. Use default scale in case of non-overview mode, since it reflects the
current zoom density.

issue: 3494868
Change-Id: I4297878b820e437b706bb7e0f143336ff1b39f82
2011-03-02 14:26:36 -08:00
Robert Greenwalt
7e48e76cab Merge "Start using NetworkUtils.numericToInetAddress." 2011-03-02 12:10:51 -08:00
Shimeng (Simon) Wang
25c0619b4b Merge "Revert "Remove the limitation that zoom can't go beyond overview scale."" 2011-03-02 11:53:17 -08:00
Christopher Tate
4418678c4c Merge "Fix binder proxy death notice tracking" 2011-03-02 11:48:37 -08:00
Shimeng (Simon) Wang
2c4ab3a510 Revert "Remove the limitation that zoom can't go beyond overview scale."
This reverts commit f1b391a1e3fc51f90f3afaae6623540cab326c8d.
2011-03-02 11:46:21 -08:00
Robert Greenwalt
e590373ea7 Start using NetworkUtils.numericToInetAddress.
Generates InetAddresses without risking an accidental dns lookup.  For use with supposedly
numeric-only ip address strings.

Change-Id: I694f3976ce1c6382854706f6557ea88a289add3a
2011-03-02 11:37:32 -08:00
Kenny Root
3dee21eb0f Merge "Switch to returnCode for IPackageDeleteObserver" 2011-03-02 08:50:42 -08:00
Kristian Monsen
2b323c7200 Merge "Fix from post submit review" 2011-03-02 03:27:47 -08:00
Kristian Monsen
65662b6b90 Fix from post submit review
Change-Id: I10d96b254dcf3cb04f8d5cdf4bc527c84c362c1c
https://android-git.corp.google.com/g/#change,99052
2011-03-02 10:59:54 +00:00
Vasu Nori
3cc66b30bf Merge "cosmetic fixes: removing unused members/imports" 2011-03-01 18:39:14 -08:00
Vasu Nori
d6c367f424 cosmetic fixes: removing unused members/imports
Change-Id: I307e5d5c7c1270d2590ba66f4c3d3b1a96646344
2011-03-01 18:37:52 -08:00
Vasu Nori
c3d979834e Merge "bug:3497143 don't print warning if it is a bug in platform - not in app." 2011-03-01 18:26:17 -08:00
Christopher Tate
bd8b6f25bb Fix binder proxy death notice tracking
There was an issue with stale recipient tracking when BinderProxy weak
references had been purged and a new proxy object allocated for a
still-live underlying IBinder.  The death recipient bookkeeping has
now been reworked so that it's fundmentally tied to the BinderProxy
instances, not maintained as global state, to prevent this sort of
confusion entirely.

Bug 3499939

Change-Id: I75c5216b6d53b90868ac969e32c9725201e51be3
2011-03-01 18:25:52 -08:00
Vasu Nori
8a358a7eed bug:3497143 don't print warning if it is a bug in platform - not in app.
fixing a couple of very confusing warnings..

Change-Id: I3c91fa53fc73a2fb4bee213e33af56c4bdb75fd8
2011-03-01 18:22:31 -08:00
Dianne Hackborn
e0edf4c1a2 Merge "Fix issue #3405957 com.android.settings: java.lang.NullPointerException..." 2011-03-01 17:36:25 -08:00
Dianne Hackborn
bfe2e3f9da Fix issue #3405957 com.android.settings: java.lang.NullPointerException...
...at android.app.DialogFragment.dismissInternal(DialogFragment.java:264)

Don't allow a DialogFragment to be dismissed twice.

Change-Id: Id2e9e3be1046b0d7862492c57c36001d8fd44a69
2011-03-01 17:20:43 -08:00
Dianne Hackborn
94b072b6f4 Merge "Fix issue #3411615: Crash when getting dialog layout inflator." 2011-03-01 17:18:10 -08:00
Romain Guy
ffe2c7a071 Merge "Don't account for scrollX/Y when drawing a display list in a layer." 2011-03-01 15:54:57 -08:00
Romain Guy
a7dabcd3df Don't account for scrollX/Y when drawing a display list in a layer.
Change-Id: I73bdcdab3e547d00ba2853aed550e65d5f8c6fcd
2011-03-01 15:48:57 -08:00
Adam Powell
549d2b15b5 Merge "Fix bug 3501411 - ListView should ignore "up" events outside of its view" 2011-03-01 15:41:58 -08:00
Adam Powell
498e43dd8e Fix bug 3501411 - ListView should ignore "up" events outside of its view
Do not dispatch item clicks if the up event occurs completely outside
of list bounds.

Change-Id: I2bc38040bcc98944e1449affcdbd75e0194637cf
2011-03-01 15:39:53 -08:00
Adam Cohen
e0d23e6fdc Merge "Adding mouse scroll wheel support to StackView" 2011-03-01 15:27:19 -08:00
Dianne Hackborn
606ecf3e9f Merge "Fix issue #3495749: Crash on choosing to open the downloaded images" 2011-03-01 15:26:44 -08:00
John Reck
7a3a51d0f5 Merge "Send correct cookies for HTML5 video when incognito" 2011-03-01 15:07:39 -08:00
Dianne Hackborn
25193d330e Fix issue #3411615: Crash when getting dialog layout inflator.
Well, I'm not sure it is right for onCreateDialog() to return a null
dialog, but if it does, let's not crash here.

Change-Id: I5ff49b9b3c326d9005f70a01435c01bfc7307343
2011-03-01 15:01:30 -08:00
Romain Guy
d643bb56fd Correctly mark layers dirty when drawing WebView.
Change-Id: I7ae0c3cfa0916d8fbeaf01e8da127c621a06a0f4
2011-03-01 14:55:21 -08:00
Romain Guy
e6c524022d Merge "Correctly mark layers dirty when drawing WebView." 2011-03-01 14:53:48 -08:00
Adam Cohen
a8a7c92b36 Adding mouse scroll wheel support to StackView
Change-Id: I8ae5039606b3080059cea579547f6c61586641e3
2011-03-01 14:48:53 -08:00
Dianne Hackborn
ce418e661a Fix issue #3495749: Crash on choosing to open the downloaded images
This is due to the window doing a relayout after its activity is
stopped, at which point it may need to interact with the adapter
to load data.

The fix here is to tell ViewRoot about an activity being stopped
and, if in this state, hold off on doing any new measurements and
layouts of the hierarchy until it is no longer stopped.

In this case the relayout was happening due to the cursor
being deactivated, with causes the adapter to invalidate
its data.  Because this is now in a dialog window, this
allows the window to actually be resized smaller (unlike when
in a full screen activity), and boom.

Change-Id: I26442b4679819b4a4e6bc56289afd3445526750b
2011-03-01 14:45:28 -08:00
John Reck
09407b4810 Send correct cookies for HTML5 video when incognito
Bug: 3489551

Change-Id: Ic35ec725e72e97830afff2fb0392b2300d8c45f6
2011-03-01 14:35:03 -08:00
Gilles Debunne
91b52b1895 Merge "AbsListView notifies scroll events to the ViewTreeObserver." 2011-03-01 13:55:16 -08:00
Kristian Monsen
e4dcf0948a Merge "Part of fix for bug 3489551 Browser doesn't send cookies for HTML5 video in incognito" 2011-03-01 13:12:24 -08:00
Derek Sollenberger
3545c72ce1 Merge "Don't update webkit at every stage of a zoom animation." 2011-03-01 12:58:31 -08:00
Derek Sollenberger
ac382cf581 Don't update webkit at every stage of a zoom animation.
This CL defers updating webkit until a zoom animation has completed.

bug: 3451126
Change-Id: I75a90f307a3493363811ba67ec4e55bfec9c0702
2011-03-01 15:50:27 -05:00
Fred Quintana
dfa28c3449 Merge "Fix a deadlock in AccountManagerService cause by different paths of code getting the mCacheLock and DB locks in different orders." 2011-03-01 12:30:06 -08:00
Kristian Monsen
469aebbbd9 Part of fix for bug 3489551 Browser doesn't send cookies for HTML5 video in incognito
Adding private mode parameter for some cookie operations.

Depends on this change in webkit:
https://android-git.corp.google.com/g/#change,99051

Change-Id: I304de625632c3d659bf0d7a6b6a6e2bec985ecb6
2011-03-01 20:25:36 +00:00
Mike Lockwood
04e1a9620f Merge "Move USB framework support from android.hardware to android.hardware.usb package" 2011-03-01 11:58:22 -08:00
Fred Quintana
f9f240e3ad Fix a deadlock in AccountManagerService cause by different
paths of code getting the mCacheLock and DB locks in different
orders.

The philosophy I followed for this was to ensure that the
DatabaseHelper is only ever accessed from within a
synchronized(mCacheLock) block. I also renamed a bunch of
methods to make it easier to know if a given method should
be called from within this synchronized block.

Bug: 3404506
Change-Id: Ia48f95e77b77647d0717f70f1d8364da3719cc13
2011-03-01 11:23:19 -08:00
Leon Scroggins
6e0e0ec980 Fix password field drawing.
Bug:3499916

Change-Id: Idb10e9780e6a0cfecd6228de0fbfd4a1035ab61e
2011-03-01 14:17:30 -05:00