Wink Saville
72f0224f2f
am 48fe5c3a: am bdce3d2c: am 01a5eba8: am 6e25789f: Merge "Telephony: Fix cb sms implementation"
...
* commit '48fe5c3a86435a401fa88b43e15b84e29e660173':
Telephony: Fix cb sms implementation
2011-02-10 13:57:10 -08:00
Mathias Agopian
3013ce4f7c
am b624eea7: am d0f27f43: am ada1b6f2: Merge "fix [3421350] Killing a game that uses the accelerometer renders the device unable to sleep" into gingerbread
...
* commit 'b624eea70c18d616a1d0860eb30ae31ac5a33085':
fix [3421350] Killing a game that uses the accelerometer renders the device unable to sleep
2011-02-10 13:57:05 -08:00
Scott Main
6b5e69c7ef
am 0d66a2ec: am b605869c: am 07cefd3c: add 2.3.3 announcement to site home page
...
* commit '0d66a2ec428fe5ae746629b6c62750d1201e3f6f':
add 2.3.3 announcement to site home page
2011-02-10 13:57:02 -08:00
Jeff Hamilton
f6de2431ce
am 9e5ffb55: am c1cc9ba6: am 58c9d472: Merge "More documentation updates for NFC." into gingerbread
...
* commit '9e5ffb55e8eabf8fd9215cbc68538ed5d9efe2d4':
More documentation updates for NFC.
2011-02-10 13:56:56 -08:00
Dirk Dougherty
fa67d647d4
am 58dacceb: am 8d56f6de: am a3f53afd: Merge "Doc change: Add version notes for Android 2.3.3." into gingerbread
...
* commit '58dacceb789929c0d870649c5c0c2cab1045b898':
Doc change: Add version notes for Android 2.3.3.
2011-02-10 13:56:52 -08:00
Nick Pelly
e49448f715
am cc47600d: am 47dac545: am 39cf3a44: Document NFC permissions.
...
* commit 'cc47600d4d7850f2903d2d59cc7f44528d40c8e5':
Document NFC permissions.
2011-02-10 13:56:46 -08:00
Jeff Hamilton
40bbeeb409
am 510ced64: am 1ac35411: am 584afa8d: Merge "Improve the docs a bit for foreground dispatch." into gingerbread
...
* commit '510ced64f4316702cea07a55d1d473bdc07b2c86':
Improve the docs a bit for foreground dispatch.
2011-02-10 13:56:41 -08:00
Eric Fischer
da4efd3488
am bdf587e8: (-s ours) am c1c31433: (-s ours) am be4b39d2: Merge "Import revised translations. DO NOT MERGE" into gingerbread
...
* commit 'bdf587e8b9247fbf8e544f330cf0ec9efb1194db':
Import revised translations. DO NOT MERGE
2011-02-10 13:56:36 -08:00
Scott Main
e75d8a7c9e
am 51d94b26: am 129c7372: am 3c01a139: rename SIP doc title
...
* commit '51d94b268a63d0ffffce92aa7cb822ae99529d84':
rename SIP doc title
2011-02-10 13:56:29 -08:00
Wink Saville
48fe5c3a86
am bdce3d2c: am 01a5eba8: am 6e25789f: Merge "Telephony: Fix cb sms implementation"
...
* commit 'bdce3d2c3516612bfd3a9e5f259a892d1a595f19':
Telephony: Fix cb sms implementation
2011-02-10 13:53:10 -08:00
Mathias Agopian
b624eea70c
am d0f27f43: am ada1b6f2: Merge "fix [3421350] Killing a game that uses the accelerometer renders the device unable to sleep" into gingerbread
...
* commit 'd0f27f435eb8a2c7e5841da68760d1f023fcf919':
fix [3421350] Killing a game that uses the accelerometer renders the device unable to sleep
2011-02-10 13:53:01 -08:00
Scott Main
0d66a2ec42
am b605869c: am 07cefd3c: add 2.3.3 announcement to site home page
...
* commit 'b605869cd36c7498ca99cc00bad5d0dfbf237c43':
add 2.3.3 announcement to site home page
2011-02-10 13:52:57 -08:00
Jeff Hamilton
9e5ffb55e8
am c1cc9ba6: am 58c9d472: Merge "More documentation updates for NFC." into gingerbread
...
* commit 'c1cc9ba6d1e2b7f1e213d215e3edb97acea79901':
More documentation updates for NFC.
2011-02-10 13:52:48 -08:00
Dirk Dougherty
58dacceb78
am 8d56f6de: am a3f53afd: Merge "Doc change: Add version notes for Android 2.3.3." into gingerbread
...
* commit '8d56f6decf9efd29b286e02c549510d681b7573d':
Doc change: Add version notes for Android 2.3.3.
2011-02-10 13:52:40 -08:00
Nick Pelly
cc47600d4d
am 47dac545: am 39cf3a44: Document NFC permissions.
...
* commit '47dac545da6468e5b46e940917eb6711c02b8e84':
Document NFC permissions.
2011-02-10 13:52:34 -08:00
Jeff Hamilton
510ced64f4
am 1ac35411: am 584afa8d: Merge "Improve the docs a bit for foreground dispatch." into gingerbread
...
* commit '1ac35411f186dca346e8d9078a4fd2d570bb8a97':
Improve the docs a bit for foreground dispatch.
2011-02-10 13:52:23 -08:00
Scott Main
4eccd96f4a
am c06e7abe: resolved conflicts for merge of 42f18194 to honeycomb-plus-aosp
...
* commit 'c06e7abe6f37d1d8bc4f1c228964229d9f101d70':
docs: move the SIP guide into guide/network/
2011-02-10 13:51:30 -08:00
Eric Fischer
bdf587e8b9
am c1c31433: (-s ours) am be4b39d2: Merge "Import revised translations. DO NOT MERGE" into gingerbread
...
* commit 'c1c314334757e0ab3c244023aec1b24433b66b48':
Import revised translations. DO NOT MERGE
2011-02-10 13:50:51 -08:00
Scott Main
51d94b268a
am 129c7372: am 3c01a139: rename SIP doc title
...
* commit '129c73723f2241f762f485a9b5421bfae3cbbdcd':
rename SIP doc title
2011-02-10 13:50:44 -08:00
Scott Main
c06e7abe6f
resolved conflicts for merge of 42f18194 to honeycomb-plus-aosp
...
Change-Id: I42c36e828f5b28d84f2062bfd4963711251696b7
2011-02-10 13:47:32 -08:00
Jesse Wilson
ed6d936eca
Merge "Remove SSLPerformanceTest and DatabaseSessionCache."
2011-02-10 13:44:56 -08:00
Jesse Wilson
74815d332c
Remove SSLPerformanceTest and DatabaseSessionCache.
...
These aren't being run.
Change-Id: I9afc617a424c675578185ac66a4f6ac3af9afacf
2011-02-10 13:17:24 -08:00
Katie McCormick
360e40ef21
am ce7c05e8: resolved conflicts for merge of 690d31a6 to honeycomb-plus-aosp
...
* commit 'ce7c05e842d4e35ce180d398ecb969aad18f3460':
cherrypick Change-Id: I5b52c5d11e111a9dab2b08fd44a439ab4db04dd2 Doc change: Adding new docs for SIP API
2011-02-10 13:03:27 -08:00
Xavier Ducrohet
aa0d2124d5
Merge "LayoutLib: remove some exceptions."
2011-02-10 13:01:34 -08:00
Katie McCormick
ce7c05e842
resolved conflicts for merge of 690d31a6 to honeycomb-plus-aosp
...
Change-Id: I1308f0a5fda0646a90dcd60a78c15538c7364cbc
2011-02-10 12:38:07 -08:00
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
Xavier Ducrohet
8a80a85552
LayoutLib: remove some exceptions.
...
We need to move away from throwing anything and instead
log errors/warnings.
Change-Id: Ib1af71a90c06e8565fbd0c061ba56f4d19baa3df
2011-02-09 19:39:52 -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