Commit Graph

37266 Commits

Author SHA1 Message Date
Mathias Agopian
81a6335052 connect/disconnect is now called from our EGL wrapper
the original connect/disconnect hooks are deprecated
and replace by api_connect/api_disconnect. the original
hooks are no no-ops.
api_connect/api_disconnect is now only called from the
android framework.

Bug: 5057915
Change-Id: I8ca64cd1acd6cabf915bf54689ec2e5f6dfa495a
2011-08-01 14:06:20 -07:00
Jesse Wilson
003b7ffbb2 Merge "Restore the 'final' bit on DataInputStream.read()" 2011-07-29 14:41:01 -07:00
Svetoslav Ganov
d5ab640263 Merge "Improving accessibility feedback for two state widgets." 2011-07-29 14:06:44 -07:00
Kristian Monsen
70b5c841e6 Merge "Part of fix for bug 4997380: Some error types unknown to SslError" 2011-07-29 12:35:45 -07:00
Derek Sollenberger
b0d9a46694 Merge "Add a runtime switch between Raster and Ganesh rendering modes." 2011-07-29 12:34:32 -07:00
Derek Sollenberger
b17fe78fe6 Merge "resolved conflicts for merge of 13639b0d to master" 2011-07-29 12:28:16 -07:00
Mike Lockwood
ba58c0b42b Merge "Clean up USB configuration switching logic and beef up error handling" 2011-07-29 12:13:04 -07:00
Gilles Debunne
e303f673f5 Merge "New interaction model for suggestions" 2011-07-29 11:47:12 -07:00
Derek Sollenberger
569d6c278e resolved conflicts for merge of 13639b0d to master
Change-Id: I6fb2ac2702fc662c1892537de6d4db20d5e709d6
2011-07-29 14:39:06 -04:00
Amith Yamasani
d5b380004c Merge "Don't submit a query if it's whitespace only." 2011-07-29 11:28:37 -07:00
Derek Sollenberger
9dd6682a5a Merge "resolved conflicts for merge of b7f09f28 to honeycomb-plus-aosp" into honeycomb-plus-aosp 2011-07-29 11:24:37 -07:00
Svetoslav Ganov
6bd27c915f Merge "InputFilter not updated on global accessibility change." 2011-07-29 11:22:42 -07:00
Christopher Tate
0900cf89bb Merge "Require the current backup pw in all backup/restore operations" 2011-07-29 11:20:45 -07:00
Derek Sollenberger
33e86c7a91 resolved conflicts for merge of b7f09f28 to honeycomb-plus-aosp
Change-Id: Iebde13c41a2adf4e693d87e808cb0659f913e4e6
2011-07-29 14:16:18 -04:00
Robert Greenwalt
cbbbb2ae26 am a128f5f8: am 1a230885: Merge "Fix NPE when going from proxy to no proxy." into honeycomb-LTE
* commit 'a128f5f8c952d7f519f64882792e832a4e75e2c8':
  Fix NPE when going from proxy to no proxy.
2011-07-29 10:55:58 -07:00
Daniel Sandler
472f6d102c Merge "Quick fix for NPE in updateNotification()." 2011-07-29 10:53:17 -07:00
Robert Greenwalt
f9c0f5aa4f am 1a230885: Merge "Fix NPE when going from proxy to no proxy." into honeycomb-LTE
* commit '1a230885b356256e91b3bf006ec72213ba6f8f76':
  Fix NPE when going from proxy to no proxy.
2011-07-29 10:53:16 -07:00
Robert Greenwalt
4535086245 Merge "Fix NPE when going from proxy to no proxy." into honeycomb-LTE 2011-07-29 10:51:32 -07:00
Dianne Hackborn
11429776fd Merge "Various work on out of memory managment." 2011-07-29 10:43:26 -07:00
Derek Sollenberger
da9b83b82f Merge "Fix NinePatch decoder when the target is smaller than the source." 2011-07-29 10:41:12 -07:00
Derek Sollenberger
bbfbd30383 am b7ed8471: am 01caec8c: Merge "Adding an optional param to the SurfaceTexture constructor."
* commit 'b7ed8471f1b96aff901149cf9ac29e4b32672f93':
  Adding an optional param to the SurfaceTexture constructor.
2011-07-29 09:53:09 -07:00
Derek Sollenberger
adbba1fda0 am 01caec8c: Merge "Adding an optional param to the SurfaceTexture constructor."
* commit '01caec8c4165a6cce2f276f8016b9eadab966944':
  Adding an optional param to the SurfaceTexture constructor.
2011-07-29 09:50:11 -07:00
Daniel Sandler
1eabe6c05f Merge "Fix NPE for devices with hardware navigation." 2011-07-29 09:49:13 -07:00
Nick Pelly
8cc351abb2 Merge "Workaround for bug 5082381 (EALREADY on ACL collision)." 2011-07-29 09:44:30 -07:00
Daniel Sandler
82cd9c415c Merge "Protect animation methods from Proguard." 2011-07-29 09:43:30 -07:00
Derek Sollenberger
0ed90b7894 Merge "Adding an optional param to the SurfaceTexture constructor." 2011-07-29 09:43:13 -07:00
Robert Greenwalt
afcfd1fd97 am 86574d66: am 0d8acea9: Make copy-constructor make deep copy.
* commit '86574d66dacc09c9b5a0a0ab2623ec01704b6fc8':
  Make copy-constructor make deep copy.
2011-07-29 09:24:38 -07:00
Robert Greenwalt
67020c06fc am 0d8acea9: Make copy-constructor make deep copy.
* commit '0d8acea9bb452d1fdbb3d811041f7bdb1b0ef8a3':
  Make copy-constructor make deep copy.
2011-07-29 09:20:51 -07:00
Derek Sollenberger
77c988cf4e Adding an optional param to the SurfaceTexture constructor.
Change-Id: I0fdbccf483a16af8039b85c0562f19a34ebce536
2011-07-29 11:06:24 -04:00
Daniel Sandler
0d1ae35641 Merge "Bring the shiny navigation button animations to phones." 2011-07-29 06:48:43 -07:00
Daniel Sandler
2c34bd740c Merge "The fullest of fullscreen modes." 2011-07-29 05:45:55 -07:00
Daniel Sandler
b90941a585 Merge "New richly-appointed navigation buttons." 2011-07-29 04:52:44 -07:00
Daniel Sandler
121316bac6 Merge "Correct android:dimen/status_bar_icon_size for tablets." 2011-07-29 04:52:01 -07:00
Kristian Monsen
4eb0fea354 Merge "Part of fix for bug 5065047 build libchromium as a shared lib" 2011-07-29 03:37:49 -07:00
satok
45087eb13d Merge "Fix issues in TextServicesManagerService" 2011-07-29 03:29:46 -07:00
Jean Chalard
653bbcce38 Merge "Fix a bug where a provider could be never released." 2011-07-28 19:36:32 -07:00
Romain Guy
56d9191c4a Merge "Don't create hw layers when there's no hw context. Bug #5093805" 2011-07-28 19:25:29 -07:00
satok
d13ba4c6ea Merge "Handle the existing binds to spell checkers correctly." 2011-07-28 18:09:59 -07:00
Jim Miller
567e9fe186 Merge "Fix 5044158: Initial pass: add music transport controls to LockScreen" 2011-07-28 18:04:21 -07:00
Matthew Xie
ef7b033cbb Merge "Provide an API to set the friendly name of a remote device." 2011-07-28 17:46:45 -07:00
Chris Craik
53011a5dc5 Merge "use pageswap callback to sync WebTextView with drawing of page" 2011-07-28 17:23:57 -07:00
Wu-cheng Li
3de8e30890 Merge "Add frame metadata parameter to camera data_callback." 2011-07-28 17:23:35 -07:00
Adam Powell
2ca7240aed Merge "Fix bug 5079507 - ICS (phone) : ActionBar tabs don't correctly resize if activity handles orientation change" 2011-07-28 16:40:03 -07:00
Justin Ho
645622d9b9 Merge "Updated popup assets Bug: 5080369" 2011-07-28 16:39:36 -07:00
Justin Ho
e75bb153be Merge "Updated spinner assets Bug: 5076695" 2011-07-28 16:39:21 -07:00
Justin Ho
e08ce7b090 Merge "Updated check_on and check_off" 2011-07-28 16:38:52 -07:00
Christopher Tate
479d20d8a9 Merge "Support full-backup encryption and global backup password" 2011-07-28 16:28:21 -07:00
Romain Guy
aea38c43fc Merge "Add notifyPixelsChanged() call to NDK unlockPixels()." 2011-07-28 16:26:08 -07:00
Irfan Sheriff
b14d7af9ba Merge "Changed walled garden to better url" 2011-07-28 16:24:38 -07:00
Svetoslav Ganov
b3bca856a2 Merge "Updaing the database version" 2011-07-28 15:57:25 -07:00