Commit Graph

36739 Commits

Author SHA1 Message Date
Romain Guy
77e1b188aa Merge "Don't preload HardwareRenderer, its static initialization is process dependant." 2011-07-12 18:18:11 -07:00
Iliyan Malchev
82f6e53a2d Merge "Add support for TI H264 encoder" 2011-07-12 17:40:25 -07:00
Mathias Agopian
ab6d387787 Merge "take the state transform into account with h/w composer hal" 2011-07-12 17:36:22 -07:00
Chia-chi Yeh
15a99db8de am 3b219a51: (-s ours) am 4821d3bd: Merge "VpnService: stop VPN when unknown DNS servers show up." into honeycomb-LTE
* commit '3b219a51a9d692807d3fb0f516df81609ca6e4fc':
  VpnService: stop VPN when unknown DNS servers show up.
2011-07-12 16:58:45 -07:00
Elliott Hughes
db9586b132 Merge "Fix typo in AndroidHttpClient JavaDoc." 2011-07-12 16:58:18 -07:00
Gilles Debunne
10101c6ff1 Merge "Refactored TextView selectable state methods." 2011-07-12 16:38:51 -07:00
Wink Saville
3f9271d33b am 0ddd9960: am 12b91edc: Merge "Add a property so that CSIM provision check can be bypassed" into honeycomb-LTE
* commit '0ddd99600675aaf5f514ac6bb30d345c4b66f8c2':
  Add a property so that CSIM provision check can be bypassed
2011-07-12 16:38:22 -07:00
Alex Sakhartchouk
22d7ffa392 Merge "Fix for the renderscript ref counting bug." 2011-07-12 16:27:09 -07:00
Jaikumar Ganesh
19657cd711 Merge "Add REGISTERED_BEFORE_BOOT flag to intent." 2011-07-12 15:54:50 -07:00
Jeff Sharkey
56cdb8d5e0 Merge "Hide NetworkStatsHistory internals." 2011-07-12 15:19:31 -07:00
Jeff Sharkey
fe687edb22 Merge "Watch for external Secure.DATA_ROAMING changes." 2011-07-12 15:18:41 -07:00
Adam Powell
ee8f144485 Merge "Update ActionProvider to support dynamically building submenus." 2011-07-12 15:08:37 -07:00
Kazuhiro Ondo
1aa3512492 am a9e00a4a: am 89799e72: Fix incorrect ERI banner format
* commit 'a9e00a4ac806751d8af0d9386ee3ae9bd18492b4':
  Fix incorrect ERI banner format
2011-07-12 14:56:59 -07:00
Mathias Agopian
29a367bb7c take the state transform into account with h/w composer hal
if the state transform didn't preserve rectangles, we
would still try to use h/w composer hal using the bounds
of the transformed rect, which isn't correct.

now we correctly fall back to composition.

Change-Id: Iff78f4339ece415d4987e95a5717b04934d370ab
2011-07-12 14:51:45 -07:00
Wink Saville
1bf4bff3cf Merge "resolved conflicts for merge of 99cd6671 to master" 2011-07-12 14:46:02 -07:00
James Dong
838cf46df7 Merge "Make MetadataBufferType.h C-friendly" 2011-07-12 14:43:34 -07:00
Svetoslav Ganov
b3d93f45c7 Merge "Date/time pickers and calendar view not handling locale change." 2011-07-12 14:39:07 -07:00
Mathias Agopian
a58d703cae Merge "fix typo in a comment" 2011-07-12 14:11:57 -07:00
Wink Saville
02619cbcc8 resolved conflicts for merge of 99cd6671 to master
Change-Id: I81ac18b1b8291a96bdfa3386f2fe3633fd7eeb79
2011-07-12 13:56:05 -07:00
Xavier Ducrohet
3b0e7f8dd8 Merge "LayoutLib: updated fake accessbility manager and ensure there's an InputMethodManager" 2011-07-12 13:39:33 -07:00
Jeff Brown
7175398247 Merge "Remove the simulator target from all makefiles. Bug: 5010576" 2011-07-12 12:15:07 -07:00
Romain Guy
f8ff03d96d Merge "Add test for bug #4970944" 2011-07-12 12:14:11 -07:00
Xavier Ducrohet
eb283e8c35 Merge "LayoutLib: Delegate for Display and IWindowManager implementation." 2011-07-12 12:03:23 -07:00
Chet Haase
cbb6e2d91d Merge "Fix Animator cancel() behavior" 2011-07-12 11:58:58 -07:00
Xavier Ducrohet
cfddfccc96 Merge "new button graphics for layoutlib." 2011-07-12 11:50:07 -07:00
Dave Santoro
211200d2e0 Merge "Add data_set column for raw contacts and groups." 2011-07-12 11:39:09 -07:00
Adam Powell
d3b00a49f4 Merge "Fix bugs around restoring submenu state after activity teardown/restore" 2011-07-12 11:36:43 -07:00
Jeff Sharkey
42eaa36ad1 Merge "Return stats from inactive ifaces, packet counts." 2011-07-12 11:09:09 -07:00
Fabrice Di Meglio
4206e8d454 Merge "Fix scrolling bug causing centered cursor." 2011-07-12 09:39:18 -07:00
Ben Murdoch
60c4619bbb Merge changes I829b5d24,I521c0989
* changes:
  Add missing auto-fill strings.
  Merge Chromium at r12.0.742.93: Update auto-fill regular expressions.
2011-07-12 08:51:23 -07:00
Mark Brophy
2b6a670533 Merge "Expose app resume times to the ApplicationProvider." 2011-07-12 02:57:16 -07:00
satok
1f89aa056d Merge "Change IME picker dialog from Activity to Broadcast" 2011-07-11 22:12:59 -07:00
Jeff Brown
baa44b89ec Remove the simulator target from all makefiles.
Bug: 5010576

Change-Id: I04d722f258951a3078fe07899f5bbe8aac02a8e8
2011-07-11 22:12:16 -07:00
Mathias Agopian
c856391af6 Merge "fix a weird use of Vector::appendVector()" 2011-07-11 18:30:41 -07:00
Mathias Agopian
cb8be17537 Merge "Fix typo in an assert's log" 2011-07-11 18:30:29 -07:00
Jamie Gennis
1a14b442e0 Merge changes I002177a6,Ibaff52fe
* changes:
  Add the EGL_ANDROID_recordable spec.
  Add the spec for EGL_ANDROID_blob_cache.
2011-07-11 17:14:33 -07:00
Jamie Gennis
bd3b6ef117 Add the EGL_ANDROID_recordable spec.
Change-Id: I002177a68fafd6bb941aa64445c85fd5ff56223a
2011-07-11 17:13:02 -07:00
Robert Greenwalt
0f4befbf9f Merge "Fix wifi tethering." 2011-07-11 16:47:25 -07:00
Guang Zhu
553848be99 Merge "allow Uri as intent extra in am command" 2011-07-11 16:45:35 -07:00
Mathias Agopian
f6f177f2e2 Fix typo in an assert's log
Change-Id: I94883a23a0a92eaf3e4976f942f747a2137499ac
2011-07-11 16:26:18 -07:00
David 'Digit' Turner
f22259c533 am db4c5f35: resolved conflicts for merge of 7816eded to gingerbread-plus-aosp
* commit 'db4c5f352d6eb8e248953ccff1dbecb1270af4c5':
  NativeDaemonConnector: Fix SDCard mounting bug in the emulator.
  Fix missing NL
2011-07-11 16:15:27 -07:00
Scott Main
748e3ae359 am bc047bb0: am e32c49ab: docs: de-new sidenavs
* commit 'bc047bb03e6084ded47ffd5d810045ca973d54e5':
  docs: de-new sidenavs
2011-07-11 16:08:27 -07:00
Scott Main
f33e6fad66 am e32c49ab: docs: de-new sidenavs
* commit 'e32c49ab2c5d6b347b39635a0202d7dbdc1f0769':
  docs: de-new sidenavs
2011-07-11 16:06:25 -07:00
Robert Ly
663ca47710 am 1e4cf2dd: am 10a36020: cherrypick from hc-mr1 Change-Id: Ib0d980c95d821ba24e342f230b4a47fd786ba66a
* commit '1e4cf2dddbac4d357731ffaf02c4402426aa3763':
  cherrypick from hc-mr1 Change-Id: Ib0d980c95d821ba24e342f230b4a47fd786ba66a
2011-07-11 16:05:40 -07:00
Robert Ly
4af3d984ba am 10a36020: cherrypick from hc-mr1 Change-Id: Ib0d980c95d821ba24e342f230b4a47fd786ba66a
* commit '10a36020e3d37ef088f5f7ed6d64ba35847fc069':
  cherrypick from hc-mr1 Change-Id: Ib0d980c95d821ba24e342f230b4a47fd786ba66a
2011-07-11 16:03:30 -07:00
Jeff Brown
827a036e02 Merge "Increase activity timeouts when using a wrapper process." 2011-07-11 16:00:11 -07:00
David 'Digit' Turner
3b7791c73e resolved conflicts for merge of 7816eded to gingerbread-plus-aosp
Change-Id: I1f7d1f488f6a86774962d427aca472a8a444e0aa
2011-07-12 00:57:09 +02:00
Scott Main
eb1bf2d3cd am 56a085c9: am d3fa7bd1: docs: fix date on opengl dashboard
* commit '56a085c98801d9c4b08cbf398d8225b6761816ac':
  docs: fix date on opengl dashboard
2011-07-11 15:53:09 -07:00
Mike Lockwood
175e29b67d Merge "UsbDeviceManager: Include kernel USB state in dumpsys output" 2011-07-11 15:52:30 -07:00
Mike Lockwood
fee9da85b9 Merge "UsbDeviceManager: Initialize state based on persist.sys.usb.config rather than current kernel state" 2011-07-11 15:52:06 -07:00