OSDN Git Service

android-x86/frameworks-base.git
13 years agoFix issue 4335692: HDMI media volume
Eric Laurent [Mon, 25 Apr 2011 20:34:51 +0000 (13:34 -0700)]
Fix issue 4335692: HDMI media volume

Forced music stream volume to max when not muted and output device is HDMI.

Change-Id: Ibd287cea8ae1d3f36fea6651a113bd5cf2dbad13

13 years agoam a29e2cca: docs: Fixing Issue with code for Adding Tabs topic bug 4293013
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

13 years agodocs: Fixing Issue with code for Adding Tabs topic
Joe Fernandez [Fri, 22 Apr 2011 23:06:37 +0000 (16:06 -0700)]
docs: Fixing Issue with code for Adding Tabs topic
bug 4293013

Change-Id: Ia08fe8ae0112af5157607e4fcd07773a945473f3

13 years agoam 48c187f9: docs: fix typo in 3.0 notes
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

13 years agodocs: fix typo in 3.0 notes
Scott Main [Fri, 22 Apr 2011 00:22:54 +0000 (17:22 -0700)]
docs: fix typo in 3.0 notes

Change-Id: I0925a21b5eb53811736cfe04498917371c8bb67c

13 years agoam b8a57841: Merge "docs: add a little info to Configuration class description" into...
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

13 years agoMerge "docs: add a little info to Configuration class description" into honeycomb
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

13 years agoam d155e1a2: docs: change ZTE usb driver link
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

13 years agodocs: change ZTE usb driver link
Scott Main [Thu, 21 Apr 2011 16:57:55 +0000 (09:57 -0700)]
docs: change ZTE usb driver link

Change-Id: I8a7528094a565f846ceca456787de81c81ee39c9

13 years agodocs: add a little info to Configuration class description
Scott Main [Thu, 21 Apr 2011 05:20:46 +0000 (22:20 -0700)]
docs: add a little info to Configuration class description

Change-Id: I3278759bd1c323330c1143ef71d0644872caa085

13 years agoam 6669f251: docs: fix snippet errors in web doc
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

13 years agodocs: fix snippet errors in web doc
Scott Main [Sat, 16 Apr 2011 00:55:33 +0000 (17:55 -0700)]
docs: fix snippet errors in web doc

Change-Id: I65648136c2df4bde5fa3bc3495f5166c4c87fe8a

13 years agoMerge "Fix issue #4291805: Tap Fish crashes on launch" into honeycomb-mr1
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

13 years agoam d284a867: (-s ours) Merge "Import revised translations. DO NOT MERGE" into honeycomb
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

13 years agoMerge "Import revised translations. DO NOT MERGE" into honeycomb
Eric Fischer [Thu, 14 Apr 2011 21:14:46 +0000 (14:14 -0700)]
Merge "Import revised translations.  DO NOT MERGE" into honeycomb

13 years agoImport revised translations. DO NOT MERGE
Eric Fischer [Thu, 14 Apr 2011 20:59:43 +0000 (13:59 -0700)]
Import revised translations.  DO NOT MERGE

Change-Id: I796dc2ad1556201f3b443b8185f5280cc8e1e213

13 years agoam d08debcb: docs: bring back the SDK EULA wall for downloading archived SDKs
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

13 years agoFix issue #4291805: Tap Fish crashes on launch
Dianne Hackborn [Thu, 14 Apr 2011 20:09:32 +0000 (13:09 -0700)]
Fix issue #4291805: Tap Fish crashes on launch

The activity manager got a little too aggressive about argument validation.

Change-Id: I3cca0cd3135b98e5c50d26db778ec4ec28a47ec1

13 years agodocs: bring back the SDK EULA wall for downloading archived SDKs
Scott Main [Tue, 12 Apr 2011 21:38:54 +0000 (14:38 -0700)]
docs: bring back the SDK EULA wall for downloading archived SDKs

Change-Id: Ieccd0d03ca49a68d7d4956aa4991d8a73ffff674

13 years agoMerge "Fix access point parsing: reset static link property after parsing static...
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

13 years agoBug 4167061 remove debugging code
Glenn Kasten [Wed, 13 Apr 2011 18:16:49 +0000 (11:16 -0700)]
Bug 4167061 remove debugging code

Change-Id: I1cb46a7bbf885c72e75d32f3f7675d90ab611e85

13 years agoam f42937a8: docs: fix doc typo
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

13 years agodocs: fix doc typo
Scott Main [Tue, 12 Apr 2011 21:38:54 +0000 (14:38 -0700)]
docs: fix doc typo

Change-Id: Ia5c32723489a045d865307dbad41edb29b2cfb29

13 years agoam b9fedd97: docs: fix broken links
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

13 years agodocs: fix broken links
Scott Main [Tue, 12 Apr 2011 19:58:01 +0000 (12:58 -0700)]
docs: fix broken links

Change-Id: I20a2f70bc588d9eeec79419d12790f1da9b79863

13 years agoam 9a693ed9: Doc fix-corrects the cited download locations
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

13 years agoAdd support for USB Ethernet adapters
Benoit Goby [Wed, 22 Dec 2010 22:29:40 +0000 (14:29 -0800)]
Add support for USB Ethernet adapters

Change-Id: I6ae34a32d0e1b6f21c484b8639c3e7ce086e568d

13 years agoEnable HDCP debugging in Stagefright (1 of 2)
Glenn Kasten [Mon, 11 Apr 2011 18:07:05 +0000 (11:07 -0700)]
Enable HDCP debugging in Stagefright (1 of 2)

Change-Id: Ia3ea555d5fa45547ed6bfce59f299087ced7809c

13 years agoDoc fix-corrects the cited download locations
Bill Gruber [Sat, 9 Apr 2011 00:55:17 +0000 (17:55 -0700)]
Doc fix-corrects the cited download locations

Change-Id: I4225adb4162801b6cf5534dc4ed4f03e79a47e36

13 years agoFix access point parsing: reset static link property after parsing
Xia Wang [Fri, 8 Apr 2011 23:31:01 +0000 (16:31 -0700)]
Fix access point parsing: reset static link property after parsing
static ip setting
Fix removeConfiguredNetwork: add sleep between remove configured network
and disable wifi

Change-Id: I619e79e9bc414b9aeae3537dbc642a7fbc9fca97

13 years agoStagefright: authenticate ANativeWindow.
Jamie Gennis [Fri, 8 Apr 2011 02:03:56 +0000 (19:03 -0700)]
Stagefright: authenticate ANativeWindow.

This change adds a check to verify that the ANativeWindow to which
decoded video buffers are queued sends those buffers to SurfaceFlinger.
The check is done when the buffer content is flagged as protected.  This
change also adds an error in the case where protected buffers are
needed, but an ANativeWindow is not being used as the video destination.

Change-Id: I107c9082d65ef0de4a13594e9535a2053ad5161b
Bug: 4269240

13 years agoMerge "Remove uncalled function -- java counterpart of the fix for bug:4183801" into...
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

13 years agoam afecd1e9: IAB docs--status codes fix Bug: 4208641
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

13 years agoRemove uncalled function -- java counterpart of
Nicolas Roard [Thu, 7 Apr 2011 22:01:53 +0000 (15:01 -0700)]
Remove uncalled function -- java counterpart of
the fix for bug:4183801

Change-Id: Icaaa83743976be180ba570158bd4016e7f53c95a

13 years agoIAB docs--status codes fix
Bill Gruber [Thu, 7 Apr 2011 19:27:36 +0000 (12:27 -0700)]
IAB docs--status codes fix
Bug: 4208641

Change-Id: I91d4448b62950579081a7ec99f4a39237140d299

13 years agoMerge changes Ia44d880a,Ifbf63b24 into honeycomb-mr1
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

13 years agoMerge 59aad78e from master. do not merge.
Xavier Ducrohet [Thu, 7 Apr 2011 00:03:31 +0000 (17:03 -0700)]
Merge 59aad78e from master. do not merge.

LayoutLib: don't render when shader's local matrix is set to 0 scale.

Change-Id: I02c0ddd856026357f468dcc8b81e0520470118de

13 years agoDO NOT MERGE : cherry pick of change Ieb7ae26b from master
Teng-Hui Zhu [Wed, 30 Mar 2011 21:39:56 +0000 (14:39 -0700)]
DO NOT MERGE : cherry pick of change Ieb7ae26b from master

Buffering in full screen mode will show progressView

bug:4187252
Change-Id: Ia44d880ab126c2439fb13504db87492d45c90bc8

13 years agoDO NOT MERGE : cherry pick of change I0f9f2c65 from master
Teng-Hui Zhu [Tue, 29 Mar 2011 17:35:11 +0000 (10:35 -0700)]
DO NOT MERGE : cherry pick of change I0f9f2c65 from master

Add the loading progress UI when buffering

bug:4187252
Change-Id: Ifbf63b248ac5f0e340be4057e0dcd80d33483662

13 years agoMerge "Fix the issue the video can't start to play" into honeycomb-mr1
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

13 years agoFix the issue the video can't start to play
Teng-Hui Zhu [Thu, 7 Apr 2011 01:09:27 +0000 (18:09 -0700)]
Fix the issue the video can't start to play

In full screen mode, we shall not always rely on the auto start info.
If the auto start is false, it will prevent the video from playing.

The auto start should always happen inline mode when prepared.
If we switch into full screen mode while playing, we will also do auto start.

bug:4260063
Change-Id: I4b13c30b1f2c219951dc8edd659e221a21c86c2b

13 years agoMerge "Add moov/mdat and 500KB max A/V drift recommendations to Supported Media Forma...
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

13 years agoAdd moov/mdat and 500KB max A/V drift recommendations to Supported Media Formats...
Roman Nurik [Wed, 6 Apr 2011 21:52:00 +0000 (14:52 -0700)]
Add moov/mdat and 500KB max A/V drift recommendations to Supported Media Formats doc. Also reformat encoding parameter recommendations into a single table.

Change-Id: I2a1a4b31fe546eddfb8d6e8b8ab5f4a3900734d4

13 years agoMerge "Import revised translations. DO NOT MERGE" 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

13 years agoImport revised translations. DO NOT MERGE
Eric Fischer [Wed, 6 Apr 2011 20:47:57 +0000 (13:47 -0700)]
Import revised translations.  DO NOT MERGE

Change-Id: I30c20fa78fc821c943d947a058f482e87d70dbd6

13 years agoam 48a1b52b: Merge "IAB docs: fixes line break issues" into honeycomb
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

13 years agoMerge "IAB docs: fixes line break issues" into honeycomb
Bill Gruber [Wed, 6 Apr 2011 19:52:41 +0000 (12:52 -0700)]
Merge "IAB docs: fixes line break issues" into honeycomb

13 years agoLayoutLib: Fix issue with rendering mode.
Xavier Ducrohet [Wed, 6 Apr 2011 03:19:17 +0000 (20:19 -0700)]
LayoutLib: Fix issue with rendering mode.

When the layout content is embedded inside a decor layout
to emulate system bar (top or bottom) and title bar (or action bar)
then the code computing the full required size based on the RenderingMode
would fail because the decor layout would prevents the content layout to
take as much room as possible.
There is also an issue with the way we know render dialogs as the
dialogs usually as a frame with some padding and the previous measurements
would not take into account the dialog padding when increasing the
screen size.

This fix makes the code measure the size of the content layout in the
normal rendering, and then separately from the root layout with the proper
MeasureSpec to let the content grown. The difference in size is then added
to the screen size.

Bug: http://code.google.com/p/android/issues/detail?id=15892

Change-Id: Ibb9ca2a67c6c450d10d9f9a8050536e094650f8b

13 years agoIAB docs: fixes line break issues
Bill Gruber [Tue, 5 Apr 2011 22:54:21 +0000 (15:54 -0700)]
IAB docs: fixes line break issues

Change-Id: Iad795520a4544638bd26c354b4a8718afb28646a

13 years agoam a90eb8fe: docs: fix the TOC in a few docs
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

13 years agodocs: fix the TOC in a few docs
Scott Main [Tue, 5 Apr 2011 21:05:03 +0000 (14:05 -0700)]
docs: fix the TOC in a few docs

Change-Id: Iff2b91701ba39e17cc0d88804f3eb3f658e13c27

13 years agoMerge "Fix bug 4207704 - Gestures can be lost when Flash is enabled" into honeycomb-mr1
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

13 years agoFix bug 4207704 - Gestures can be lost when Flash is enabled
Adam Powell [Mon, 4 Apr 2011 21:27:12 +0000 (14:27 -0700)]
Fix bug 4207704 - Gestures can be lost when Flash is enabled

Pre-queue WebView touch events as we send them to webkit so that we
can run them through WebView later if webkit or hosted plugins go out
to lunch.

Change-Id: Id4e9f56beeb0c1d55e77233423844b15f6f00aef

13 years agoam d36bc32e: Merge "SDK doc updates" into honeycomb
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

13 years agoMerge "SDK doc updates" into honeycomb
Bill Gruber [Tue, 5 Apr 2011 00:15:08 +0000 (17:15 -0700)]
Merge "SDK doc updates" into honeycomb

13 years agoSDK doc updates
Bill Gruber [Mon, 4 Apr 2011 19:11:49 +0000 (12:11 -0700)]
SDK doc updates

Change-Id: Iaf24235cf40a4e22a4c8ee787f0b18ce8f5cb61e

13 years agoMerge "Document support for .TS video containers." into honeycomb-mr1
Roman Nurik [Mon, 4 Apr 2011 20:41:11 +0000 (13:41 -0700)]
Merge "Document support for .TS video containers." into honeycomb-mr1

13 years agoDocument support for .TS video containers.
Roman Nurik [Mon, 4 Apr 2011 18:27:21 +0000 (11:27 -0700)]
Document support for .TS video containers.

Change-Id: I99a2da97ce2bbb79beb4a7b5847ad3de90a6b7af

13 years agoAdding package description for android.hardware.usb
Robert Ly [Mon, 4 Apr 2011 17:50:19 +0000 (10:50 -0700)]
Adding package description for android.hardware.usb

Change-Id: I4d243424c6747531a1ac6ab2230c2af73bad4fed

13 years agoDoc change: add diff report for API 12.
Dirk Dougherty [Wed, 23 Mar 2011 18:45:38 +0000 (11:45 -0700)]
Doc change: add diff report for API 12.

Change-Id: I9c7367be204208384aafaa19a8243164024ed1de

13 years agoMerge "Doc change: update media formats tables with adts/aac and flac" 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

13 years agoDoc change: update media formats tables with adts/aac and flac
Dirk Dougherty [Fri, 1 Apr 2011 22:55:28 +0000 (15:55 -0700)]
Doc change: update media formats tables with adts/aac and flac

Change-Id: Ic541f9e4ea1907453041d017d7d3608ead45ed6f

13 years agoam 27690eba: Merge "docs: update device dashboard" into honeycomb
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

13 years agoMerge "docs: update device dashboard" into honeycomb
Scott Main [Sat, 2 Apr 2011 00:36:42 +0000 (17:36 -0700)]
Merge "docs: update device dashboard" into honeycomb

13 years agoam cb719a48: Merge "docs: update homepage announcement for Google IO" 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

13 years agoMerge "docs: update homepage announcement for Google IO" into honeycomb
Scott Main [Fri, 1 Apr 2011 23:17:40 +0000 (16:17 -0700)]
Merge "docs: update homepage announcement for Google IO" into honeycomb

13 years agodocs: update device dashboard
Scott Main [Fri, 1 Apr 2011 21:38:36 +0000 (14:38 -0700)]
docs: update device dashboard

Change-Id: I0c94a8fabf85c5acb6195aae9f87d3d6ca5dadb8

13 years agodocs: update homepage announcement for Google IO
Scott Main [Thu, 31 Mar 2011 19:01:48 +0000 (12:01 -0700)]
docs: update homepage announcement for Google IO

Change-Id: I0421f1ae8731fdeb96145ebd82df1298389a5af5

13 years agoImprove Javadoc for USB Manager and MTP/PTP support.
Mike Lockwood [Fri, 1 Apr 2011 18:00:08 +0000 (14:00 -0400)]
Improve Javadoc for USB Manager and MTP/PTP support.

Bug: 4091519

Change-Id: Ida79593d5a984f7ffd0934ae7bded23b8faf9eef
Signed-off-by: Mike Lockwood <lockwood@android.com>
13 years agoam e979332f: docs: fix markup bugs
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

13 years agodocs: fix markup bugs
Scott Main [Fri, 1 Apr 2011 00:08:24 +0000 (17:08 -0700)]
docs: fix markup bugs

Change-Id: I230d16e6dc0fe166a61a30a92b2666e0856298a0

13 years agoBug 4167061
Glenn Kasten [Thu, 31 Mar 2011 01:50:41 +0000 (18:50 -0700)]
Bug 4167061

Change-Id: I9bf7c0f9387ad23501261b8c2d10fa6fdaba8aef

13 years agoMerge "Expand screen documentation with explicit screen size dimensions." into honeyc...
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

13 years agoExpand screen documentation with explicit screen size dimensions.
Dianne Hackborn [Tue, 29 Mar 2011 01:28:35 +0000 (18:28 -0700)]
Expand screen documentation with explicit screen size dimensions.

This updates the various documentation on screen sizes to discuss
the exact screen dimensions that are now associated with each size.
In addition, the screen sizes vs. densities table is updated to
include a number of additional representative screens.

Change-Id: Id07491148b1857e0265cef7139e564e190f38e03

13 years agoMerge "Replacing browser playback controls for inactive videos Bug: 4136024" into...
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

13 years agoam eb344a69: Fixing line in Market IAB docs that explains how to bind to the MarketSe...
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.

13 years agoMerge "When http streaming and Content-Length is unknown, make sure to return all...
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

13 years agoWhen http streaming and Content-Length is unknown, make sure to return all
Andreas Huber [Wed, 30 Mar 2011 21:45:22 +0000 (14:45 -0700)]
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

13 years agoMerge "Import revised translations. DO NOT MERGE" 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

13 years agoImport revised translations. DO NOT MERGE
Eric Fischer [Wed, 30 Mar 2011 21:25:28 +0000 (14:25 -0700)]
Import revised translations.  DO NOT MERGE

Change-Id: Ic87b36ba6dcc6cea8ef713b47c334156a7dd0f65

13 years agoReplacing browser playback controls for inactive videos
Justin Ho [Wed, 30 Mar 2011 21:21:28 +0000 (14:21 -0700)]
Replacing browser playback controls for inactive videos
Bug: 4136024

Change-Id: I1c48023005d711d5080fa17a695f709705e362b6

13 years agoFixing line in Market IAB docs that explains how to bind to the
Trevor Johns [Wed, 30 Mar 2011 18:30:09 +0000 (11:30 -0700)]
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".

13 years agoMerge "docs: update makefile to show javadocs diffs for api level 12" 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

13 years agoMerge "Surfaceflinger expects rectangles to be specified right/bottom edge exclusive...
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

13 years agoMerge "UsbService: Make USB disconnect handling for accessory mode more robust" into...
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

13 years agoUsbService: Make USB disconnect handling for accessory mode more robust
Mike Lockwood [Tue, 29 Mar 2011 23:49:42 +0000 (16:49 -0700)]
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>
13 years agodocs: update makefile to show javadocs diffs for api level 12
Scott Main [Tue, 29 Mar 2011 23:25:16 +0000 (16:25 -0700)]
docs: update makefile to show javadocs diffs for api level 12

Change-Id: I1ac584db778ec14b18129785126159f692459158

13 years agoam b42e83b1: (-s ours) Merge "Import revised translations. DO NOT MERGE" into honeycomb
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

13 years agoMerge "Fix the javadoc for LocationManager.requestSingleUpdate()" into honeycomb-mr1
Amith Yamasani [Tue, 29 Mar 2011 20:55:19 +0000 (13:55 -0700)]
Merge "Fix the javadoc for LocationManager.requestSingleUpdate()" into honeycomb-mr1

13 years agoMerge "Import revised translations. DO NOT MERGE" into honeycomb
Eric Fischer [Tue, 29 Mar 2011 20:45:03 +0000 (13:45 -0700)]
Merge "Import revised translations.  DO NOT MERGE" into honeycomb

13 years agoImport revised translations. DO NOT MERGE
Eric Fischer [Tue, 29 Mar 2011 20:26:46 +0000 (13:26 -0700)]
Import revised translations.  DO NOT MERGE

Change-Id: I09aefa0ca2ba1ff78574c8fbad2242d7ef63689d

13 years agoMerge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
Eric Fischer [Tue, 29 Mar 2011 19:16:53 +0000 (12:16 -0700)]
Merge "Import revised translations.  DO NOT MERGE" into honeycomb-mr1

13 years agoImport revised translations. DO NOT MERGE
Eric Fischer [Tue, 29 Mar 2011 18:58:23 +0000 (11:58 -0700)]
Import revised translations.  DO NOT MERGE

Change-Id: I962bb9917aa3f3d4b911c1ad7fdfbcda94afa0c7

13 years agoFix the javadoc for LocationManager.requestSingleUpdate()
Amith Yamasani [Mon, 28 Mar 2011 23:52:44 +0000 (16:52 -0700)]
Fix the javadoc for LocationManager.requestSingleUpdate()

It was saying the same thing as requestLocationUpdates(), but it only provides a single update.

Change-Id: I0a0f612104a946b7db96928505bb95673377a335

13 years agoSurfaceflinger expects rectangles to be specified right/bottom edge exclusive.
Andreas Huber [Tue, 29 Mar 2011 17:00:20 +0000 (10:00 -0700)]
Surfaceflinger expects rectangles to be specified right/bottom edge exclusive.

Change-Id: Ib493572c614dbb74fa23b13c3e43899e3b31cf0e
related-to-bug: 4147205

13 years agoam faede250: IAB doc update for final launch
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

13 years agoIAB doc update for final launch
Bill Gruber [Tue, 29 Mar 2011 01:27:58 +0000 (18:27 -0700)]
IAB doc update for final launch

Change-Id: I5173422eb65f4effc61162c2b172750dee0a6a2c

13 years agoMerge "UsbService: Fix JNI local reference leaks in the USB host support code" into...
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

13 years agoMerge "After a seek there's a brief period where audio time isn't reestablished....
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

13 years agoUsbService: Fix JNI local reference leaks in the USB host support code
Mike Lockwood [Mon, 28 Mar 2011 02:35:43 +0000 (19:35 -0700)]
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>