summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add Java API for writing TTS enginesBjorn Bringert2011-04-1524-4352/+2089
| | | | | | | | | | 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
* Merge "Use system IME for LockScreen password mode."Jim Miller2011-04-151-7/+18
|\
| * Use system IME for LockScreen password mode.Jim Miller2011-04-141-7/+18
| | | | | | | | Change-Id: I16c4d26fd2aeac2fe1647145b70dfde9d8d26af9
* | Add comments for APIs of InputMethodManager added to Honeycombsatok2011-04-151-2/+37
| | | | | | | | Change-Id: I89501889c612aaeca503d0c11f14e23c67a0ca39
* | Add an API to get the last used input method subtypesatok2011-04-154-0/+31
| | | | | | | | | | | | | | | | Bug: 4075039 - Voice input requires to know the last used input method subtype. Change-Id: I603a4fb88a2af5195e52188adfa6585ad80304fa
* | Merge "Replace a custom AndroidRuntime::findClass with a more targeted fix."Elliott Hughes2011-04-146-214/+145
|\ \
| * | Replace a custom AndroidRuntime::findClass with a more targeted fix.Elliott Hughes2011-04-136-214/+145
| | | | | | | | | | | | | | | | | | | | | 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
* | | am 07a630d2: am 9a03a73a: am f6f87c98: Merge "Fix issue #4291805: Tap Fish ↵Dianne Hackborn2011-04-141-11/+10
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | crashes on launch" into honeycomb-mr1 * commit '07a630d23ef326f820e6339b5f691df0aafd3574': Fix issue #4291805: Tap Fish crashes on launch
| * \ \ am 9a03a73a: am f6f87c98: Merge "Fix issue #4291805: Tap Fish crashes on ↵Dianne Hackborn2011-04-141-11/+10
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | launch" into honeycomb-mr1 * commit '9a03a73a44c69706fe2b97a28632928f58b434b1': Fix issue #4291805: Tap Fish crashes on launch
| | * \ \ am f6f87c98: Merge "Fix issue #4291805: Tap Fish crashes on launch" into ↵Dianne Hackborn2011-04-141-11/+10
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | honeycomb-mr1 * commit 'f6f87c985989603139b31df663f9f9a90543cacc': Fix issue #4291805: Tap Fish crashes on launch
| | | * \ \ Merge "Fix issue #4291805: Tap Fish crashes on launch" into honeycomb-mr1Dianne Hackborn2011-04-141-11/+10
| | | |\ \ \
| | | | * | | Fix issue #4291805: Tap Fish crashes on launchDianne Hackborn2011-04-141-11/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The activity manager got a little too aggressive about argument validation. Change-Id: I3cca0cd3135b98e5c50d26db778ec4ec28a47ec1
* | | | | | | am 1bfb2db9: (-s ours) am b590ca85: am 4e3d6aa0: am d284a867: (-s ours) ↵Eric Fischer2011-04-140-0/+0
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Import revised translations. DO NOT MERGE" into honeycomb * commit '1bfb2db93514f8ed70d0a02c12d7ce4791d6b336': Import revised translations. DO NOT MERGE
| * | | | | | am b590ca85: am 4e3d6aa0: am d284a867: (-s ours) Merge "Import revised ↵Eric Fischer2011-04-140-0/+0
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | translations. DO NOT MERGE" into honeycomb * commit 'b590ca85afba6b886cc995e9a6092457174ea016': Import revised translations. DO NOT MERGE
| | * | | | | am 4e3d6aa0: am d284a867: (-s ours) Merge "Import revised translations. DO ↵Eric Fischer2011-04-140-0/+0
| | |\ \ \ \ \ | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NOT MERGE" into honeycomb * commit '4e3d6aa0688f023dfe5feb2eb197207cc8267463': Import revised translations. DO NOT MERGE
| | | * | | | am d284a867: (-s ours) Merge "Import revised translations. DO NOT MERGE" ↵Eric Fischer2011-04-140-0/+0
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into honeycomb * commit 'd284a8676e002a72b66d321402ec7f4ed61c7915': Import revised translations. DO NOT MERGE
| | | | * \ \ \ Merge "Import revised translations. DO NOT MERGE" into honeycombEric Fischer2011-04-145-10/+10
| | | | |\ \ \ \
| | | | | * | | | Import revised translations. DO NOT MERGEEric Fischer2011-04-145-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I796dc2ad1556201f3b443b8185f5280cc8e1e213
* | | | | | | | | am cc0cfcf2: am a4f4a843: am 2a08e7bf: am d08debcb: docs: bring back the SDK ↵Scott Main2011-04-143-22/+447
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | EULA wall for downloading archived SDKs * commit 'cc0cfcf2ece4610126b7b213af2673da45772270': docs: bring back the SDK EULA wall for downloading archived SDKs
| * | | | | | | | am a4f4a843: am 2a08e7bf: am d08debcb: docs: bring back the SDK EULA wall ↵Scott Main2011-04-143-22/+447
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for downloading archived SDKs * commit 'a4f4a8431caaef4e1381acc41a84e44e99a13e37': docs: bring back the SDK EULA wall for downloading archived SDKs
| | * | | | | | | am 2a08e7bf: am d08debcb: docs: bring back the SDK EULA wall for downloading ↵Scott Main2011-04-143-22/+447
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | archived SDKs * commit '2a08e7bf6778fe7494be45c7231e2df3edce5ab4': docs: bring back the SDK EULA wall for downloading archived SDKs
| | | * | | | | | am d08debcb: docs: bring back the SDK EULA wall for downloading archived SDKsScott Main2011-04-143-22/+447
| | | |\ \ \ \ \ \ | | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd08debcb211ec2e369c8c88ce15e4aaadd54a8d4': docs: bring back the SDK EULA wall for downloading archived SDKs
| | | | * | | | | docs: bring back the SDK EULA wall for downloading archived SDKsScott Main2011-04-143-22/+447
| | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ieccd0d03ca49a68d7d4956aa4991d8a73ffff674
* | | | | | | | Merge "Address comments for dalvik/docs/jni-tips.html documentation."Elliott Hughes2011-04-142-14/+16
|\ \ \ \ \ \ \ \
| * | | | | | | | Address comments for dalvik/docs/jni-tips.html documentation.Elliott Hughes2011-04-142-14/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7b46e4a04491290e922b4af9491725a75b1c0a32
* | | | | | | | | Merge "First bits of WebDriver containing blocking function to load a page ↵Steve Block2011-04-142-0/+409
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and fetching the page source."
| * | | | | | | | | First bits of WebDriver containing blocking function to load a page andDounia Berrada2011-04-142-0/+409
| | |_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fetching the page source. bug: 3457555 Change-Id: I5fbeb7f6103f1e1af04b7a6964cde5710338ee6e
* | | | | | | | | Merge "Rewrite battery history storage."Dianne Hackborn2011-04-144-154/+409
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Rewrite battery history storage.Dianne Hackborn2011-04-144-154/+409
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | Merge "Add the old dalvik/docs/jni-tips.html documentation."Elliott Hughes2011-04-142-0/+716
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add the old dalvik/docs/jni-tips.html documentation.Elliott Hughes2011-04-132-0/+716
| | |_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are no content changes here, just formatting changes to fit the local style. I'll make content changes later. Change-Id: I4109ca819469bc9316c847cdc9176ed41de3ef87
* | | | | | | | | Merge "Fix around suggestionSpan."Gilles Debunne2011-04-142-3/+8
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Fix around suggestionSpan.Gilles Debunne2011-04-132-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since the kind was unknown, doing a copy/cut on text with a SuggestionSpan crashed. Change-Id: I10c0677b3587897b82c794db57d7b07149f12e09
* | | | | | | | | am a4b76ff4: am d69ec89f: am 46b59ef0: Merge "Fix access point parsing: ↵Xia Wang2011-04-133-57/+26
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | / / / / / | | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | am d69ec89f: am 46b59ef0: Merge "Fix access point parsing: reset static link ↵Xia Wang2011-04-133-57/+26
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | | | | am 46b59ef0: Merge "Fix access point parsing: reset static link property ↵Xia Wang2011-04-133-57/+26
| | |\ \ \ \ \ \ | | | | |_|/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | * | | | | Merge "Fix access point parsing: reset static link property after parsing ↵Xia Wang2011-04-133-57/+26
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | static ip setting Fix removeConfiguredNetwork: add sleep between remove configured network and disable wifi" into honeycomb-mr1
| | | | * | | | | Fix access point parsing: reset static link property after parsingXia Wang2011-04-083-57/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | static ip setting Fix removeConfiguredNetwork: add sleep between remove configured network and disable wifi Change-Id: I619e79e9bc414b9aeae3537dbc642a7fbc9fca97
* | | | | | | | | Merge "- Add another parameter in notify() to be able to send timed text ↵Gloria Wang2011-04-1310-19/+90
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | sample through listener during video playback. - Add OnTimedTextListener in the MediaPlayer For feature request 800939."
| * | | | | | | | - Add another parameter in notify() to be able to send timed text sampleGloria Wang2011-04-1310-19/+90
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | through listener during video playback. - Add OnTimedTextListener in the MediaPlayer For feature request 800939. Change-Id: I65072c27acb4c0037109a72be38c73e9f667420f
* | | | | | | | | am 8d2e14da: am 34cd123a: am b0d6f10e: Bug 4167061 remove debugging codeGlenn Kasten2011-04-131-1/+1
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | * commit '8d2e14daa752d657b9747fc9734fbfd7b34c1f7a': Bug 4167061 remove debugging code
| * | | | | | | | am 34cd123a: am b0d6f10e: Bug 4167061 remove debugging codeGlenn Kasten2011-04-131-1/+1
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | * commit '34cd123a2ee1aa9d13d7eb9ee9c9dd5a1cea50a4': Bug 4167061 remove debugging code
| | * | | | | | | am b0d6f10e: Bug 4167061 remove debugging codeGlenn Kasten2011-04-131-1/+1
| | |\ \ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | * commit 'b0d6f10eedeef099164995d51dbd076a6fcc5acc': Bug 4167061 remove debugging code
| | | * | | | | | Bug 4167061 remove debugging codeGlenn Kasten2011-04-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1cb46a7bbf885c72e75d32f3f7675d90ab611e85
* | | | | | | | | Merge "Fix a typo in FrameLayout JavaDoc"Steve Block2011-04-131-2/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix a typo in FrameLayout JavaDocSteve Block2011-04-131-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8b016aff1f790fbeaf435170c1ff33455ec91204
* | | | | | | | | | Merge "More native code cleanup."Elliott Hughes2011-04-132-248/+177
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | More native code cleanup.Elliott Hughes2011-04-132-248/+177
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use ScopedUtfChars (fixes a leak in TrafficStats, and fixes a crash in Wifi in a case where GetStringChars could have been called with a pending exception). Change-Id: I3465ff392b4038dfdafa6af80ec1314cc6d6a11c
* | | | | | | | | | Merge "Use an @hide libcore API to get the FileDescriptor from a Socket."Elliott Hughes2011-04-132-73/+33
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Use an @hide libcore API to get the FileDescriptor from a Socket.Elliott Hughes2011-04-122-73/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Saves having your own native code... Change-Id: Ib082a6530bcf743a35031500cee6318bc92d4d35