Xavier Ducrohet
00c662cbdf
Merge "LayoutLib: remove some exceptions."
2011-02-10 13:01:34 -08:00
Katie McCormick
b91f20af98
resolved conflicts for merge of 690d31a6 to honeycomb-plus-aosp
...
Change-Id: I1308f0a5fda0646a90dcd60a78c15538c7364cbc
2011-02-10 12:38:07 -08:00
Andreas Huber
277b95db21
Merge "Fix the build."
2011-02-10 12:35:06 -08:00
Mathias Agopian
aa60b1f889
Merge "fix [3408713] Dialog window invisible sometimes" into honeycomb
2011-02-10 12:29:19 -08:00
Marco Nelissen
937eb81ec9
Merge "Better genre support."
2011-02-10 12:23:11 -08:00
Steve Block
a137e211c2
Merge "Increase DRT timeout while waiting for WebView to dump as text"
2011-02-10 12:13:27 -08:00
Adam Powell
11a21bff64
Merge "Fix bug 3440372 - Spinner measurement issues with new rules"
2011-02-10 12:07:38 -08:00
Dirk Dougherty
6ae328cec7
Merge "Doc change: changes for 3.0 SDK" into honeycomb
2011-02-10 12:02:38 -08:00
Andreas Huber
71a2cbd8b4
Merge "Change timestamp handling in RTSP, remove unused, experimental, gtalk support"
2011-02-10 11:55:22 -08:00
John Reck
ef0c9cb3bf
Merge "Fix spacing issue"
2011-02-10 11:53:10 -08:00
Xavier Ducrohet
d8d6552230
Merge "LayoutLib: Annotate the custom delegate methods."
2011-02-10 11:27:27 -08:00
Robert Ly
13e49458c9
Merge "clean up and add javadocs" into honeycomb
2011-02-10 10:15:14 -08:00
Alex Sakhartchouk
4782b521f6
Merge "HelloWorld graphics sample for Renderscript." into honeycomb
2011-02-10 09:53:30 -08:00
Alex Sakhartchouk
4029472744
Merge "Cleanup of the code in view to do creation/destruction in the right places." into honeycomb
2011-02-10 09:51:34 -08:00
Santosh Madhava
3cb3346451
Merge "Fix for 3431967: Memory leak from video editor engine in JNI"
2011-02-10 09:41:27 -08:00
Chet Haase
be11adb0df
Merge "Fix animation and layoutTransition issues."
2011-02-10 09:16:56 -08:00
Mathias Agopian
7802bbd20f
fix [3408713] Dialog window invisible sometimes
...
weak pointer comparison operators were implemented wrong,
they were using the internal "unsafe" pointer. We could end up
with two "equal" weak pointer pointing to different objects.
this caused KeyedVector keyed by weak pointer to work incorrectly, in
turn causing a window that just got added to a list to be immediately
removed.
Change-Id: Ib191010c39aafa9229109e4211f6c3b2b2f9696d
2011-02-09 18:38:55 -08:00
Cary Clark
404740d9ec
Merge "only allow dpad center for key long press"
2011-02-09 17:15:10 -08:00
Gilles Debunne
4dffae1718
am 2050de5b: Text selection is broken.
...
* commit '2050de5b9a5c097e30545ab822211d49031bd9dc':
Text selection is broken.
2011-02-09 16:49:42 -08:00
Steve Block
6f95982168
Merge "Remove LayoutTest http/tests/xmlhttprequest/simple-cross-origin-progress-events.html from skipped list"
2011-02-09 16:37:34 -08:00
Xavier Ducrohet
f630f42a88
Merge "LayoutLib: now depends on tools-common-prebuilt."
2011-02-09 16:27:27 -08:00
Cary Clark
07de04862b
Merge "move selectAll to match framework"
2011-02-09 16:05:13 -08:00
James Dong
402d32b6fa
Merge "Reduce blocking time in file write"
2011-02-09 16:04:14 -08:00
Patrick Scott
57d1302339
Merge "Call window.onscroll event at the end of scrolling."
2011-02-09 15:44:21 -08:00
Alex Sakhartchouk
7e8fdf0b83
am 85bccf6e: (-s ours) am 699a0969: Merge "DO NOT MERGE Removing an activity that shouldn\'t go into samples" into honeycomb
...
* commit '85bccf6e0b555bc5245628ba7340123b6b367b51':
DO NOT MERGE Removing an activity that shouldn't go into samples
2011-02-09 15:27:34 -08:00
Dirk Dougherty
2d44573064
am e05bd9ee: am 0e40519b: Merge "Doc change: add diff report for API 11" into honeycomb
...
* commit 'e05bd9ee7f800ca4350a8c8b94bcfdab1f9e8217':
Doc change: add diff report for API 11
2011-02-09 15:25:28 -08:00
Alex Sakhartchouk
31e6d2e0d3
am 699a0969: Merge "DO NOT MERGE Removing an activity that shouldn\'t go into samples" into honeycomb
...
* commit '699a0969434b6ee434dd9f5f212fe1bb914fdf0d':
DO NOT MERGE Removing an activity that shouldn't go into samples
2011-02-09 15:23:54 -08:00
Dirk Dougherty
257497d912
am 0e40519b: Merge "Doc change: add diff report for API 11" into honeycomb
...
* commit '0e40519beefe3d2ea0870a8eecac1a58f1fb6403':
Doc change: add diff report for API 11
2011-02-09 15:21:49 -08:00
Alex Sakhartchouk
65bcbcc831
Merge "DO NOT MERGE Removing an activity that shouldn't go into samples" into honeycomb
2011-02-09 15:20:21 -08:00
Dirk Dougherty
4917dbf6a5
Merge "Doc change: add diff report for API 11" into honeycomb
2011-02-09 15:19:08 -08:00
Dirk Dougherty
2dd3fe8584
am e1109753: am fefa95a9: Doc change: Add version notes for Android 2.3.3.
...
* commit 'e110975368a26637793db7079d1ba6c4a2806056':
Doc change: Add version notes for Android 2.3.3.
2011-02-09 14:23:00 -08:00
Dirk Dougherty
094217876b
am fefa95a9: Doc change: Add version notes for Android 2.3.3.
...
* commit 'fefa95a9c828d2b67227894b7ee3979504c0f52a':
Doc change: Add version notes for Android 2.3.3.
2011-02-09 14:20:06 -08:00
James Dong
4ff57c79f8
Merge "Catch read error from AudioRecord and do not assert"
2011-02-09 13:58:06 -08:00
Wink Saville
614a618526
am 01a5eba8: am 6e25789f: Merge "Telephony: Fix cb sms implementation"
...
* commit '01a5eba810bfdf5b111a7546814e174c1d57b6e7':
Telephony: Fix cb sms implementation
2011-02-09 13:45:37 -08:00
Wink Saville
76615d7b6f
am 6e25789f: Merge "Telephony: Fix cb sms implementation"
...
* commit '6e25789fbe7ac283021156b17f406acb48850292':
Telephony: Fix cb sms implementation
2011-02-09 13:42:45 -08:00
Vasu Nori
fd26125ce7
Merge "turn off sqlite WAL until bugs bug:3024421 and bug:3353077 are fixed"
2011-02-09 13:34:43 -08:00
Mathias Agopian
e28fe54e7a
am bfe9e9cf: am cc24170d: Merge "fix [3374821] Cannot take screenshot of HC preview" into honeycomb
...
* commit 'bfe9e9cf18ca84214bc59d875d74ca63a27e2414':
fix [3374821] Cannot take screenshot of HC preview
2011-02-09 13:27:01 -08:00
Mathias Agopian
42ebf195b2
am cc24170d: Merge "fix [3374821] Cannot take screenshot of HC preview" into honeycomb
...
* commit 'cc24170dc653ea5fc9fe7b9b8c596700c4d6dc99':
fix [3374821] Cannot take screenshot of HC preview
2011-02-09 13:22:46 -08:00
Mathias Agopian
5d90264a79
Merge "fix [3374821] Cannot take screenshot of HC preview" into honeycomb
2011-02-09 13:18:53 -08:00
Wink Saville
0db20b9d86
Merge "Telephony: Fix cb sms implementation"
2011-02-09 13:09:24 -08:00
Mathias Agopian
4ed86b8f5c
am ada1b6f2: Merge "fix [3421350] Killing a game that uses the accelerometer renders the device unable to sleep" into gingerbread
...
* commit 'ada1b6f297596cac4451edbc83df060a31cdda68':
fix [3421350] Killing a game that uses the accelerometer renders the device unable to sleep
2011-02-09 13:09:12 -08:00
Glenn Kasten
686bb3f6a4
Merge "Bug 3438513 Fix incorrect throws clause"
2011-02-09 13:08:00 -08:00
Mathias Agopian
6cb8fc11ee
Merge "fix [3421350] Killing a game that uses the accelerometer renders the device unable to sleep" into gingerbread
2011-02-09 13:06:00 -08:00
Scott Main
32904147c2
am 07cefd3c: add 2.3.3 announcement to site home page
...
* commit '07cefd3cc3d8d27750e4fc725d9aec86250750dd':
add 2.3.3 announcement to site home page
2011-02-09 13:03:11 -08:00
Dirk Dougherty
94f6064919
am bf5cde2f: am be04bfd0: am 01967c0e: Merge "Doc change: Add diff report for api 10." into gingerbread
...
* commit 'bf5cde2f7112b53e5b237e7275267caef25c789d':
Doc change: Add diff report for api 10.
2011-02-09 12:22:26 -08:00
Gilles Debunne
9256ea6339
am 54afc818: am 63bd55c7: am cdfe8999: Fix for multiple merge problem.
...
* commit '54afc818afa2d3ffe525e35ecdfc421c6fa862f3':
Fix for multiple merge problem.
2011-02-09 12:22:23 -08:00
Dirk Dougherty
93457e74e9
am be04bfd0: am 01967c0e: Merge "Doc change: Add diff report for api 10." into gingerbread
...
* commit 'be04bfd09914bbabf715959170c32030072b65f4':
Doc change: Add diff report for api 10.
2011-02-09 12:19:54 -08:00
Gilles Debunne
78fd484d9b
am 63bd55c7: am cdfe8999: Fix for multiple merge problem.
...
* commit '63bd55c7bf6f5d9384ad25637a4f4a7d2ef8d441':
Fix for multiple merge problem.
2011-02-09 12:19:46 -08:00
Svetoslav Ganov
31474719f7
Merge "Added tests for WebView accessibility no JS"
2011-02-09 11:14:43 -08:00
Eric Fischer
6f851b003f
am c3e3cc3d: (-s ours) am ebcbde6a: Merge "Import revised translations. DO NOT MERGE" into honeycomb
...
* commit 'c3e3cc3dee2a6a20fabbf98496ae1d9ddedc897c':
Import revised translations. DO NOT MERGE
2011-02-09 10:52:11 -08:00