OSDN Git Service
Scott Main [Mon, 30 Jan 2012 23:28:36 +0000 (15:28 -0800)]
am
a76ddf92: am
6507df8b: docs: add meta descriptions for home and sdk also revise the G+ widget to make fit
* commit '
a76ddf927278ec36f5a4589dbba85bb06bb1ae19':
docs: add meta descriptions for home and sdk also revise the G+ widget to make fit
Mathias Agopian [Mon, 30 Jan 2012 23:24:46 +0000 (15:24 -0800)]
Merge "SF now synchronizes to VSYNC"
Eric Fischer [Mon, 30 Jan 2012 23:24:41 +0000 (15:24 -0800)]
Merge "Import translations. DO NOT MERGE"
Mathias Agopian [Mon, 30 Jan 2012 23:23:47 +0000 (15:23 -0800)]
Merge "add support for GL_EXT_debug_marker"
Mathias Agopian [Wed, 25 Jan 2012 00:39:14 +0000 (16:39 -0800)]
SF now synchronizes to VSYNC
Change-Id: Ic5e4f2ea9927ce133eef9499c03161325e9d02c5
Scott Main [Mon, 30 Jan 2012 23:14:53 +0000 (15:14 -0800)]
am
6507df8b: docs: add meta descriptions for home and sdk also revise the G+ widget to make fit
* commit '
6507df8b78d80403d66d321748ad47290a611e3f':
docs: add meta descriptions for home and sdk also revise the G+ widget to make fit
Romain Guy [Mon, 30 Jan 2012 22:12:37 +0000 (14:12 -0800)]
Merge "Always initialize AsyncTask on the main thread."
The Android Open Source Project [Mon, 30 Jan 2012 21:38:52 +0000 (13:38 -0800)]
am
827a597d: Reconcile with ics-mr1-release
* commit '
827a597df70a51c6cccad52fae2be2c469f58b77':
Revert "Fix
5797764: Increase lock screen's thread priority"
DO NOT MERGE Revert "AudioFlinger: mix track only when really ready (2)"
The Android Open Source Project [Mon, 30 Jan 2012 21:36:34 +0000 (13:36 -0800)]
Reconcile with ics-mr1-release
Change-Id: Ic6454a4b7929bbf2f453022fd8ae596e215657c2
The Android Automerger [Mon, 30 Jan 2012 21:23:32 +0000 (13:23 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Gilles Debunne [Mon, 30 Jan 2012 20:58:53 +0000 (12:58 -0800)]
Merge "Remove onPreDrawListeners earlier in TextView"
Dianne Hackborn [Mon, 30 Jan 2012 20:56:42 +0000 (12:56 -0800)]
am
25fe8ef1: am
e22f4748: Merge "Update documentation to reflect the old approach not working." into ics-mr1
* commit '
25fe8ef1b51b4a36e08b3fea35c0799f3d0840e2':
Update documentation to reflect the old approach not working.
Dianne Hackborn [Mon, 30 Jan 2012 20:54:02 +0000 (12:54 -0800)]
am
e22f4748: Merge "Update documentation to reflect the old approach not working." into ics-mr1
* commit '
e22f4748565915948c8af2961ac74fe81a417e3b':
Update documentation to reflect the old approach not working.
Dianne Hackborn [Mon, 30 Jan 2012 20:52:11 +0000 (12:52 -0800)]
Merge "Update documentation to reflect the old approach not working." into ics-mr1
Andreas Huber [Mon, 30 Jan 2012 20:32:58 +0000 (12:32 -0800)]
Merge "Instantiate software codecs locally whenever possible."
Stephen Hines [Mon, 30 Jan 2012 20:22:10 +0000 (12:22 -0800)]
Merge "Fix potential bug with reordered size/offset arguments."
Romain Guy [Mon, 30 Jan 2012 20:05:28 +0000 (12:05 -0800)]
Merge "Add stencil buffer to the EGL config"
Jeff Sharkey [Mon, 30 Jan 2012 19:53:32 +0000 (11:53 -0800)]
Merge "Move away from deprecated NetworkInfo extra."
John Wang [Mon, 30 Jan 2012 19:25:48 +0000 (11:25 -0800)]
am
136704a8: am
b069833e: Merge "Adjust the LTE signal bar mapping." into ics-mr1
* commit '
136704a803ed7dd419a452315d1c0fe4885ce441':
Adjust the LTE signal bar mapping.
John Wang [Mon, 30 Jan 2012 19:23:24 +0000 (11:23 -0800)]
am
b069833e: Merge "Adjust the LTE signal bar mapping." into ics-mr1
* commit '
b069833e63f711a6b140385003d67b3ff68fe66b':
Adjust the LTE signal bar mapping.
John Wang [Mon, 30 Jan 2012 19:20:35 +0000 (11:20 -0800)]
Merge "Adjust the LTE signal bar mapping." into ics-mr1
Makoto Onuki [Mon, 30 Jan 2012 19:16:58 +0000 (11:16 -0800)]
Merge "Fixing broken unittests."
Scott Main [Mon, 30 Jan 2012 18:08:14 +0000 (10:08 -0800)]
am
fb300fb2: am
73790a53: Merge "docs: add G+ page announcement to homepage" into ics-mr1
* commit '
fb300fb2f0f253c94c14090256f9695bca1a1e4b':
docs: add G+ page announcement to homepage
Scott Main [Mon, 30 Jan 2012 18:05:59 +0000 (10:05 -0800)]
am
73790a53: Merge "docs: add G+ page announcement to homepage" into ics-mr1
* commit '
73790a53b580b8ec8eff88e25a19b5fcfa33392a':
docs: add G+ page announcement to homepage
Scott Main [Mon, 30 Jan 2012 18:03:21 +0000 (10:03 -0800)]
Merge "docs: add G+ page announcement to homepage" into ics-mr1
Siva Velusamy [Mon, 30 Jan 2012 17:08:27 +0000 (09:08 -0800)]
Merge "gltrace: Use Unix Domain Socket rather than INET Socket"
Chet Haase [Mon, 30 Jan 2012 16:28:18 +0000 (08:28 -0800)]
Merge "Fix bug in LayoutTransition for INVISIBLE views"
Marco Nelissen [Mon, 30 Jan 2012 16:27:57 +0000 (08:27 -0800)]
Merge "Handle adding/removing/renaming nomedia paths"
Mathias Agopian [Mon, 30 Jan 2012 06:40:08 +0000 (22:40 -0800)]
remove unneeded code
Change-Id: I07e2fca7274d2e12bf5b4aee0050794bdb97a8b3
Mathias Agopian [Sun, 29 Jan 2012 05:44:00 +0000 (21:44 -0800)]
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
Mathias Agopian [Mon, 30 Jan 2012 06:03:19 +0000 (22:03 -0800)]
Merge "update GLES headers and add support for corresponding new extensions."
Mathias Agopian [Mon, 30 Jan 2012 06:02:36 +0000 (22:02 -0800)]
Merge "added a few more commands to SF's dumpsys"
Mathias Agopian [Mon, 30 Jan 2012 06:01:41 +0000 (22:01 -0800)]
Merge "remove unused code"
Mathias Agopian [Sun, 29 Jan 2012 06:31:55 +0000 (22:31 -0800)]
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
Mathias Agopian [Sat, 28 Jan 2012 22:20:59 +0000 (14:20 -0800)]
update GLES headers and add support for corresponding new extensions.
Change-Id: I554d9659113b4721b748ee5c1a3b1ca82b11d75e
Mathias Agopian [Sun, 29 Jan 2012 02:47:13 +0000 (18:47 -0800)]
remove unused code
Change-Id: If900fcc50f9ffc424e270cb6063b16a2d7bc04d3
Jean-Baptiste Queru [Sat, 28 Jan 2012 05:09:20 +0000 (21:09 -0800)]
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
Roman Nurik [Sat, 28 Jan 2012 05:08:59 +0000 (21:08 -0800)]
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
Roman Nurik [Sat, 28 Jan 2012 05:08:50 +0000 (21:08 -0800)]
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
Jim Miller [Sat, 28 Jan 2012 01:42:26 +0000 (17:42 -0800)]
Merge "Fix
5906830: Update the clock earlier when lock screen comes back from suspend."
Jeff Brown [Sat, 28 Jan 2012 01:37:31 +0000 (17:37 -0800)]
Merge "Improve watchdog monitor for InputReader and InputDispatcher."
Jeff Brown [Sat, 28 Jan 2012 01:37:24 +0000 (17:37 -0800)]
Merge "Implement a cancelation mechanism for queries."
Siva Velusamy [Fri, 27 Jan 2012 22:39:03 +0000 (14:39 -0800)]
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
Jean-Michel Trivi [Fri, 27 Jan 2012 22:50:28 +0000 (14:50 -0800)]
Merge "Bug
5567648 Request and abandon audio focus in calls"
Fabrice Di Meglio [Fri, 27 Jan 2012 22:42:06 +0000 (14:42 -0800)]
Merge "Code cleaning: centralize use of #if USE_TEXT_LAYOUT_CACHE"
Jean-Michel Trivi [Fri, 27 Jan 2012 22:15:37 +0000 (14:15 -0800)]
Merge "Bug
5567648 disassociate audio mode and audio focus"
Glenn Kasten [Fri, 27 Jan 2012 22:11:16 +0000 (14:11 -0800)]
Merge "Remove optional LVMX service"
Jean-Baptiste Queru [Fri, 27 Jan 2012 21:58:03 +0000 (13:58 -0800)]
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
Jean-Baptiste Queru [Fri, 27 Jan 2012 21:55:56 +0000 (13:55 -0800)]
am
97818704: Merge "Wi-Fi: Handle disconnect in middle of DHCP operation"
* commit '
9781870491f4f33403f8d518879a88c20180d7cb':
Wi-Fi: Handle disconnect in middle of DHCP operation
Gilles Debunne [Fri, 27 Jan 2012 21:54:50 +0000 (13:54 -0800)]
Merge "Fix for IOOB when suggestions have disappeared"
Gilles Debunne [Fri, 27 Jan 2012 21:54:42 +0000 (13:54 -0800)]
Merge "Handle tap and move cursor before showing suggestions"
Teng-Hui Zhu [Fri, 27 Jan 2012 21:48:25 +0000 (13:48 -0800)]
Merge "Revert "Hack to workaround the fact that the EGL context can be""
Jean-Baptiste Queru [Fri, 27 Jan 2012 21:36:48 +0000 (13:36 -0800)]
Merge "Wi-Fi: Handle disconnect in middle of DHCP operation"
Eric Fischer [Fri, 27 Jan 2012 19:58:58 +0000 (11:58 -0800)]
Merge "Import translations. DO NOT MERGE"
Eric Fischer [Fri, 27 Jan 2012 19:22:52 +0000 (11:22 -0800)]
Merge "Mark locale-neutral configuration strings translatable="false""
Nick Pelly [Fri, 27 Jan 2012 19:03:57 +0000 (11:03 -0800)]
Merge "Fix doc bug."
Nick Pelly [Fri, 27 Jan 2012 18:35:12 +0000 (10:35 -0800)]
Merge "Fix build: update current.txt"
Stephen Hines [Fri, 27 Jan 2012 18:08:18 +0000 (10:08 -0800)]
Merge "Don't wait forever if there are no commands to execute."
Nick Pelly [Fri, 27 Jan 2012 17:59:10 +0000 (09:59 -0800)]
Merge "Add NdefMessage.getByteLength(), and more minor fixes:"
Jamie Gennis [Fri, 27 Jan 2012 17:53:14 +0000 (09:53 -0800)]
Merge "SurfaceTexture: use fence sync on omap4 & s5pc110"
Glenn Kasten [Fri, 27 Jan 2012 17:06:00 +0000 (09:06 -0800)]
Merge "Use audio_source_t consistently"
Glenn Kasten [Fri, 27 Jan 2012 15:22:30 +0000 (07:22 -0800)]
Merge "AudioStreamIn and AudioStreamOut"
Glenn Kasten [Fri, 27 Jan 2012 15:19:53 +0000 (07:19 -0800)]
Merge "Declare methods in binder opcode order"
Glenn Kasten [Fri, 27 Jan 2012 15:19:10 +0000 (07:19 -0800)]
Merge "Use enum effect_state consistently"
Glenn Kasten [Fri, 27 Jan 2012 15:18:23 +0000 (07:18 -0800)]
Merge "Use enum track_state consistently"
Glenn Kasten [Fri, 27 Jan 2012 15:16:46 +0000 (07:16 -0800)]
Merge "Use enum mixer_state consistently"
The Android Automerger [Fri, 27 Jan 2012 02:32:07 +0000 (18:32 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Alon Albert [Fri, 27 Jan 2012 01:05:58 +0000 (17:05 -0800)]
Merge "Throw NPE if s is null"
Roman Nurik [Fri, 27 Jan 2012 00:35:06 +0000 (16:35 -0800)]
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
Roman Nurik [Fri, 27 Jan 2012 00:32:56 +0000 (16:32 -0800)]
Merge "docs: add NOTICE to action bar icon pack and sprinkle download links" into ics-mr1
Andreas Huber [Fri, 27 Jan 2012 00:00:38 +0000 (16:00 -0800)]
Merge "The software AAC encoder is now an OMX component."
Chet Haase [Thu, 26 Jan 2012 23:53:03 +0000 (15:53 -0800)]
Merge "Fix old issue with compatibility-scaled apps and Animations"
Daniel Sandler [Thu, 26 Jan 2012 23:47:06 +0000 (15:47 -0800)]
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.
Roman Nurik [Thu, 26 Jan 2012 23:35:46 +0000 (15:35 -0800)]
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
Roman Nurik [Thu, 26 Jan 2012 23:33:57 +0000 (15:33 -0800)]
Merge "docs: Update designing-navigation training class to link to Android Design" into ics-mr1
Geremy Condra [Thu, 26 Jan 2012 23:06:18 +0000 (15:06 -0800)]
Merge "Removed intent logging from SearchDialog.java"
Jim Miller [Thu, 26 Jan 2012 22:30:49 +0000 (14:30 -0800)]
Merge "Fix
5620754: don't show pattern unlock after SIM unlock if not enabled."
Eric Fischer [Thu, 26 Jan 2012 22:26:10 +0000 (14:26 -0800)]
Merge "Import translations. DO NOT MERGE"
Gilles Debunne [Thu, 26 Jan 2012 22:09:20 +0000 (14:09 -0800)]
Merge "Modified algorithm to remove duplicated suggestions"
Gilles Debunne [Thu, 26 Jan 2012 22:09:00 +0000 (14:09 -0800)]
Merge "Remove @deprecate in View's fadingEdge"
Stephen Hines [Thu, 26 Jan 2012 21:55:57 +0000 (13:55 -0800)]
Merge "Fix bugs with unsigned rsAtomicCas/Max/Min."
Daniel Sandler [Thu, 26 Jan 2012 21:04:17 +0000 (13:04 -0800)]
am
5b08738a: Merge "Suppress mobile-out-of-service label if wifi connected." into ics-mr1
* commit '
5b08738a62ece5bf0ca5d22a6f062e2fb67af272':
Suppress mobile-out-of-service label if wifi connected.
Daniel Sandler [Thu, 26 Jan 2012 21:02:32 +0000 (13:02 -0800)]
Merge "Suppress mobile-out-of-service label if wifi connected." into ics-mr1
Scott Main [Thu, 26 Jan 2012 19:47:35 +0000 (11:47 -0800)]
am
2de74f5f: am
6c055bbd: docs: add action bar icons ZIP
* commit '
2de74f5fa9acc5fae5fc09aad861c13f7162d5cb':
docs: add action bar icons ZIP
Scott Main [Thu, 26 Jan 2012 19:44:58 +0000 (11:44 -0800)]
am
6c055bbd: docs: add action bar icons ZIP
* commit '
6c055bbdf475e6cd324912326c802244b9a76c3b':
docs: add action bar icons ZIP
Ben Cheng [Thu, 26 Jan 2012 19:16:58 +0000 (11:16 -0800)]
Merge "Preserve NEON callee-save registers d8-d15."
Scott Main [Thu, 26 Jan 2012 02:03:20 +0000 (18:03 -0800)]
am
e7ffc5a6: am
9ac4dd82: Merge "docs: remove the 1.0 icon template pack" into ics-mr1
* commit '
e7ffc5a6335c5da24af9e2d6ffde6d6e4b8e5a23':
docs: remove the 1.0 icon template pack
Scott Main [Thu, 26 Jan 2012 02:00:42 +0000 (18:00 -0800)]
am
9ac4dd82: Merge "docs: remove the 1.0 icon template pack" into ics-mr1
* commit '
9ac4dd828065410efbb380992d996c7e93daf437':
docs: remove the 1.0 icon template pack
Scott Main [Thu, 26 Jan 2012 01:58:54 +0000 (17:58 -0800)]
Merge "docs: remove the 1.0 icon template pack" into ics-mr1
Scott Main [Thu, 26 Jan 2012 01:54:48 +0000 (17:54 -0800)]
am
1f9026ca: am
f466db14: Merge "docs: remove ADL presentation PDFs to conserve site space" into ics-mr1
* commit '
1f9026caf1af0f7d3eb9de81641ac290fd340b4b':
docs: remove ADL presentation PDFs to conserve site space
Scott Main [Thu, 26 Jan 2012 01:52:08 +0000 (17:52 -0800)]
am
f466db14: Merge "docs: remove ADL presentation PDFs to conserve site space" into ics-mr1
* commit '
f466db14ec32fbaf08a868df40f7685a7e7df3db':
docs: remove ADL presentation PDFs to conserve site space
Scott Main [Thu, 26 Jan 2012 01:50:20 +0000 (17:50 -0800)]
Merge "docs: remove ADL presentation PDFs to conserve site space" into ics-mr1
Joe Malin [Thu, 26 Jan 2012 01:33:06 +0000 (17:33 -0800)]
am
ba8dd79f: am
9f426604: am
a2a46f62: DOC CHANGE: New Content Provider topics
* commit '
ba8dd79f4eb690fc7922fc4c9b0507d901a2d320':
DOC CHANGE: New Content Provider topics
Joe Malin [Thu, 26 Jan 2012 01:30:13 +0000 (17:30 -0800)]
am
9f426604: am
a2a46f62: DOC CHANGE: New Content Provider topics
* commit '
9f426604e6f21e31f8a2194dcff0ea7bf488eee2':
DOC CHANGE: New Content Provider topics
Joe Malin [Thu, 26 Jan 2012 01:27:46 +0000 (17:27 -0800)]
am
a2a46f62: DOC CHANGE: New Content Provider topics
* commit '
a2a46f629446af0935e8ebbbd7cdb55e395f79f3':
DOC CHANGE: New Content Provider topics
Svetoslav Ganov [Thu, 26 Jan 2012 01:09:54 +0000 (17:09 -0800)]
Merge "Fixing failing focus tests"
Teng-Hui Zhu [Thu, 26 Jan 2012 00:53:05 +0000 (16:53 -0800)]
Merge "Make sure WebView get notified before the EGL context destroyed."
Dianne Hackborn [Thu, 26 Jan 2012 00:15:43 +0000 (16:15 -0800)]
Merge "Add xxhdpi; fix ActivityManager.getLauncherLargeIconSize() etc."
Dianne Hackborn [Wed, 25 Jan 2012 23:12:23 +0000 (15:12 -0800)]
Add xxhdpi; fix ActivityManager.getLauncherLargeIconSize() etc.
Change-Id: I519d6cdc527a402d93b98df17a64fc1da52ad598
Gilles Debunne [Wed, 25 Jan 2012 23:08:29 +0000 (15:08 -0800)]
Merge "Unbalanced batch edit begin and end leave TextView unresponsive"
OSDN Git Service
