Commit Graph

36593 Commits

Author SHA1 Message Date
Xavier Ducrohet
8d6b8ef68c am 9163a4a6: am aa4b1d8b: am d292d2a0: Merge 36a3a392 from mr1.
* commit '9163a4a686fc25fefc77d5b41c24a4538486a48e':
  Merge 36a3a392 from mr1.
2011-07-13 14:53:54 -07:00
Mike Lockwood
801a6dfa8a Merge "MediaScanner: fix breakage in updates" 2011-07-13 14:33:13 -07:00
Robert Ly
1ba8f1ddc7 Merge "docs: fix for bug 3186839" 2011-07-13 14:28:52 -07:00
Svetoslav Ganov
e9ac0770ca Merge "Polish of the ActivityChooserView and ShareActionProvider." 2011-07-13 14:19:33 -07:00
repo sync
4de78aa114 Merge "Add REFER handling." 2011-07-13 14:09:33 -07:00
Chris Craik
5fc4e6db41 Merge "Tile profiling interface" 2011-07-13 14:08:11 -07:00
Mathias Agopian
27a4dd912c Merge "get rid of overlay HAL" 2011-07-13 14:07:01 -07:00
Jeff Brown
4bb2be88b2 Merge "Revert "fix a weird use of Vector::appendVector()"" 2011-07-13 13:00:38 -07:00
Jason Sams
f42716c281 Merge "Add slot number to forEach hal." 2011-07-13 12:28:38 -07:00
Mike Lockwood
cec2be4554 Merge "MTP: Clean up MtpServer initialization and threading:" 2011-07-13 08:07:59 -07:00
Mike Lockwood
80daa8e298 Merge "UsbDeviceManager: clean up HandlerThread creation" 2011-07-13 07:34:29 -07:00
Narayan Kamath
299ee398e5 Merge "Wait until the audio track finishes playing before releasing it." 2011-07-13 07:30:27 -07:00
Jeff Sharkey
ca11c2fd9f Merge "Include full network history around current time." 2011-07-12 20:23:03 -07:00
Romain Guy
ed74eeb6ff Merge "Revert "Don't preload HardwareRenderer, its static initialization is process dependant."" 2011-07-12 19:10:22 -07:00
Fabrice Di Meglio
c76ebf52db Merge "Introduce TextView drawableStart and drawableEnd" 2011-07-12 18:24:27 -07:00
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