Michael Kolb
d8cf098f0a
Merge "Add public API for on screen zoom controls" into honeycomb
2011-01-21 14:47:30 -08:00
Andreas Huber
c4c45b08bf
Merge "Properly rotate video that's marked as such and decoded to a surface." into honeycomb
2011-01-21 14:42:22 -08:00
Leon Scroggins
ad2cfde2b5
Merge "Restart input when the webpage changes the text." into honeycomb
2011-01-21 14:30:50 -08:00
Jason Sams
f2df26a452
Merge "fix bug 3375251 Copying arrays of objects would generate an exception due to excessive internal type checking." into honeycomb
2011-01-21 14:28:55 -08:00
Yu Shan Emily Lau
da338f8f66
Merge "Change the default ssid from GoogleGuest to the opennet for the power test." into honeycomb
2011-01-21 14:27:06 -08:00
John Reck
59141d09f5
Merge "DO NOT MERGE - Create db path if it doesn't exit" into gingerbread
2011-01-21 14:03:30 -08:00
Romain Guy
8d72f4900c
Merge "Don't set a Toast's view to null when enqueued several times. Bug #3374386 " into honeycomb
2011-01-21 13:23:25 -08:00
Andreas Huber
99260fae55
Merge "Some tweaks to HTTP live / nuplayer behaviour" into honeycomb
2011-01-21 13:14:30 -08:00
Patrick Dubroy
d2c01d11d5
Merge "Update Bitmap.recycle() doc for heap-allocated pixel data" into honeycomb
2011-01-21 13:13:17 -08:00
Huahui Wu
6076f14148
Merge "b/3369602 Using Math.round() to convert float coordinates to integers." into honeycomb
2011-01-21 13:03:49 -08:00
Jesse Wilson
d50d047072
Merge "Move URLTest tests to libcore." into honeycomb
2011-01-21 12:13:11 -08:00
Jason parks
c1b9e09653
Merge "Add and enforce the permission for encrypting/decrypting." into honeycomb
2011-01-21 11:59:15 -08:00
Jason parks
e9af5244af
Merge "Update encryption commands." into honeycomb
2011-01-21 11:39:15 -08:00
Jeff Hamilton
86d7998cf7
Merge "API changes for NFC." into gingerbread
2011-01-21 11:34:20 -08:00
Gilles Debunne
3cc68b97d7
Merge "Paste popup window is displayed on the side when it would be clipped on top of screen." into honeycomb
2011-01-21 11:29:39 -08:00
Shimeng (Simon) Wang
cacc928023
Merge "Keep min/max zoom scale in proportion when zoom density changes." into honeycomb
2011-01-21 10:45:22 -08:00
Andy Stadler
3e269eb692
Merge "Read actual device encryption status" into honeycomb
2011-01-21 10:27:46 -08:00
Justin Ho
a7813adc54
Merge "Integrating btn_dialog assets from Gingerbread" into honeycomb
2011-01-21 09:18:17 -08:00
Jean-Michel Trivi
26fb206ba5
Merge "Bug 3365937 notify TTS initialization listener of binding errors" into gingerbread
2011-01-21 09:09:30 -08:00
Amith Yamasani
5eddce9a30
Merge "Sync activity picker to latest dialog style." into honeycomb
2011-01-21 08:42:18 -08:00
satok
6f60f35b27
Merge "Show implicitly enabled subtypes in the input method selection dialog" into honeycomb
2011-01-21 03:37:49 -08:00
Santosh Madhava
566adb3fcb
Merge "Fix for issue 3370052 : Export progress percentage is incorrect" into honeycomb
2011-01-20 23:44:29 -08:00
Santosh Madhava
e25a7efe7e
Merge "Fix for PR 3369866 : Project thumbnail should have the same aspect ratio" into honeycomb
2011-01-20 23:44:05 -08:00
Shih-wei Liao
8c9060c90d
Merge "Handle fatal errors from calling bccRegisterSymbolCallback (if any)." into honeycomb
2011-01-20 23:10:39 -08:00
Ken Wakasa
25b4d77c38
Merge "Update class doc for InputMethodSubtype" into honeycomb
2011-01-20 23:07:53 -08:00
Brad Fitzpatrick
242ce59496
Merge "StrictMode: set sIsIdlerRegistered to false, and don't register if no penalties" into honeycomb
2011-01-20 22:24:18 -08:00
satok
f532358f66
Merge "Show ime switch icon when there is a hard keyboard" into honeycomb
2011-01-20 19:47:43 -08:00
Adam Cohen
15c7007c48
Merge "Cleaning up some StackView bad behavior" into honeycomb
2011-01-20 19:42:23 -08:00
Romain Guy
e86dbae3d5
Merge "Add support for drawBitmapMesh()." into honeycomb
2011-01-20 19:07:28 -08:00
Jim Miller
0b7e04fcee
Merge "Fix 3374446: Allow multiple shift keys in Keyboard." into honeycomb
2011-01-20 18:51:12 -08:00
Adam Powell
7f93197bc9
Merge "SearchView API Review - bug 3370353 and bug 3370338" into honeycomb
2011-01-20 18:44:32 -08:00
Stephen Hines
fb9ee8ce60
Merge "Properly use Long2 for "UInt2" for FieldPacker." into honeycomb
2011-01-20 18:27:43 -08:00
Scott Main
65cd2ae7b8
Merge "docs: add getting started doc and version notes for HC preview" into honeycomb
2011-01-20 18:27:41 -08:00
Eric Laurent
58efaf2be8
Merge "do not merge - Fix issue 3371096." into gingerbread
2011-01-20 17:43:04 -08:00
Andreas Huber
819dd0b97d
Merge "Implement missing pause/resume support for NuPlayer." into honeycomb
2011-01-20 17:05:48 -08:00
Scott Main
c7c4b14297
Merge "docs: small javadoc, but also make the existing getProfileProxy docs visible... had wrong comment tag" into honeycomb
2011-01-20 17:04:48 -08:00
Dianne Hackborn
2719a74d4c
Merge "Fix issue #3352125 : Crash after clearing search query" into honeycomb
2011-01-20 16:57:34 -08:00
Brad Fitzpatrick
d24f1370ea
Merge "Fixes for StrictMode instance count checking." into honeycomb
2011-01-20 15:56:47 -08:00
Dianne Hackborn
1edf449d8f
Merge "Fix issue #3374356 : Buttons sometimes don't highlight" into honeycomb
2011-01-20 15:38:14 -08:00
Justin Ho
77e51d7636
Merge "Updated sysbar lights out assets and recents bg protect tile" into honeycomb
2011-01-20 15:27:06 -08:00
Adam Powell
7df16b6993
Merge "Fix bug 3362375 - API REVIEW: remove unused public 'up' id" into honeycomb
2011-01-20 14:39:56 -08:00
Daniel Sandler
7ed6baaf5a
Merge "Remove inappropriate triangle icons from quick settings panel." into honeycomb
2011-01-20 13:31:53 -08:00
Kenny Root
4f380fbc3f
Merge "Don't pay attention to string block on @null" into honeycomb
2011-01-20 13:27:35 -08:00
Trevor Johns
d47883f979
Merge "Fixing bugs in HelloWebView tutorial on developer.android.com." into honeycomb
2011-01-20 13:19:25 -08:00
Joe Onorato
f14eb3ce68
Merge "Don't log the full stack trace when we can't load a resource." into honeycomb
2011-01-20 12:33:34 -08:00
Mathias Agopian
a9f54a77cd
Merge "fix [3369743] SurfaceFlinger reads hardware composer hints before calling hwc.prepare()" into honeycomb
2011-01-20 12:25:33 -08:00
Mathias Agopian
78efe9773e
Merge "clean-up unneeded code" into honeycomb
2011-01-20 12:25:26 -08:00
Stephen Hines
d9daf17fad
Merge "Remove unnecessary library functions." into honeycomb
2011-01-20 12:23:32 -08:00
Wink Saville
ce9e906c54
Merge "Add two more parameters too RIL_REQUEST_SETUP_DATA_CALL, DO NOT MERGE" into honeycomb
2011-01-20 12:20:59 -08:00
Mathias Agopian
2bd1d95efe
clean-up unneeded code
...
now that we removed the notion of a "inUse" buffer in surfaceflinger
a lot of code can be simplified / removed.
noteworthy, the whole concept of "unlockClient" wrt. "compositionComplete"
is also gone.
Change-Id: I210413d4c8c0998dae05c8620ebfc895d3e6233d
2011-01-20 12:10:11 -08:00