44824 Commits

Author SHA1 Message Date
Andreas Huber
8cdc31f76a Merge "Fix the build." 2011-02-10 12:35:06 -08:00
Andreas Huber
c2f9a26b1e Fix the build.
Change-Id: I9b777ffb260eb0f3790ae0907e4a443d33fa3f2f
2011-02-10 12:34:25 -08:00
Marco Nelissen
4fd18e6310 Merge "Better genre support." 2011-02-10 12:23:11 -08:00
Steve Block
fb40a64d80 Merge "Increase DRT timeout while waiting for WebView to dump as text" 2011-02-10 12:13:27 -08:00
Marco Nelissen
cb613a04c1 Better genre support.
Expand the list of genres, and support genres that look like "(192)CustomGenre".
b/3349415

Change-Id: I617ea7dfeace708bbd0d9c00ff04de72fa2d383e
2011-02-10 12:09:16 -08:00
Adam Powell
96bad13901 Merge "Fix bug 3440372 - Spinner measurement issues with new rules" 2011-02-10 12:07:38 -08:00
Adam Powell
b70c727b2e Fix bug 3440372 - Spinner measurement issues with new rules
Change-Id: I3633239dc42277eb6447cf7f0907f35f4b45e873
2011-02-10 12:04:59 -08:00
Andreas Huber
8e6f60d9bb Merge "Change timestamp handling in RTSP, remove unused, experimental, gtalk support" 2011-02-10 11:55:22 -08:00
Andreas Huber
b2934b16ea Change timestamp handling in RTSP, remove unused, experimental, gtalk support
related-to-bug: 3216447

NTP timestamp handling is now done at a higher layer than before.

Change-Id: I9fb23f1335110ec59e534f9aa0fe6f6a6406dd52
2011-02-10 11:53:54 -08:00
John Reck
c943cd123e Merge "Fix spacing issue" 2011-02-10 11:53:10 -08:00
John Reck
e4fee50558 Fix spacing issue
Bug: 3432069

Change-Id: If58d19cacb99f3ab7fdc4d8fdbb86f0853010ed1
2011-02-10 11:33:35 -08:00
Xavier Ducrohet
138a54cb20 Merge "LayoutLib: Annotate the custom delegate methods." 2011-02-10 11:27:27 -08:00
Steve Block
8e8cf732d1 Increase DRT timeout while waiting for WebView to dump as text
This avoids problems with LayoutTests fast/frames/lots-of-iframes.html and fast/frames/lots-of-objects.html

Bug: 3440578
Change-Id: Ic045141f986baf779ffc9eec804ba994ce0d0fbe
2011-02-10 11:11:22 -08:00
Santosh Madhava
adca6840e3 Merge "Fix for 3431967: Memory leak from video editor engine in JNI" 2011-02-10 09:41:27 -08:00
Chet Haase
c77d7b42ab Merge "Fix animation and layoutTransition issues." 2011-02-10 09:16:56 -08:00
Santosh Madhava
91ba3a0033 Fix for 3431967: Memory leak from video editor engine in JNI
Change-Id: If879bbcf68d01fea0995be0faf070b6dd7361218
2011-02-09 19:25:17 -08:00
Xavier Ducrohet
9a4fe29c8d LayoutLib: Annotate the custom delegate methods.
Every method implementing a delegate needed by the
layoutlib_create bytecode modification must now be
annotated with LayoutlibDelegate.

The methods in the original source code that are delegated
are already automatically annotated. Now with the implementations
being annotated we can do bi-directional tests and find not
only missing implementations but also dead obsolete code.

This will be useful when backporting to earlier versions of
Android, or when native (non public) method disappear. In fact,
the new test detected one such method in Shader.

Change-Id: I491708b68ac2736ca5669aa86cd5e930a00f9db3
2011-02-09 17:29:29 -08:00
Cary Clark
83a7b963f0 Merge "only allow dpad center for key long press" 2011-02-09 17:15:10 -08:00
Gilles Debunne
711734a2f8 AutoComplete list does not hide the IME when it re-appears.
Bug 3415891

With the current behavior, as soon as the list is expanded by
'long' pressing on or scrolling its content, it will always further appear
in its long state, thus hiding the IME.

This fix changes this behavior so that the default state is always
compact, not hiding the IME, and an explicit expansion
is always required.

Also fixes a bug in ListPopupWindow that prevented the timer that
expands the list from being started.

Change-Id: I896e92d54961769c10b276c36f6510e91ff096a2
2011-02-09 16:56:13 -08:00
Gilles Debunne
a4a5758b5f The tab key completes text in AutoCompleteTextView.
Bug 3330651.

The first item in the list is not selected by default. From discussions
in other related bugs, there does not seem to be an agreement on this.

Supporting the actual token separator has also been punted. This would
require a new method in the Tokenizer, which could be ill-defined for
exotic tokenizer, plus typing a comma (for instance) to achieve a
completion is not a common pattern.

Change-Id: I30baf62077c412256175f871d21f4841e104f212
2011-02-09 16:54:18 -08:00
Chet Haase
add6577a01 Fix animation and layoutTransition issues.
There were some subtle timing issues in animators with ending animations that
were not completely initialized (possibly because a startDelay'd animator
was ended before the delay elapsed).
Also, LayoutTransition had bugs around running a transition on a container
while a previously-started transition was still in progress. This could result
in some minor artifacts or crash bugs, depending on the durations and delays set
on the transition animations.

Change-Id: Ic6a69601f1ce9a55db15fff6b8ed25950b354491
2011-02-09 16:47:29 -08:00
Steve Block
63c9809e84 Merge "Remove LayoutTest http/tests/xmlhttprequest/simple-cross-origin-progress-events.html from skipped list" 2011-02-09 16:37:34 -08:00
Cary Clark
1477b8f34d only allow dpad center for key long press
Holding down the enter key on a physical keyboard
doesn't make sense to map to long press; the desktop
doesn't work that way either.

bug:3344108
Change-Id: Icf02940dcadf194357b680ae1e3028751d16a1ea
2011-02-09 19:33:00 -05:00
Steve Block
c1f81466f7 Remove LayoutTest http/tests/xmlhttprequest/simple-cross-origin-progress-events.html from skipped list
This test no longer crashes, so we should no longer skip it.

Bug: 2929261
Change-Id: I808926c3dce2e9a01d6c190a18187d9ca965b662
2011-02-09 16:30:12 -08:00
Xavier Ducrohet
e18457fbef Merge "LayoutLib: now depends on tools-common-prebuilt." 2011-02-09 16:27:27 -08:00
Xavier Ducrohet
f3f608452c LayoutLib: now depends on tools-common-prebuilt.
Change-Id: I11196c2363da378027fb8ca001e7dce0f58f657f
2011-02-09 16:19:43 -08:00
Cary Clark
a81c2193f7 Merge "move selectAll to match framework" 2011-02-09 16:05:13 -08:00
James Dong
95a497d0f2 Merge "Reduce blocking time in file write" 2011-02-09 16:04:14 -08:00
Cary Clark
310433b258 move selectAll to match framework
bug:3439736
Change-Id: Ib4f1464ab927252eb223e3d9729bea216ebc0d54
2011-02-09 18:58:17 -05:00
James Dong
f6a2bff0c9 Reduce blocking time in file write
bug - 3418787

Change-Id: I4723662bf46ed07271be8468f84ae5d93cb793fa
2011-02-09 15:44:32 -08:00
Patrick Scott
fb4ff3d609 Merge "Call window.onscroll event at the end of scrolling." 2011-02-09 15:44:21 -08:00
Alex Sakhartchouk
ea66e4c6f0 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
0f81d19d82 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
85bccf6e0b 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
e05bd9ee7f 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
699a096943 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
0e40519bee Merge "Doc change: add diff report for API 11" into honeycomb 2011-02-09 15:19:08 -08:00
Dirk Dougherty
28ee00447d 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
e110975368 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
Dirk Dougherty
fefa95a9c8 Doc change: Add version notes for Android 2.3.3. 2011-02-09 14:04:10 -08:00
James Dong
455644ee1c Merge "Catch read error from AudioRecord and do not assert" 2011-02-09 13:58:06 -08:00
Vasu Nori
6b9ef860aa Merge "turn off sqlite WAL until bugs bug:3024421 and bug:3353077 are fixed" 2011-02-09 13:34:43 -08:00
Mathias Agopian
1eac1c8e48 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
bfe9e9cf18 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
cc24170dc6 Merge "fix [3374821] Cannot take screenshot of HC preview" into honeycomb 2011-02-09 13:18:53 -08:00
Glenn Kasten
ac018be84f Merge "Bug 3438513 Fix incorrect throws clause" 2011-02-09 13:08:00 -08:00
James Dong
10a5e2794d Catch read error from AudioRecord and do not assert
bug - 3439313

Change-Id: Ie29d6e4945978ef27fc3e5849e467d895c7736d3
2011-02-09 12:49:31 -08:00
Dirk Dougherty
da21e03041 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
fdc8ec689f 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
bf5cde2f71 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