Robert Ly
e985c3a9bd
am 4c433225: Merge "Doc change: animation devguide topic" into honeycomb
...
* commit '4c4332250d9e6d2cb746625cc232052561c4d450':
Doc change: animation devguide topic
2011-01-19 22:12:05 -08:00
Robert Ly
4c4332250d
Merge "Doc change: animation devguide topic" into honeycomb
2011-01-19 22:09:47 -08:00
Romain Guy
821b82aaa1
am ed8f8dd8: Merge "Add rounded rects and circles support to OpenGLRenderer." into honeycomb
...
* commit 'ed8f8dd8cf621d6046db7e083f8a36205ed55609':
Add rounded rects and circles support to OpenGLRenderer.
2011-01-19 21:54:34 -08:00
Adam Powell
db0d26348f
am 818a7bbf: Merge "Better fix for bug 3112733" into honeycomb
...
* commit '818a7bbfb42061d67aae0d5c725cecd0261c9643':
Better fix for bug 3112733
2011-01-19 21:54:30 -08:00
Romain Guy
ed8f8dd8cf
Merge "Add rounded rects and circles support to OpenGLRenderer." into honeycomb
2011-01-19 21:52:49 -08:00
Romain Guy
01d58e43ed
Add rounded rects and circles support to OpenGLRenderer.
...
Change-Id: I6cedf2b495d58de7c0437096809fa9e4518a1b8c
2011-01-19 21:55:10 -08:00
Adam Powell
818a7bbfb4
Merge "Better fix for bug 3112733" into honeycomb
2011-01-19 21:52:33 -08:00
Patrick Dubroy
ce06e78db1
am a6abd062: previewImage API shouldn\'t be hidden.
...
* commit 'a6abd062bf437fc69131a2797d6974953dd6cd83':
previewImage API shouldn't be hidden.
2011-01-19 21:45:06 -08:00
Robert Ly
f99b782b9f
Doc change: animation devguide topic
...
Change-Id: I52cdd29616f7f30784c0f8352c035493c8d413dc
2011-01-19 21:39:45 -08:00
Patrick Dubroy
a6abd062bf
previewImage API shouldn't be hidden.
2011-01-19 21:39:01 -08:00
Adam Powell
5f83a6017b
Better fix for bug 3112733
...
Make sure PopupWindows set to clip to the screen and that are anchored
to another view do not clip off the top of the screen.
Change-Id: I6ef9d61982dfda18a4ee7c69128932f5e08aa884
2011-01-19 21:09:43 -08:00
Huahui Wu
15ef4168a9
am 961d2c6a: Merge "b/3350774 avoid screen jumping when pinching to zoom." into honeycomb
...
* commit '961d2c6acf9a4a61648f040aaaf1e40a83674d59':
b/3350774 avoid screen jumping when pinching to zoom.
2011-01-19 18:18:25 -08:00
Huahui Wu
961d2c6acf
Merge "b/3350774 avoid screen jumping when pinching to zoom." into honeycomb
2011-01-19 18:16:24 -08:00
Huahui Wu
1f30125c1c
b/3350774 avoid screen jumping when pinching to zoom.
...
After the change that sends multi-touch to WebKit first, there is
a chance that the single-touch move event is handled before multi-
touch events are finished and this makes the page jumps.
This change skips those single-touch move events to avoid that.
Change-Id: I03992ef18c1de8e07933bd7cc6c12ffc02c014a8
2011-01-19 18:14:09 -08:00
Jeff Brown
e200420e16
am d49f3e00: Merge "Rename KeyCharacterMap.UnavailableException." into honeycomb
...
* commit 'd49f3e0078a79804e8dbd455c92786977a686020':
Rename KeyCharacterMap.UnavailableException.
2011-01-19 17:58:32 -08:00
Jeff Brown
d49f3e0078
Merge "Rename KeyCharacterMap.UnavailableException." into honeycomb
2011-01-19 17:56:32 -08:00
Jeff Brown
7e1e21fdc5
Rename KeyCharacterMap.UnavailableException.
...
Bug: 3370261
Change-Id: I5cdca8ef2300b70b7a0fcc7e2c26765079645ecc
2011-01-19 17:32:50 -08:00
Adam Powell
551771d2f3
am ed58d8ed: Merge "Fix bug 3112733 - Missing TLS encryption option in manual email account setup" into honeycomb
...
* commit 'ed58d8ed8a50cbd8c5e01c4e51bcbbe4341d1dfd':
Fix bug 3112733 - Missing TLS encryption option in manual email account setup
2011-01-19 17:14:16 -08:00
Adam Powell
ed58d8ed8a
Merge "Fix bug 3112733 - Missing TLS encryption option in manual email account setup" into honeycomb
2011-01-19 17:11:37 -08:00
Adam Powell
d2766aec6a
Fix bug 3112733 - Missing TLS encryption option in manual email account setup
...
Make spinner popups observe global events that should change the
position of the popup.
Change-Id: Ia65204f594a6972b96d4db08c205770e340fcaf9
2011-01-19 17:09:29 -08:00
Jeff Brown
660c81bf3e
am 2cb866b9: Merge "Never drag scroll views with no children." into honeycomb
...
* commit '2cb866b948c38923b31331a9b2f031eb9d791e6e':
Never drag scroll views with no children.
2011-01-19 17:05:57 -08:00
Jeff Brown
2cb866b948
Merge "Never drag scroll views with no children." into honeycomb
2011-01-19 17:03:08 -08:00
Romain Guy
208ee2291c
am eefc8248: Merge "Fix toasts." into honeycomb
...
* commit 'eefc82483a90f641275db3084b78c8254cc45046':
Fix toasts.
2011-01-19 16:53:28 -08:00
Romain Guy
eefc82483a
Merge "Fix toasts." into honeycomb
2011-01-19 16:51:44 -08:00
Romain Guy
cf3dd6bc69
Fix toasts.
...
Change-Id: I11916c55e8092169d2ab28c100bc7a152d60d432
2011-01-19 16:54:13 -08:00
Christopher Tate
67265808c1
am 28f0a53a: Merge "Fail more gracefully when window state changes during drags" into honeycomb
...
* commit '28f0a53a882a39bc22bc5892250411cadf6c0d5d':
Fail more gracefully when window state changes during drags
2011-01-19 16:43:14 -08:00
Amith Yamasani
a70868a25c
am 1c0012e1: Merge "Ensure that the column is valid before querying." into honeycomb
...
* commit '1c0012e103a380489fe4a150247cd226de9a89a6':
Ensure that the column is valid before querying.
2011-01-19 16:43:10 -08:00
Christopher Tate
28f0a53a88
Merge "Fail more gracefully when window state changes during drags" into honeycomb
2011-01-19 16:41:14 -08:00
Amith Yamasani
1c0012e103
Merge "Ensure that the column is valid before querying." into honeycomb
2011-01-19 16:40:14 -08:00
Dianne Hackborn
1426d6bdd8
am b26a651b: Merge "Hook up large heap API." into honeycomb
...
* commit 'b26a651b47b5fc90a6685477aff5b76fdd1787f1':
Hook up large heap API.
2011-01-19 16:30:53 -08:00
Dianne Hackborn
b26a651b47
Merge "Hook up large heap API." into honeycomb
2011-01-19 16:28:31 -08:00
Christopher Tate
f01af7551b
Fail more gracefully when window state changes during drags
...
In particular, if a new window was created out from under the drag,
the drag-move event dispatch logic would wind up blithly assuming
that it would find a valid touch-dispatchable window under the
finger. When this was untrue, it would NPE, but the NPE was caught
and discarded safely by higher-level guard code.
With this change, we now avoid the NPE entirely and report the
spurious condition as part of the debugging log stream.
(Also add the local-state object to DragEvent.toString()'s output.)
Change-Id: Idfa5f45d049e48415ee59c8b0ffb5b0ed4098ce3
2011-01-19 16:25:22 -08:00
Amith Yamasani
de6e2ca7fb
Ensure that the column is valid before querying.
...
Bug: 3303147
Change-Id: Ieec93317c5a2e924d3ee3108b61577b636943160
2011-01-19 16:19:35 -08:00
Dianne Hackborn
de39851592
Hook up large heap API.
...
Change-Id: I215644f8de326fe3d4fa582447885b0aa01f72d3
2011-01-19 16:13:18 -08:00
Mike Lockwood
3c1f64c4ad
am 62097ad6: Merge "@hide MediaStore.ACTION_MTP_SESSION_END" into honeycomb
...
* commit '62097ad654bcab30057f56b46bbac5c41cfe9ec0':
@hide MediaStore.ACTION_MTP_SESSION_END
2011-01-19 16:11:55 -08:00
Mike Lockwood
62097ad654
Merge "@hide MediaStore.ACTION_MTP_SESSION_END" into honeycomb
2011-01-19 16:09:49 -08:00
Gilles Debunne
8d2480ca39
am 0c44d1db: Merge "Race condition patched in Email autocompletion." into honeycomb
...
* commit '0c44d1dbb152ed16df4eb2af39157f3d281323d9':
Race condition patched in Email autocompletion.
2011-01-19 16:09:43 -08:00
Gilles Debunne
0c44d1dbb1
Merge "Race condition patched in Email autocompletion." into honeycomb
2011-01-19 16:08:20 -08:00
Mike Lockwood
e222872a77
@hide MediaStore.ACTION_MTP_SESSION_END
...
BUG: 3370230
Change-Id: Idc05512930ceab8f91e3ddf0969a3b17deab2f62
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-01-19 16:07:25 -08:00
Joe Onorato
201dd78412
am cb109a0e: Add docs for Notification.Builder.
...
* commit 'cb109a0eeaca12cdd954c567da4fc5f45a23213b':
Add docs for Notification.Builder.
2011-01-19 15:34:04 -08:00
Joe Onorato
cb109a0eea
Add docs for Notification.Builder.
...
Bug: 3362451
Change-Id: I8f16a7f266812190dc8d06751f5ca914e2050111
2011-01-19 15:29:30 -08:00
Jaikumar Ganesh
baba247578
am 7457b36b: Merge "Make connection / disconnect failure more robust." into honeycomb
...
* commit '7457b36b92490daa6cd7e346919fad74a4b92eb9':
Make connection / disconnect failure more robust.
2011-01-19 15:24:33 -08:00
Brad Fitzpatrick
bd80a12cba
resolved conflicts for merge of 9240f16d to honeycomb-plus-aosp
...
Change-Id: I6e595bb11a5a692ccd730b9d1d2aa367063a61f5
2011-01-19 15:19:08 -08:00
Jaikumar Ganesh
7457b36b92
Merge "Make connection / disconnect failure more robust." into honeycomb
2011-01-19 15:13:37 -08:00
Gilles Debunne
be2c4f92a9
Race condition patched in Email autocompletion.
...
Bug 3347962
Root cause of this problem: if the adapter's content gets updated by a backgroung
thread, the PopupDataSetObserver will call showDropDown which will popup the
list.
Added a flag to make this call show the popup iif it is already visible.
This relayout is needed to clear the mDataChanged flag set when the content was
modified and which otherwise prevents touch events on the result list.
ArrayAdapter didn't use its lock to protect access to mObject.
-------------------------------------------------
However, the study of the this race conditions revealed an other bug:
Updated adapter's content is not displayed in filtered AutoCompleteTextView
Bug 3369097
Change-Id: Icd90d452f98231866f4d8a1f6994c1492febecb9
2011-01-19 15:10:09 -08:00
Brad Fitzpatrick
9240f16d77
Merge "StrictMode: class instance limits (track object "leaks")" into honeycomb
2011-01-19 14:53:24 -08:00
Brad Fitzpatrick
bfbe577110
StrictMode: class instance limits (track object "leaks")
...
Change-Id: I2db5a19060c2013078feb88a91caf655469b2f98
2011-01-19 14:52:08 -08:00
Romain Guy
514fb18827
Don't attempt to create empty layers.
...
Bug #3369888
Change-Id: Ic17bbd1c04bbf760cb17d0eb9e6767fd6479948c
2011-01-19 14:38:29 -08:00
Romain Guy
1aae1c2a9b
am 8f36bedc: Merge "Don\'t attempt to create empty layers. Bug #3369888 " into honeycomb
...
* commit '8f36bedcf3fd3b5b3e5746af689b9915d506365f':
Don't attempt to create empty layers. Bug #3369888
2011-01-19 14:38:04 -08:00
Romain Guy
8f36bedcf3
Merge "Don't attempt to create empty layers. Bug #3369888 " into honeycomb
2011-01-19 14:36:22 -08:00