OSDN Git Service
Robert Ly [Wed, 4 May 2011 23:55:59 +0000 (16:55 -0700)]
Merge "doc change: a misplaced link removed" into honeycomb-mr1
Robert Ly [Wed, 4 May 2011 20:10:54 +0000 (13:10 -0700)]
Merge "adding the usb apis to the resources browser" into honeycomb-mr1
Robert Ly [Wed, 4 May 2011 19:18:09 +0000 (12:18 -0700)]
Merge "Doc change: adding usb docs and removed ADK doc. ADK doc will be in another CL" into honeycomb-mr1
Robert Ly [Tue, 3 May 2011 23:54:21 +0000 (16:54 -0700)]
Merge "Doc change: fixing minor bug for xml resources bug
4376713" into honeycomb-mr1
Glenn Kasten [Tue, 3 May 2011 23:46:12 +0000 (16:46 -0700)]
Merge "Account for race condition when attaching HDMI." into honeycomb-mr1
Scott Main [Fri, 29 Apr 2011 21:55:43 +0000 (14:55 -0700)]
am
1462813a: Merge "docs: more documentation for ProgressBar" into honeycomb
* commit '
1462813a28270d4255f9542b666960182e274a6e':
docs: more documentation for ProgressBar
Scott Main [Fri, 29 Apr 2011 21:52:20 +0000 (14:52 -0700)]
Merge "docs: more documentation for ProgressBar" into honeycomb
Scott Main [Fri, 29 Apr 2011 21:42:55 +0000 (14:42 -0700)]
am
c7eb47fa: docs: tweak table headers for config qualifiers
* commit '
c7eb47fad4fe39bd85c6205e38426c1867b9ed92':
docs: tweak table headers for config qualifiers
Scott Main [Thu, 28 Apr 2011 21:21:46 +0000 (14:21 -0700)]
am
c59e80c4: Merge "docs: fix for Misdirected link in topic Declaring Layout bug
4257430" into honeycomb
* commit '
c59e80c4eb60a0ba665571fee2f9561aa6e936ff':
docs: fix for Misdirected link in topic Declaring Layout bug
4257430
Scott Main [Thu, 28 Apr 2011 21:08:57 +0000 (14:08 -0700)]
Merge "docs: fix for Misdirected link in topic Declaring Layout bug
4257430" into honeycomb
Stephen Hines [Thu, 28 Apr 2011 00:32:40 +0000 (17:32 -0700)]
Merge "Check setName() for null string + fix rsRand()." into honeycomb-mr1
Scott Main [Tue, 26 Apr 2011 07:45:35 +0000 (00:45 -0700)]
am
97fee855: docs: update a couple usb driver URLs bug:
4339758
* commit '
97fee8554d40a8c093ef16934284d9292e4cf7a4':
docs: update a couple usb driver URLs bug:
4339758
Joe Fernandez [Fri, 22 Apr 2011 23:36:33 +0000 (16:36 -0700)]
am
a29e2cca: docs: Fixing Issue with code for Adding Tabs topic bug
4293013
* commit '
a29e2cca5d0e3ff222c09165fd69ca8f4d0f634e':
docs: Fixing Issue with code for Adding Tabs topic bug
4293013
Scott Main [Fri, 22 Apr 2011 00:36:40 +0000 (17:36 -0700)]
am
48c187f9: docs: fix typo in 3.0 notes
* commit '
48c187f9cf2bcb51f446a5a62346f9ef5920c7f3':
docs: fix typo in 3.0 notes
Scott Main [Thu, 21 Apr 2011 17:53:08 +0000 (10:53 -0700)]
am
b8a57841: Merge "docs: add a little info to Configuration class description" into honeycomb
* commit '
b8a57841316171d6db4311a65914720213516153':
docs: add a little info to Configuration class description
Scott Main [Thu, 21 Apr 2011 17:51:14 +0000 (10:51 -0700)]
Merge "docs: add a little info to Configuration class description" into honeycomb
Scott Main [Thu, 21 Apr 2011 17:08:20 +0000 (10:08 -0700)]
am
d155e1a2: docs: change ZTE usb driver link
* commit '
d155e1a2d8768e383824c565a5b4f5a7546960ea':
docs: change ZTE usb driver link
Scott Main [Sat, 16 Apr 2011 01:03:14 +0000 (18:03 -0700)]
am
6669f251: docs: fix snippet errors in web doc
* commit '
6669f251391d7e61a6ea55e2538c941f82514dd9':
docs: fix snippet errors in web doc
Dianne Hackborn [Thu, 14 Apr 2011 22:10:31 +0000 (15:10 -0700)]
Merge "Fix issue #
4291805: Tap Fish crashes on launch" into honeycomb-mr1
Eric Fischer [Thu, 14 Apr 2011 21:21:57 +0000 (14:21 -0700)]
am
d284a867: (-s ours) Merge "Import revised translations. DO NOT MERGE" into honeycomb
* commit '
d284a8676e002a72b66d321402ec7f4ed61c7915':
Import revised translations. DO NOT MERGE
Eric Fischer [Thu, 14 Apr 2011 21:14:46 +0000 (14:14 -0700)]
Merge "Import revised translations. DO NOT MERGE" into honeycomb
Scott Main [Thu, 14 Apr 2011 20:55:16 +0000 (13:55 -0700)]
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
Xia Wang [Wed, 13 Apr 2011 22:13:10 +0000 (15:13 -0700)]
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
Scott Main [Tue, 12 Apr 2011 21:44:02 +0000 (14:44 -0700)]
am
f42937a8: docs: fix doc typo
* commit '
f42937a8aa0af6b22d8a2a43a9bfc07c38aeffb5':
docs: fix doc typo
Scott Main [Tue, 12 Apr 2011 20:02:43 +0000 (13:02 -0700)]
am
b9fedd97: docs: fix broken links
* commit '
b9fedd9771a6aedf068155fd91f15baf52e668cd':
docs: fix broken links
Bill Gruber [Tue, 12 Apr 2011 18:48:00 +0000 (11:48 -0700)]
am
9a693ed9: Doc fix-corrects the cited download locations
* commit '
9a693ed9870cf2d5817a3bfc8dc0fbec4456a3c2':
Doc fix-corrects the cited download locations
Nicolas Roard [Fri, 8 Apr 2011 00:21:53 +0000 (17:21 -0700)]
Merge "Remove uncalled function -- java counterpart of the fix for bug:
4183801" into honeycomb-mr1
Bill Gruber [Thu, 7 Apr 2011 22:09:33 +0000 (15:09 -0700)]
am
afecd1e9: IAB docs--status codes fix Bug:
4208641
* commit '
afecd1e99284dc386f07571c69edfed8c12f1cef':
IAB docs--status codes fix Bug:
4208641
Teng-Hui Zhu [Thu, 7 Apr 2011 21:17:52 +0000 (14:17 -0700)]
Merge changes Ia44d880a,Ifbf63b24 into honeycomb-mr1
* changes:
DO NOT MERGE : cherry pick of change Ieb7ae26b from master
DO NOT MERGE : cherry pick of change I0f9f2c65 from master
Teng-Hui Zhu [Thu, 7 Apr 2011 15:52:45 +0000 (08:52 -0700)]
Merge "Fix the issue the video can't start to play" into honeycomb-mr1
Roman Nurik [Thu, 7 Apr 2011 00:18:47 +0000 (17:18 -0700)]
Merge "Add moov/mdat and 500KB max A/V drift recommendations to Supported Media Formats doc. Also reformat encoding parameter recommendations into a single table." into honeycomb-mr1
Eric Fischer [Wed, 6 Apr 2011 21:09:32 +0000 (14:09 -0700)]
Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
Bill Gruber [Wed, 6 Apr 2011 20:20:27 +0000 (13:20 -0700)]
am
48a1b52b: Merge "IAB docs: fixes line break issues" into honeycomb
* commit '
48a1b52bc736acfe9c4723abf6db7c8befc5e43b':
IAB docs: fixes line break issues
Bill Gruber [Wed, 6 Apr 2011 19:52:41 +0000 (12:52 -0700)]
Merge "IAB docs: fixes line break issues" into honeycomb
Scott Main [Tue, 5 Apr 2011 21:21:36 +0000 (14:21 -0700)]
am
a90eb8fe: docs: fix the TOC in a few docs
* commit '
a90eb8fec1c67177b614b945bcc4a4b14aaabaff':
docs: fix the TOC in a few docs
Adam Powell [Tue, 5 Apr 2011 17:45:25 +0000 (10:45 -0700)]
Merge "Fix bug
4207704 - Gestures can be lost when Flash is enabled" into honeycomb-mr1
Bill Gruber [Tue, 5 Apr 2011 00:21:25 +0000 (17:21 -0700)]
am
d36bc32e: Merge "SDK doc updates" into honeycomb
* commit '
d36bc32ea9a109596308a0516b3e0898c82cebc5':
SDK doc updates
Bill Gruber [Tue, 5 Apr 2011 00:15:08 +0000 (17:15 -0700)]
Merge "SDK doc updates" into honeycomb
Roman Nurik [Mon, 4 Apr 2011 20:41:11 +0000 (13:41 -0700)]
Merge "Document support for .TS video containers." into honeycomb-mr1
Dirk Dougherty [Sun, 3 Apr 2011 20:40:48 +0000 (13:40 -0700)]
Merge "Doc change: update media formats tables with adts/aac and flac" into honeycomb-mr1
Scott Main [Sat, 2 Apr 2011 00:39:05 +0000 (17:39 -0700)]
am
27690eba: Merge "docs: update device dashboard" into honeycomb
* commit '
27690ebabc915091956f0331023c9d074177271d':
docs: update device dashboard
Scott Main [Sat, 2 Apr 2011 00:36:42 +0000 (17:36 -0700)]
Merge "docs: update device dashboard" into honeycomb
Scott Main [Fri, 1 Apr 2011 23:19:30 +0000 (16:19 -0700)]
am
cb719a48: Merge "docs: update homepage announcement for Google IO" into honeycomb
* commit '
cb719a48a2f2e9bc47b317f75ebb8320f6ce877c':
docs: update homepage announcement for Google IO
Scott Main [Fri, 1 Apr 2011 23:17:40 +0000 (16:17 -0700)]
Merge "docs: update homepage announcement for Google IO" into honeycomb
Scott Main [Fri, 1 Apr 2011 02:06:33 +0000 (19:06 -0700)]
am
e979332f: docs: fix markup bugs
* commit '
e979332f38e677db4c9d89f695352ed41052553d':
docs: fix markup bugs
Dianne Hackborn [Thu, 31 Mar 2011 00:43:17 +0000 (17:43 -0700)]
Merge "Expand screen documentation with explicit screen size dimensions." into honeycomb-mr1
Justin Ho [Wed, 30 Mar 2011 22:57:42 +0000 (15:57 -0700)]
Merge "Replacing browser playback controls for inactive videos Bug:
4136024" into honeycomb-mr1
Trevor Johns [Wed, 30 Mar 2011 22:26:38 +0000 (15:26 -0700)]
am
eb344a69: Fixing line in Market IAB docs that explains how to bind to the MarketService.
* commit '
eb344a69fa728c010425fb1e18fc8f5774693986':
Fixing line in Market IAB docs that explains how to bind to the MarketService.
Andreas Huber [Wed, 30 Mar 2011 22:16:36 +0000 (15:16 -0700)]
Merge "When http streaming and Content-Length is unknown, make sure to return all" into honeycomb-mr1
Eric Fischer [Wed, 30 Mar 2011 21:39:25 +0000 (14:39 -0700)]
Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
Scott Main [Wed, 30 Mar 2011 19:10:13 +0000 (12:10 -0700)]
Merge "docs: update makefile to show javadocs diffs for api level 12" into honeycomb-mr1
Andreas Huber [Wed, 30 Mar 2011 16:12:04 +0000 (09:12 -0700)]
Merge "Surfaceflinger expects rectangles to be specified right/bottom edge exclusive." into honeycomb-mr1
Mike Lockwood [Wed, 30 Mar 2011 05:14:27 +0000 (22:14 -0700)]
Merge "UsbService: Make USB disconnect handling for accessory mode more robust" into honeycomb-mr1
Eric Fischer [Tue, 29 Mar 2011 21:07:14 +0000 (14:07 -0700)]
am
b42e83b1: (-s ours) Merge "Import revised translations. DO NOT MERGE" into honeycomb
* commit '
b42e83b1eccfd1fa1e02cd0c30edfc06e05de995':
Import revised translations. DO NOT MERGE
Amith Yamasani [Tue, 29 Mar 2011 20:55:19 +0000 (13:55 -0700)]
Merge "Fix the javadoc for LocationManager.requestSingleUpdate()" into honeycomb-mr1
Eric Fischer [Tue, 29 Mar 2011 20:45:03 +0000 (13:45 -0700)]
Merge "Import revised translations. DO NOT MERGE" into honeycomb
Eric Fischer [Tue, 29 Mar 2011 19:16:53 +0000 (12:16 -0700)]
Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
Bill Gruber [Tue, 29 Mar 2011 06:48:34 +0000 (23:48 -0700)]
am
faede250: IAB doc update for final launch
* commit '
faede250301e291a060d094c73a25a351f96cbb5':
IAB doc update for final launch
Mike Lockwood [Mon, 28 Mar 2011 17:58:03 +0000 (10:58 -0700)]
Merge "UsbService: Fix JNI local reference leaks in the USB host support code" into honeycomb-mr1
Andreas Huber [Mon, 28 Mar 2011 15:11:26 +0000 (08:11 -0700)]
Merge "After a seek there's a brief period where audio time isn't reestablished." into honeycomb-mr1
Dirk Dougherty [Sat, 26 Mar 2011 02:22:55 +0000 (19:22 -0700)]
am
085baa2c: Doc change: Fix scale on highlights screen shots.
* commit '
085baa2cc3f2d23523377b1df390cec5d3bf1445':
Doc change: Fix scale on highlights screen shots.
Andreas Huber [Fri, 25 Mar 2011 22:33:58 +0000 (15:33 -0700)]
Merge "Make sure we post a video event when seeking after seeing video EOS before." into honeycomb-mr1
James Dong [Fri, 25 Mar 2011 17:22:57 +0000 (10:22 -0700)]
Merge "Switch to use SF cached source" into honeycomb-mr1
Gloria Wang [Fri, 25 Mar 2011 17:01:37 +0000 (10:01 -0700)]
Merge "Fix for bug
4126624. Change the mDrmManagerClientImpl to sp to avoid double delete the pointer." into honeycomb-mr1
Scott Main [Thu, 24 Mar 2011 21:00:47 +0000 (14:00 -0700)]
am
4045e6b9: docs: a11y doc typo
* commit '
4045e6b9ab296436cb5344f3af7184c2ce2a8ff0':
docs: a11y doc typo
Scott Main [Thu, 24 Mar 2011 19:26:58 +0000 (12:26 -0700)]
am
e0b3f2a7: docs: fix a few things in a11y doc
* commit '
e0b3f2a788e63a10b0fa21bdd700fbcf7e1add34':
docs: fix a few things in a11y doc
Scott Main [Thu, 24 Mar 2011 17:51:50 +0000 (10:51 -0700)]
am
b7cfa729: Merge "docs: add document for accessibility, authored by Cheryl Simon (clsimon)" into honeycomb
* commit '
b7cfa72932fbb3c794c6e5509b4a5b716236f558':
docs: add document for accessibility, authored by Cheryl Simon (clsimon)
Scott Main [Thu, 24 Mar 2011 17:49:59 +0000 (10:49 -0700)]
Merge "docs: add document for accessibility, authored by Cheryl Simon (clsimon)" into honeycomb
Gloria Wang [Thu, 24 Mar 2011 17:40:26 +0000 (10:40 -0700)]
Merge "Fix for bug
4165823. Add death listener to clean-up drmserver appropriately when drmserver died. Cherry-pick from Do not merge." into honeycomb-mr1
Bill Gruber [Thu, 24 Mar 2011 17:30:30 +0000 (10:30 -0700)]
am
e002734d: Merge "IAB doc updates for final launch plus bug fixes Bug:
3491550 Bug:
3491426 Bug:
3407948" into honeycomb
* commit '
e002734dd2b330ff6f964eeccaf3c6c6207dd9bf':
IAB doc updates for final launch plus bug fixes Bug:
3491550 Bug:
3491426 Bug:
3407948
Bill Gruber [Thu, 24 Mar 2011 17:26:20 +0000 (10:26 -0700)]
Merge "IAB doc updates for final launch plus bug fixes Bug:
3491550 Bug:
3491426 Bug:
3407948" into honeycomb
Teng-Hui Zhu [Thu, 24 Mar 2011 00:32:43 +0000 (17:32 -0700)]
Merge "When the video is not on the front, it should be paused" into honeycomb-mr1
Glenn Kasten [Thu, 24 Mar 2011 00:03:46 +0000 (17:03 -0700)]
Merge "Bug
4159373 Use HDCP debug settings" into honeycomb-mr1
Teng-Hui Zhu [Wed, 23 Mar 2011 23:03:04 +0000 (16:03 -0700)]
Merge "Make sure the full screen playing continue when timeout" into honeycomb-mr1
shailendra [Wed, 23 Mar 2011 22:33:51 +0000 (15:33 -0700)]
Merge "Fix for Media Server memory leak" into honeycomb-mr1
Bill Gruber [Wed, 23 Mar 2011 21:58:31 +0000 (14:58 -0700)]
Merge "DRM API doc scrub This change contains information contributed by Sony Corporation. Bug:
4119363" into honeycomb-mr1
Scott Main [Wed, 23 Mar 2011 21:32:44 +0000 (14:32 -0700)]
am
ef6b305b: docs: fix markup error
* commit '
ef6b305b93009b60ad7c6ddbd200d1b5c554963f':
docs: fix markup error
Scott Main [Wed, 23 Mar 2011 17:25:00 +0000 (10:25 -0700)]
am
fb340563: docs: add Asus driver link to oem driver page
* commit '
fb340563e81f93bc179e51bffc846ac03ff02609':
docs: add Asus driver link to oem driver page
Robert Greenwalt [Wed, 23 Mar 2011 04:36:04 +0000 (21:36 -0700)]
Merge "Fix adding of default route." into honeycomb-mr1
Eric Rowe [Wed, 23 Mar 2011 01:57:27 +0000 (18:57 -0700)]
Merge "Clean up BT stress tests." into honeycomb-mr1
Eric Fischer [Tue, 22 Mar 2011 20:56:47 +0000 (13:56 -0700)]
Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
Teng-Hui Zhu [Tue, 22 Mar 2011 20:55:28 +0000 (13:55 -0700)]
Merge "fix for pause when loading" into honeycomb-mr1
Dianne Hackborn [Tue, 22 Mar 2011 19:58:00 +0000 (12:58 -0700)]
Merge "Now have a final API 12." into honeycomb-mr1
shailendra [Tue, 22 Mar 2011 18:48:12 +0000 (11:48 -0700)]
Merge "Fix for testPropertiesWMVFile case failed with build HMI75B(
4128259)" into honeycomb-mr1
Gloria Wang [Tue, 22 Mar 2011 18:04:32 +0000 (11:04 -0700)]
Merge "Add one more field in DecryptHandle to support bug
4126624" into honeycomb-mr1
Andreas Huber [Tue, 22 Mar 2011 15:37:58 +0000 (08:37 -0700)]
Merge "DO NOT MERGE: Enable http-live support for https:// urls, fix a parsing issue." into honeycomb-mr1
Teng-Hui Zhu [Tue, 22 Mar 2011 01:09:57 +0000 (18:09 -0700)]
Merge "Fix a crash" into honeycomb-mr1
Yu Shan Emily Lau [Tue, 22 Mar 2011 00:32:17 +0000 (17:32 -0700)]
Merge "Add the mem logging into test utility. Bug#
4108259" into honeycomb-mr1
Gloria Wang [Tue, 22 Mar 2011 00:26:03 +0000 (17:26 -0700)]
Merge "do not merge: Cherry pick change I6529695c from master to partially fix bug
4126624." into honeycomb-mr1
Justin Ho [Mon, 21 Mar 2011 23:52:35 +0000 (16:52 -0700)]
Merge "Fixing list selector theme Bug:
4147203" into honeycomb-mr1
Teng-Hui Zhu [Mon, 21 Mar 2011 21:01:10 +0000 (14:01 -0700)]
Merge "Support loading image and paused image for inline video" into honeycomb-mr1
Mike Lockwood [Mon, 21 Mar 2011 00:08:24 +0000 (17:08 -0700)]
Merge "UsbService: Handle the case where a USB accessory connects as the device is booting" into honeycomb-mr1
Jamie Gennis [Sat, 19 Mar 2011 00:32:25 +0000 (17:32 -0700)]
Merge "SurfaceFlinger: Fix a typo." into honeycomb-mr1
Jamie Gennis [Fri, 18 Mar 2011 23:35:13 +0000 (16:35 -0700)]
SurfaceFlinger: Fix a typo.
This change makes Layer skip its cleanup of its old shared memory region
when the UserClient object that owned the memory has been freed.
Bug:
3429357
Change-Id: I9e4d8eb190f6914dc043674b9bb8dd28e959901b
Russell Brenner [Fri, 18 Mar 2011 22:28:27 +0000 (15:28 -0700)]
Merge "DO NOT MERGE Send WebView the current transform and whether we're drawing a layer. Bug #
3275491" into honeycomb-mr1
Teng-Hui Zhu [Fri, 18 Mar 2011 22:19:28 +0000 (15:19 -0700)]
Merge "Asset for video poster" into honeycomb-mr1
Daisuke Miyakawa [Fri, 18 Mar 2011 18:23:00 +0000 (11:23 -0700)]
am
e16a1bfa: Use system locale list.
* commit '
e16a1bfa9cd9a9a0430e2fe890586ae451f0faaf':
Use system locale list.
Derek Sollenberger [Fri, 18 Mar 2011 17:57:46 +0000 (10:57 -0700)]
Merge "Prevent intermediate scale updates from being sent to WebKit while zooming." into honeycomb-mr1
shailendra [Fri, 18 Mar 2011 16:35:37 +0000 (09:35 -0700)]
Merge "Fix for testThumbnailForInvalidFilePath and testPropertiesForNonExsitingFile failed with HMI75B(
4124235)" into honeycomb-mr1
Dianne Hackborn [Fri, 18 Mar 2011 02:00:56 +0000 (19:00 -0700)]
Merge "Whoops, forgot the HONEYCOMB_MR1 constant. :(" into honeycomb-mr1