Justin Ho
01b13a11e6
Merge "Replacing browser playback controls for inactive videos Bug: 4136024" into honeycomb-mr1
2011-03-30 15:57:42 -07:00
Trevor Johns
e1cc88ccaf
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.
2011-03-30 15:26:38 -07:00
Andreas Huber
b676b73e39
Merge "When http streaming and Content-Length is unknown, make sure to return all" into honeycomb-mr1
2011-03-30 15:16:36 -07:00
Andreas Huber
45ad57aab3
When http streaming and Content-Length is unknown, make sure to return all
...
data that we successfully received before signalling the error.
Change-Id: I7e60602d41b4df85aa85e413c590687305e9bbce
related-to-bug: 4190765
2011-03-30 15:00:34 -07:00
Eric Fischer
91c482b235
Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
2011-03-30 14:39:25 -07:00
Eric Fischer
446b247834
Import revised translations. DO NOT MERGE
...
Change-Id: Ic87b36ba6dcc6cea8ef713b47c334156a7dd0f65
2011-03-30 14:25:28 -07:00
Justin Ho
c7de6dd483
Replacing browser playback controls for inactive videos
...
Bug: 4136024
Change-Id: I1c48023005d711d5080fa17a695f709705e362b6
2011-03-30 14:21:28 -07:00
Trevor Johns
eb344a69fa
Fixing line in Market IAB docs that explains how to bind to the
...
MarketService.
We use the IMarketBillingService, which is incorrect. It should be
"com.android.vending.billing.MarketBillingService.BIND".
2011-03-30 14:19:40 -07:00
Scott Main
5b68c655a1
Merge "docs: update makefile to show javadocs diffs for api level 12" into honeycomb-mr1
2011-03-30 12:10:13 -07:00
Andreas Huber
ebf6a72b35
Merge "Surfaceflinger expects rectangles to be specified right/bottom edge exclusive." into honeycomb-mr1
2011-03-30 09:12:04 -07:00
Mike Lockwood
44e4b99f82
Merge "UsbService: Make USB disconnect handling for accessory mode more robust" into honeycomb-mr1
2011-03-29 22:14:27 -07:00
Mike Lockwood
4f0f3561ed
UsbService: Make USB disconnect handling for accessory mode more robust
...
Handle the case where the kernel driver is in accessory mode but we failed
to initialize it at the framework level. On disconnnect, check to see if the
accessory kernel driver is enabled rather than checking mCurrentAccessory.
That way we will restore the USB state in the kernel even if mCurrentAccessory
is null.
Change-Id: I35d458f21a8b21611946da523d0f53723cab0540
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-03-29 16:59:38 -07:00
Scott Main
d3b62c961b
docs: update makefile to show javadocs diffs for api level 12
...
Change-Id: I1ac584db778ec14b18129785126159f692459158
2011-03-29 16:25:16 -07:00
Eric Fischer
0664a4b18c
am b42e83b1: (-s ours) Merge "Import revised translations. DO NOT MERGE" into honeycomb
...
* commit 'b42e83b1eccfd1fa1e02cd0c30edfc06e05de995':
Import revised translations. DO NOT MERGE
2011-03-29 14:07:14 -07:00
Amith Yamasani
7171f5b7d1
Merge "Fix the javadoc for LocationManager.requestSingleUpdate()" into honeycomb-mr1
2011-03-29 13:55:19 -07:00
Eric Fischer
b42e83b1ec
Merge "Import revised translations. DO NOT MERGE" into honeycomb
2011-03-29 13:45:03 -07:00
Eric Fischer
df491490a6
Import revised translations. DO NOT MERGE
...
Change-Id: I09aefa0ca2ba1ff78574c8fbad2242d7ef63689d
2011-03-29 13:26:46 -07:00
Eric Fischer
f5cedbe508
Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
2011-03-29 12:16:53 -07:00
Eric Fischer
627e59ad08
Import revised translations. DO NOT MERGE
...
Change-Id: I962bb9917aa3f3d4b911c1ad7fdfbcda94afa0c7
2011-03-29 11:58:23 -07:00
Amith Yamasani
e590ccfb12
Fix the javadoc for LocationManager.requestSingleUpdate()
...
It was saying the same thing as requestLocationUpdates(), but it only provides a single update.
Change-Id: I0a0f612104a946b7db96928505bb95673377a335
2011-03-29 11:26:08 -07:00
Andreas Huber
b13c4a9b6c
Surfaceflinger expects rectangles to be specified right/bottom edge exclusive.
...
Change-Id: Ib493572c614dbb74fa23b13c3e43899e3b31cf0e
related-to-bug: 4147205
2011-03-29 10:00:20 -07:00
Bill Gruber
e4f33617c3
am faede250: IAB doc update for final launch
...
* commit 'faede250301e291a060d094c73a25a351f96cbb5':
IAB doc update for final launch
2011-03-28 23:48:34 -07:00
Bill Gruber
faede25030
IAB doc update for final launch
...
Change-Id: I5173422eb65f4effc61162c2b172750dee0a6a2c
2011-03-28 19:50:20 -07:00
Mike Lockwood
7661dd8de1
Merge "UsbService: Fix JNI local reference leaks in the USB host support code" into honeycomb-mr1
2011-03-28 10:58:03 -07:00
Andreas Huber
2edbdcc6f2
Merge "After a seek there's a brief period where audio time isn't reestablished." into honeycomb-mr1
2011-03-28 08:11:26 -07:00
Mike Lockwood
8f8c6023f2
UsbService: Fix JNI local reference leaks in the USB host support code
...
Bug: 4175857
Change-Id: I8b385f2257e509b0fb4d5f9516e9813b8165352d
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-03-27 19:35:43 -07:00
Dirk Dougherty
0b9bacc693
am 085baa2c: Doc change: Fix scale on highlights screen shots.
...
* commit '085baa2cc3f2d23523377b1df390cec5d3bf1445':
Doc change: Fix scale on highlights screen shots.
2011-03-25 19:22:55 -07:00
Dirk Dougherty
085baa2cc3
Doc change: Fix scale on highlights screen shots.
...
Change-Id: Id2608498baac70dc69d7b716bbb00f0799af03ca
2011-03-25 19:07:30 -07:00
Andreas Huber
59529e1474
After a seek there's a brief period where audio time isn't reestablished.
...
Don't use audio time to trigger a "we're very late, skipping ahead" action
until it's reestablished.
Change-Id: Ia8534e5bed60203d49a457d14b2e55eb972b5fa1
related-to-bug: 4173683
2011-03-25 16:40:50 -07:00
Andreas Huber
1457ef74d4
Merge "Make sure we post a video event when seeking after seeing video EOS before." into honeycomb-mr1
2011-03-25 15:33:58 -07:00
Andreas Huber
16ede3c535
Make sure we post a video event when seeking after seeing video EOS before.
...
Change-Id: I513bf94c0732a85324160977ea5723d8aafd6aba
related-to-bug: 3316960
2011-03-25 14:47:38 -07:00
Adam Powell
baa3380d74
Fix bug 4170809 - Pages with flash lose touch events
...
Fix WebView touch cancel behavior when we time out waiting for a
response from webkit.
Change-Id: I0aeeea64b156e204dbe2dda913a42df28704ed16
2011-03-25 13:58:19 -07:00
James Dong
837430dd34
Merge "Switch to use SF cached source" into honeycomb-mr1
2011-03-25 10:22:57 -07:00
Gloria Wang
b8b85ea296
Merge "Fix for bug 4126624. Change the mDrmManagerClientImpl to sp to avoid double delete the pointer." into honeycomb-mr1
2011-03-25 10:01:37 -07:00
James Dong
3be1593628
Switch to use SF cached source
...
bug - 3500025
Change-Id: I96c416d39af498f091d2d52f5923f556382a9c1f
2011-03-25 08:41:57 -07:00
Scott Main
cc4b6a61c6
am 4045e6b9: docs: a11y doc typo
...
* commit '4045e6b9ab296436cb5344f3af7184c2ce2a8ff0':
docs: a11y doc typo
2011-03-24 14:00:47 -07:00
Scott Main
4045e6b9ab
docs: a11y doc typo
...
Change-Id: Ib4c41c129c8ecbd738dfe6866bd429efdf17c23f
2011-03-24 13:25:48 -07:00
Gloria Wang
4c87a75073
Fix for bug 4126624.
...
Change the mDrmManagerClientImpl to sp to avoid double delete the pointer.
Change-Id: I7aacea1bc58ab6425ef6f6f09472c6f2970ebb4d
2011-03-24 13:14:02 -07:00
Scott Main
119e79cf27
am e0b3f2a7: docs: fix a few things in a11y doc
...
* commit 'e0b3f2a788e63a10b0fa21bdd700fbcf7e1add34':
docs: fix a few things in a11y doc
2011-03-24 12:26:58 -07:00
Scott Main
e0b3f2a788
docs: fix a few things in a11y doc
...
Change-Id: I142b0b4498cf6d19655ad1ccc2066e59c39e75a6
2011-03-24 12:15:35 -07:00
Scott Main
95cb883c06
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)
2011-03-24 10:51:50 -07:00
Scott Main
b7cfa72932
Merge "docs: add document for accessibility, authored by Cheryl Simon (clsimon)" into honeycomb
2011-03-24 10:49:59 -07:00
Gloria Wang
e2cd335311
Merge "Fix for bug 4165823. Add death listener to clean-up drmserver appropriately when drmserver died. Cherry-pick from master. Do not merge." into honeycomb-mr1
2011-03-24 10:40:26 -07:00
Gloria Wang
9e1e9a339e
Fix for bug 4165823.
...
Add death listener to clean-up drmserver appropriately when drmserver died.
Cherry-pick from master. Do not merge.
Change-Id: I7782cc96ce173a87ebfd315950f3880fa90294d6
2011-03-24 10:30:57 -07:00
Bill Gruber
6efa359959
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
2011-03-24 10:30:30 -07:00
Bill Gruber
e002734dd2
Merge "IAB doc updates for final launch plus bug fixes Bug: 3491550 Bug: 3491426 Bug: 3407948" into honeycomb
2011-03-24 10:26:20 -07:00
Bill Gruber
dd8ea580d4
IAB doc updates for final launch plus bug fixes
...
Bug: 3491550
Bug: 3491426
Bug: 3407948
Change-Id: I6f02397a62a3f73599ac7ded28e47d9bb1a3d3e9
2011-03-24 10:23:52 -07:00
Scott Main
ef467c8d95
docs: add document for accessibility, authored by Cheryl Simon (clsimon)
...
Change-Id: If4f6e4f12953ae5b608efebde1ac9d3f0720035a
2011-03-24 10:16:31 -07:00
Romain Guy
b5fa490995
DO NOT MERGE Take fake bold font property into account.
...
Bug #4159731
For real this time!
Change-Id: I042eca64bfb355f8d60cec430eb942c900062761
2011-03-23 17:59:44 -07:00
Teng-Hui Zhu
2d09b855d5
Merge "When the video is not on the front, it should be paused" into honeycomb-mr1
2011-03-23 17:32:43 -07:00