Scott Main
b11ef47140
Merge "docs: add G+ page announcement to homepage" into ics-mr1
2012-01-30 10:03:21 -08:00
Siva Velusamy
b8c3914547
Merge "gltrace: Use Unix Domain Socket rather than INET Socket"
2012-01-30 09:08:27 -08:00
Chet Haase
c07ca3bb88
Merge "Fix bug in LayoutTransition for INVISIBLE views"
2012-01-30 08:28:18 -08:00
Marco Nelissen
71838f66d0
Merge "Handle adding/removing/renaming nomedia paths"
2012-01-30 08:27:57 -08:00
Mathias Agopian
ad8d13c885
remove unneeded code
...
Change-Id: I07e2fca7274d2e12bf5b4aee0050794bdb97a8b3
2012-01-29 23:11:06 -08:00
Mathias Agopian
48d438d05f
add support for GL_EXT_debug_marker
...
This extension is always added to the GL_EXTENSIONS
extension string for the current GL context, regardless
of if it's supported by the h/w driver.
The extension itself will be handled by GLES_trace (eventually),
when GLES_trace is not enabled, it'll result to a no-op.
If the h/w implementation has this extension, we'll call that version
instead of our dummy version.
Change-Id: Ie5dd3387c4d45cd5ed5f03b73bda6045620a96bc
2012-01-29 22:22:09 -08:00
Mathias Agopian
453851f3a0
Merge "update GLES headers and add support for corresponding new extensions."
2012-01-29 22:03:19 -08:00
Mathias Agopian
b0e6e00d8e
Merge "added a few more commands to SF's dumpsys"
2012-01-29 22:02:36 -08:00
Mathias Agopian
6dc813c9c4
Merge "remove unused code"
2012-01-29 22:01:41 -08:00
Mathias Agopian
25e66fc324
added a few more commands to SF's dumpsys
...
--latency-clear [name]
clears the latency data for the specified layer or for
all layers if none is specified
--list
prints the list of all layers regardless of their visibility
Change-Id: I7c07ae020f838c173b98ee50f3fb3e93da78acbb
2012-01-28 22:31:55 -08:00
Mathias Agopian
3127260614
update GLES headers and add support for corresponding new extensions.
...
Change-Id: I554d9659113b4721b748ee5c1a3b1ca82b11d75e
2012-01-28 20:41:35 -08:00
Mathias Agopian
cf701aa9fe
remove unused code
...
Change-Id: If900fcc50f9ffc424e270cb6063b16a2d7bc04d3
2012-01-28 18:47:13 -08:00
Jean-Baptiste Queru
0f10202085
am 27d2ab8b: am dc8668c8: am 97818704: Merge "Wi-Fi: Handle disconnect in middle of DHCP operation"
...
* commit '27d2ab8b27e7e1927e18869e898fa556e5da3d43':
Wi-Fi: Handle disconnect in middle of DHCP operation
2012-01-27 21:09:20 -08:00
Roman Nurik
c744989304
am 5525a43a: am 639b25ea: Merge "docs: add NOTICE to action bar icon pack and sprinkle download links" into ics-mr1
...
* commit '5525a43a9c814faba22adfafc6517fb64259966f':
docs: add NOTICE to action bar icon pack and sprinkle download links
2012-01-27 21:08:59 -08:00
Roman Nurik
0bbfe207e5
am 9d9c7189: am 00b3ceb4: Merge "docs: Update designing-navigation training class to link to Android Design" into ics-mr1
...
* commit '9d9c718925e8ec189ba4615f93c2fe8e7d0ab23d':
docs: Update designing-navigation training class to link to Android Design
2012-01-27 21:08:50 -08:00
Jim Miller
88b750a32c
Merge "Fix 5906830: Update the clock earlier when lock screen comes back from suspend."
2012-01-27 17:42:26 -08:00
Jeff Brown
e6ae2923ac
Merge "Improve watchdog monitor for InputReader and InputDispatcher."
2012-01-27 17:37:31 -08:00
Jeff Brown
4db313480c
Merge "Implement a cancelation mechanism for queries."
2012-01-27 17:37:24 -08:00
Siva Velusamy
0832fb6407
gltrace: Use Unix Domain Socket rather than INET Socket
...
Export trace information via abstract Unix Domain Socket (UDS).
This allows tracing of applications without INTERNET permission,
and should be faster as well.
Change-Id: Iabb67fcc2bc2484afd8128af07dca723b81c52c6
2012-01-27 17:24:18 -08:00
Jean-Michel Trivi
3207f28053
Merge "Bug 5567648 Request and abandon audio focus in calls"
2012-01-27 14:50:28 -08:00
Fabrice Di Meglio
ae458a09b7
Merge "Code cleaning: centralize use of #if USE_TEXT_LAYOUT_CACHE"
2012-01-27 14:42:06 -08:00
Jean-Michel Trivi
5eb1fe43bf
Merge "Bug 5567648 disassociate audio mode and audio focus"
2012-01-27 14:15:37 -08:00
Glenn Kasten
c380de9f01
Merge "Remove optional LVMX service"
2012-01-27 14:11:16 -08:00
Jean-Baptiste Queru
de0c247336
am dc8668c8: am 97818704: Merge "Wi-Fi: Handle disconnect in middle of DHCP operation"
...
* commit 'dc8668c8a727a065cbe48c89c900d2fe98e12ab3':
Wi-Fi: Handle disconnect in middle of DHCP operation
2012-01-27 13:58:03 -08:00
Jean-Baptiste Queru
f08d07d93f
am 97818704: Merge "Wi-Fi: Handle disconnect in middle of DHCP operation"
...
* commit '9781870491f4f33403f8d518879a88c20180d7cb':
Wi-Fi: Handle disconnect in middle of DHCP operation
2012-01-27 13:55:56 -08:00
Gilles Debunne
a7eca5c0b8
Merge "Fix for IOOB when suggestions have disappeared"
2012-01-27 13:54:50 -08:00
Gilles Debunne
b8c47a870d
Merge "Handle tap and move cursor before showing suggestions"
2012-01-27 13:54:42 -08:00
Teng-Hui Zhu
fb9a7fb032
Merge "Revert "Hack to workaround the fact that the EGL context can be""
2012-01-27 13:48:25 -08:00
Jean-Baptiste Queru
2bc69de766
Merge "Wi-Fi: Handle disconnect in middle of DHCP operation"
2012-01-27 13:36:49 -08:00
Eric Fischer
09b12a30f6
Merge "Import translations. DO NOT MERGE"
2012-01-27 11:58:58 -08:00
Eric Fischer
dae7cb6bce
Merge "Mark locale-neutral configuration strings translatable="false""
2012-01-27 11:22:52 -08:00
Nick Pelly
c490675718
Merge "Fix doc bug."
2012-01-27 11:03:57 -08:00
Nick Pelly
fe3ebda60f
Merge "Fix build: update current.txt"
2012-01-27 10:35:12 -08:00
Stephen Hines
084f76135b
Merge "Don't wait forever if there are no commands to execute."
2012-01-27 10:08:18 -08:00
Nick Pelly
cbec2b18a3
Merge "Add NdefMessage.getByteLength(), and more minor fixes:"
2012-01-27 09:59:10 -08:00
Jamie Gennis
eebc37915c
Merge "SurfaceTexture: use fence sync on omap4 & s5pc110"
2012-01-27 09:53:14 -08:00
Glenn Kasten
9313ab3af5
Merge "Use audio_source_t consistently"
2012-01-27 09:06:00 -08:00
Glenn Kasten
e0ec95efb6
Merge "AudioStreamIn and AudioStreamOut"
2012-01-27 07:22:30 -08:00
Glenn Kasten
faa921735e
Merge "Declare methods in binder opcode order"
2012-01-27 07:19:53 -08:00
Glenn Kasten
84a68b7bad
Merge "Use enum effect_state consistently"
2012-01-27 07:19:10 -08:00
Glenn Kasten
e59167a25e
Merge "Use enum track_state consistently"
2012-01-27 07:18:23 -08:00
Glenn Kasten
3596794e2f
Merge "Use enum mixer_state consistently"
2012-01-27 07:16:46 -08:00
The Android Automerger
e093eabe76
merge in ics-mr1-release history after reset to ics-mr1
2012-01-26 18:32:07 -08:00
Alon Albert
751ecf24fd
Merge "Throw NPE if s is null"
2012-01-26 17:05:58 -08:00
Roman Nurik
94a7d3f291
am 639b25ea: Merge "docs: add NOTICE to action bar icon pack and sprinkle download links" into ics-mr1
...
* commit '639b25ea289481da6cfd4229649b51ffc6ce3406':
docs: add NOTICE to action bar icon pack and sprinkle download links
2012-01-26 16:35:06 -08:00
Roman Nurik
716fa3cdcd
Merge "docs: add NOTICE to action bar icon pack and sprinkle download links" into ics-mr1
2012-01-26 16:32:56 -08:00
Andreas Huber
e3e675fea2
Merge "The software AAC encoder is now an OMX component."
2012-01-26 16:00:38 -08:00
Chet Haase
bfe3b45d0e
Merge "Fix old issue with compatibility-scaled apps and Animations"
2012-01-26 15:53:03 -08:00
Daniel Sandler
3cef740514
am 70828a1d: am 5b08738a: Merge "Suppress mobile-out-of-service label if wifi connected." into ics-mr1
...
* commit '70828a1d40c9bf0e5066166216013093298de034':
Suppress mobile-out-of-service label if wifi connected.
2012-01-26 15:47:06 -08:00
Roman Nurik
953dce0764
am 00b3ceb4: Merge "docs: Update designing-navigation training class to link to Android Design" into ics-mr1
...
* commit '00b3ceb48b5e23daa8101db6080bee46d6518f43':
docs: Update designing-navigation training class to link to Android Design
2012-01-26 15:35:46 -08:00