Dianne Hackborn
afdbaca1d2
Merge "More battery stats improvements."
2011-04-15 12:54:15 -07:00
Bjorn Bringert
bbdfeadb5d
Merge "Improve TTS engine audio buffer API"
2011-04-15 07:28:40 -07:00
Wu-cheng Li
48b5d315af
Merge "Fix camera javadoc errors."
2011-04-15 04:21:43 -07:00
Steve Block
4b678eb581
Merge "Adding WebElement.java which provides DOM friendly API function to lookup HTML elements in the page."
2011-04-15 03:17:46 -07:00
Bjorn Bringert
a2ad6b74a3
Add Java API for writing TTS engines
...
This removes the old non-public C++ API for TTS
engines and replaces it with a Java API.
The new API is still @hidden, until it has been approved.
Bug: 4148636
Change-Id: I7614ff788e11f897e87052f684f1b4938d539fb7
2011-04-15 10:04:31 +01:00
Jim Miller
1395259fd6
Merge "Use system IME for LockScreen password mode."
2011-04-15 01:07:45 -07:00
Elliott Hughes
c45f78c867
Merge "Replace a custom AndroidRuntime::findClass with a more targeted fix."
2011-04-14 17:00:52 -07:00
Dianne Hackborn
fd07b866bc
am 07a630d2: am 9a03a73a: am f6f87c98: Merge "Fix issue #4291805 : Tap Fish crashes on launch" into honeycomb-mr1
...
* commit '07a630d23ef326f820e6339b5f691df0aafd3574':
Fix issue #4291805 : Tap Fish crashes on launch
2011-04-14 15:43:03 -07:00
Dianne Hackborn
0932c14330
am 9a03a73a: am f6f87c98: Merge "Fix issue #4291805 : Tap Fish crashes on launch" into honeycomb-mr1
...
* commit '9a03a73a44c69706fe2b97a28632928f58b434b1':
Fix issue #4291805 : Tap Fish crashes on launch
2011-04-14 15:40:00 -07:00
Dianne Hackborn
3ba563f61a
am f6f87c98: Merge "Fix issue #4291805 : Tap Fish crashes on launch" into honeycomb-mr1
...
* commit 'f6f87c985989603139b31df663f9f9a90543cacc':
Fix issue #4291805 : Tap Fish crashes on launch
2011-04-14 15:27:32 -07:00
Dianne Hackborn
2f94260a9c
Merge "Fix issue #4291805 : Tap Fish crashes on launch" into honeycomb-mr1
2011-04-14 15:10:31 -07:00
Eric Fischer
8d5e34d680
am 1bfb2db9: (-s ours) am b590ca85: am 4e3d6aa0: am d284a867: (-s ours) Merge "Import revised translations. DO NOT MERGE" into honeycomb
...
* commit '1bfb2db93514f8ed70d0a02c12d7ce4791d6b336':
Import revised translations. DO NOT MERGE
2011-04-14 15:04:41 -07:00
Scott Main
9da2a5de25
am cc0cfcf2: am a4f4a843: am 2a08e7bf: am d08debcb: docs: bring back the SDK EULA wall for downloading archived SDKs
...
* commit 'cc0cfcf2ece4610126b7b213af2673da45772270':
docs: bring back the SDK EULA wall for downloading archived SDKs
2011-04-14 15:04:17 -07:00
Eric Fischer
a14b513ce8
am b590ca85: am 4e3d6aa0: am d284a867: (-s ours) Merge "Import revised translations. DO NOT MERGE" into honeycomb
...
* commit 'b590ca85afba6b886cc995e9a6092457174ea016':
Import revised translations. DO NOT MERGE
2011-04-14 14:29:19 -07:00
Eric Fischer
ba4aa67beb
am 4e3d6aa0: am d284a867: (-s ours) Merge "Import revised translations. DO NOT MERGE" into honeycomb
...
* commit '4e3d6aa0688f023dfe5feb2eb197207cc8267463':
Import revised translations. DO NOT MERGE
2011-04-14 14:26:46 -07:00
Scott Main
45931cdaa7
am a4f4a843: am 2a08e7bf: am d08debcb: docs: bring back the SDK EULA wall for downloading archived SDKs
...
* commit 'a4f4a8431caaef4e1381acc41a84e44e99a13e37':
docs: bring back the SDK EULA wall for downloading archived SDKs
2011-04-14 14:23:23 -07:00
Eric Fischer
8d5645716c
am d284a867: (-s ours) Merge "Import revised translations. DO NOT MERGE" into honeycomb
...
* commit 'd284a8676e002a72b66d321402ec7f4ed61c7915':
Import revised translations. DO NOT MERGE
2011-04-14 14:21:57 -07:00
Eric Fischer
7c1a8f7461
Merge "Import revised translations. DO NOT MERGE" into honeycomb
2011-04-14 14:14:46 -07:00
Scott Main
b0ca3a2935
am 2a08e7bf: am d08debcb: docs: bring back the SDK EULA wall for downloading archived SDKs
...
* commit '2a08e7bf6778fe7494be45c7231e2df3edce5ab4':
docs: bring back the SDK EULA wall for downloading archived SDKs
2011-04-14 14:08:51 -07:00
Scott Main
8fcb75765d
am d08debcb: docs: bring back the SDK EULA wall for downloading archived SDKs
...
* commit 'd08debcb211ec2e369c8c88ce15e4aaadd54a8d4':
docs: bring back the SDK EULA wall for downloading archived SDKs
2011-04-14 13:55:16 -07:00
Elliott Hughes
ffbd777fb4
Merge "Address comments for dalvik/docs/jni-tips.html documentation."
2011-04-14 12:54:27 -07:00
Steve Block
38539f5fda
Merge "First bits of WebDriver containing blocking function to load a page and fetching the page source."
2011-04-14 11:07:04 -07:00
Dianne Hackborn
124e39bd45
Merge "Rewrite battery history storage."
2011-04-14 10:58:28 -07:00
Dianne Hackborn
97e2bcd760
Rewrite battery history storage.
...
We now write battery history directly into a buffer, instead of
creating objects. This allows for more efficient storage; later
it can be even better because we can only write deltas.
The old code is still there temporarily for validation.
Change-Id: I9707d4d8ff30855be8ebdc93bc078911040d8e0b
2011-04-14 10:57:22 -07:00
Elliott Hughes
af491da9c3
Merge "Add the old dalvik/docs/jni-tips.html documentation."
2011-04-14 10:43:40 -07:00
Gilles Debunne
19622113cf
Merge "Fix around suggestionSpan."
2011-04-14 10:38:05 -07:00
Elliott Hughes
ca1feb405e
Replace a custom AndroidRuntime::findClass with a more targeted fix.
...
This seems simpler and more contained, and I think the comment explaining
why hoop-jumping is necessary is a bit clearer now.
Change-Id: Ief4afd7cbb42188ed835fce23e497520bdb753a8
2011-04-13 16:43:15 -07:00
Xia Wang
4849bc5b3d
am a4b76ff4: am d69ec89f: am 46b59ef0: Merge "Fix access point parsing: reset static link property after parsing static ip setting Fix removeConfiguredNetwork: add sleep between remove configured network and disable wifi" into honeycomb-mr1
...
* commit 'a4b76ff4911538f01e92af2f3fa3f4016ad0e290':
Fix access point parsing: reset static link property after parsing static ip setting Fix removeConfiguredNetwork: add sleep between remove configured network and disable wifi
2011-04-13 16:05:07 -07:00
Xia Wang
001edca47a
am d69ec89f: am 46b59ef0: Merge "Fix access point parsing: reset static link property after parsing static ip setting Fix removeConfiguredNetwork: add sleep between remove configured network and disable wifi" into honeycomb-mr1
...
* commit 'd69ec89f5d31064174d79e2e77504814629cffa6':
Fix access point parsing: reset static link property after parsing static ip setting Fix removeConfiguredNetwork: add sleep between remove configured network and disable wifi
2011-04-13 15:52:39 -07:00
Gloria Wang
4a6f0f2427
Merge "- Add another parameter in notify() to be able to send timed text sample through listener during video playback. - Add OnTimedTextListener in the MediaPlayer For feature request 800939."
2011-04-13 15:36:14 -07:00
Xia Wang
203f649656
am 46b59ef0: Merge "Fix access point parsing: reset static link property after parsing static ip setting Fix removeConfiguredNetwork: add sleep between remove configured network and disable wifi" into honeycomb-mr1
...
* commit '46b59ef01be530a6bbe3f0e9a2bed27de9985f40':
Fix access point parsing: reset static link property after parsing static ip setting Fix removeConfiguredNetwork: add sleep between remove configured network and disable wifi
2011-04-13 15:34:29 -07:00
Xia Wang
aef161d454
Merge "Fix access point parsing: reset static link property after parsing static ip setting Fix removeConfiguredNetwork: add sleep between remove configured network and disable wifi" into honeycomb-mr1
2011-04-13 15:13:10 -07:00
Glenn Kasten
892defdd55
am 8d2e14da: am 34cd123a: am b0d6f10e: Bug 4167061 remove debugging code
...
* commit '8d2e14daa752d657b9747fc9734fbfd7b34c1f7a':
Bug 4167061 remove debugging code
2011-04-13 11:56:41 -07:00
Glenn Kasten
fbdf138926
am 34cd123a: am b0d6f10e: Bug 4167061 remove debugging code
...
* commit '34cd123a2ee1aa9d13d7eb9ee9c9dd5a1cea50a4':
Bug 4167061 remove debugging code
2011-04-13 11:52:32 -07:00
Glenn Kasten
ce5c08c2e4
am b0d6f10e: Bug 4167061 remove debugging code
...
* commit 'b0d6f10eedeef099164995d51dbd076a6fcc5acc':
Bug 4167061 remove debugging code
2011-04-13 11:48:28 -07:00
Steve Block
03b3ac9683
Merge "Fix a typo in FrameLayout JavaDoc"
2011-04-13 11:10:17 -07:00
Elliott Hughes
3ce7d3a6cf
Merge "More native code cleanup."
2011-04-13 11:09:57 -07:00
Andreas Huber
51faf46e29
Parcel::appendFrom({const } Parcel *parcel, size_t, size_t)
...
As far as I can tell "parcel" isn't actually modified by the implementation.
Change-Id: Ib806eefdc13c97b932773e1dc9ca3a4aad4422b2
2011-04-13 10:21:56 -07:00
Elliott Hughes
36df426dbc
Merge "Use an @hide libcore API to get the FileDescriptor from a Socket."
2011-04-13 10:18:03 -07:00
Elliott Hughes
fd272c251c
Merge "Don't allocate a raw object then call its constructor manually..."
2011-04-13 10:17:46 -07:00
Wu-cheng Li
89675f7611
Merge "Add camera metering area API."
2011-04-13 01:14:42 -07:00
Wink Saville
21d7782cb3
am 05be003f: am c078a436: Merge "Fix occasional phone app crash" into honeycomb-LTE
...
* commit '05be003f7f3dd758c44c2cdb3e7aa638d8daa446':
Fix occasional phone app crash
2011-04-12 17:03:29 -07:00
Wink Saville
71d21b7efb
am c078a436: Merge "Fix occasional phone app crash" into honeycomb-LTE
...
* commit 'c078a4362791cec3976c4312d3f7e0e96b3487bf':
Fix occasional phone app crash
2011-04-12 17:00:57 -07:00
Wink Saville
36fb943450
Merge "Fix occasional phone app crash" into honeycomb-LTE
2011-04-12 16:53:54 -07:00
Elliott Hughes
5ac1fcab91
Merge "Remove useless forward declarations."
2011-04-12 16:29:49 -07:00
David Li
c2ca836b17
GLES2Dbg: added CaptureDraw and CaptureSwap options
...
CaptureDraw specifies how many glDrawArrays/Elements to glReadPixel
CaptureSwap similarly applies to eglSwapBuffers
Change-Id: Ie7a7e3392b4ecdc0659dcee04f4bab97c35267dc
Signed-off-by: David Li <davidxli@google.com>
2011-04-12 15:56:10 -07:00
David Li
499c6f02e6
GLES2Dbg: use dump.gles2dbg file when fails to create socket
...
setprop debug.egl.debug_forceUseFile 1: always use file
setprop debug.egl.debug_maxFileSize <int MB>: exit when reached
setprop debug.egl.debug_filePath <path>: may need to make the file
writable first.
setprop debug.egl.debug_port <unsigned short>
setprop debug.egl.debug_proc <proc cmdline>: to match debuggee process
Change-Id: I34ca1f3092f3abf17e2ded9d1689d0cdef6e07e8
Signed-off-by: David Li <davidxli@google.com>
2011-04-12 15:56:10 -07:00
David Li
904f18f792
GLES2Dbg: add EXTEND_AFTER_CALL_Debug_* macro and improve protocol
...
To allow auto generate of Debug_glReadPixels function.
Also added AfterGeneratedCall messag type, and client override
of expectResponse for improving protocol.
Also implemented callers for client to get shader/program iv & infolog
Change-Id: I8426de0be4b7ffcb8b2b4f063ad85d19a9d2d72e
Signed-off-by: David Li <davidxli@google.com>
2011-04-12 15:56:10 -07:00
David Li
864f839e96
GLES2Dbg: change GLES2_dbg to shared library
...
Change-Id: I493e9bff431bd939f4e80e1e9c614dd557307fa2
Signed-off-by: David Li <davidxli@google.com>
2011-04-12 15:56:10 -07:00
Kenny Root
029b92251a
Merge "Updated system packages retain shared user"
2011-04-12 15:34:42 -07:00