OSDN Git Service

android-x86/frameworks-base.git
13 years agoam ad492161: am a2090bea: am 7118bdec: Merge "Fix for #12945: ProgressBar.setMax...
Romain Guy [Tue, 22 Feb 2011 22:48:21 +0000 (14:48 -0800)]
am ad492161: am a2090bea: am 7118bdec: Merge "Fix for #12945: ProgressBar.setMax() will always redraw."

* commit 'ad492161e4384efe11daec60cd14902f6b2c662a':
  Fix for #12945: ProgressBar.setMax() will always redraw.

13 years agoam 301431d9: Doc change: Final diff report for API 11.
Dirk Dougherty [Sun, 20 Feb 2011 02:07:20 +0000 (18:07 -0800)]
am 301431d9: Doc change: Final diff report for API 11.

* commit '301431d96e85e37d1dc2dd0df88f894dda0f5404':
  Doc change: Final diff report for API 11.

13 years agoDoc change: Final diff report for API 11.
Dirk Dougherty [Sun, 20 Feb 2011 01:22:29 +0000 (17:22 -0800)]
Doc change: Final diff report for API 11.

Change-Id: Id7a6907a4f765fe753c2b134bfbd29a5792cc9ed

13 years agoresolved conflicts for merge of b842629c to honeycomb-plus-aosp
Scott Main [Sat, 19 Feb 2011 03:42:29 +0000 (19:42 -0800)]
resolved conflicts for merge of b842629c to honeycomb-plus-aosp

Change-Id: I5628f9e3baad68882b63a2917df3fb0bb1bbdfa6

13 years agodocs: update sizes and sums for tools and ndk
Scott Main [Sat, 19 Feb 2011 00:33:25 +0000 (16:33 -0800)]
docs: update sizes and sums for tools and ndk

Change-Id: Id7c72a89dc50461a7883b599dcd7a08738049dee

13 years agoam e4da3934: Merge "docs: move new AIDL doc back into the existing doc, but move...
Scott Main [Fri, 18 Feb 2011 23:11:14 +0000 (15:11 -0800)]
am e4da3934: Merge "docs: move new AIDL doc back into the existing doc, but move the side nav location out of tools" into honeycomb

* commit 'e4da39345209c47b2736f266adfc22a0fdb4c716':
  docs: move new AIDL doc back into the existing doc, but move the side nav location out of tools

13 years agoMerge "docs: move new AIDL doc back into the existing doc, but move the side nav...
Scott Main [Fri, 18 Feb 2011 23:08:26 +0000 (15:08 -0800)]
Merge "docs: move new AIDL doc back into the existing doc, but move the side nav location out of tools" into honeycomb

13 years agoam 163413f4: Merge "docs: update getting started doc for 3.0; move out of preview...
Scott Main [Fri, 18 Feb 2011 18:40:59 +0000 (10:40 -0800)]
am 163413f4: Merge "docs: update getting started doc for 3.0; move out of preview docs" into honeycomb

* commit '163413f4360af8a8b010fa69a131fb0177df96a7':
  docs: update getting started doc for 3.0; move out of preview docs

13 years agoMerge "docs: update getting started doc for 3.0; move out of preview docs" into honeycomb
Scott Main [Fri, 18 Feb 2011 18:26:41 +0000 (10:26 -0800)]
Merge "docs: update getting started doc for 3.0; move out of preview docs" into honeycomb

13 years agoam a2090bea: am 7118bdec: Merge "Fix for #12945: ProgressBar.setMax() will always...
Romain Guy [Fri, 18 Feb 2011 16:06:01 +0000 (08:06 -0800)]
am a2090bea: am 7118bdec: Merge "Fix for #12945: ProgressBar.setMax() will always redraw."

* commit 'a2090bea4824cf153c4d9c735ee779613cf2e3d7':
  Fix for #12945: ProgressBar.setMax() will always redraw.

13 years agoam 7118bdec: Merge "Fix for #12945: ProgressBar.setMax() will always redraw."
Romain Guy [Fri, 18 Feb 2011 15:53:50 +0000 (07:53 -0800)]
am 7118bdec: Merge "Fix for #12945: ProgressBar.setMax() will always redraw."

* commit '7118bdec523568842e70555e353951df9f2596fd':
  Fix for #12945: ProgressBar.setMax() will always redraw.

13 years agoMerge "Fix for #12945: ProgressBar.setMax() will always redraw."
Romain Guy [Fri, 18 Feb 2011 06:40:33 +0000 (22:40 -0800)]
Merge "Fix for #12945: ProgressBar.setMax() will always redraw."

13 years agoFix for #12945: ProgressBar.setMax() will always redraw.
Michael Krehan [Fri, 18 Feb 2011 04:04:27 +0000 (20:04 -0800)]
Fix for #12945: ProgressBar.setMax() will always redraw.

Fix for issue #12945: Changing the maximum of a progress bar does
not cause it to be redrawn, even though a new maximum changes the
position of the current progress in relation to its maximum. With this fix,
setMax() will always cause refreshProgress() to be called if the maximum is
different than it was before.

Change-Id: I971ec3302953bcadc0aac3dd8241481bab2b5a91

13 years agoam a58f58da: Merge "Doc change: fixing renderscript samples" into honeycomb
Robert Ly [Fri, 18 Feb 2011 04:21:35 +0000 (20:21 -0800)]
am a58f58da: Merge "Doc change: fixing renderscript samples" into honeycomb

* commit 'a58f58daf94caa7e50c04707a67ba1a9dacb0a9c':
  Doc change: fixing renderscript samples

13 years agoam 0ddd2d1e: DO NOT MERGE Delete unused/broken samples and tests from the renderscrip...
Scott Main [Fri, 18 Feb 2011 04:21:24 +0000 (20:21 -0800)]
am 0ddd2d1e: DO NOT MERGE Delete unused/broken samples and tests from the renderscript libs, so we can publish the entire contents of libs/rs/java/ for samples in HC

* commit '0ddd2d1ea7cda544efc4d25601e1cdc0236e44d8':
  DO NOT MERGE Delete unused/broken samples and tests from the renderscript libs, so we can publish the entire contents of libs/rs/java/ for samples in HC

13 years agoMerge "Doc change: fixing renderscript samples" into honeycomb
Robert Ly [Fri, 18 Feb 2011 02:53:36 +0000 (18:53 -0800)]
Merge "Doc change: fixing renderscript samples" into honeycomb

13 years agodocs: update getting started doc for 3.0; move out of preview docs
Scott Main [Wed, 16 Feb 2011 23:52:38 +0000 (15:52 -0800)]
docs: update getting started doc for 3.0; move out of preview docs

Change-Id: Ibf6f001eca76ebff2f3be1f38691dbd33220a33e

13 years agoDoc change: fixing renderscript samples
Robert Ly [Tue, 15 Feb 2011 02:57:46 +0000 (18:57 -0800)]
Doc change: fixing renderscript samples

Change-Id: Ie5d17df121ec4bc5fd46448c1670d306322b92d8

13 years agoDO NOT MERGE
Scott Main [Fri, 18 Feb 2011 00:09:25 +0000 (16:09 -0800)]
DO NOT MERGE
Delete unused/broken samples and tests from the renderscript libs,
so we can publish the entire contents of libs/rs/java/ for samples in HC

Change-Id: I0428074e995d7ee282520f54a9a3c81e32bff027

13 years agoam e766fcd5: DOC CHANGE: Bug 3396898 add attribute uses-library
Joe Malin [Thu, 17 Feb 2011 21:18:30 +0000 (13:18 -0800)]
am e766fcd5: DOC CHANGE: Bug 3396898 add attribute uses-library

* commit 'e766fcd5e967c2400a1fe90a4a01e4f0a12dbd1d':
  DOC CHANGE: Bug 3396898 add attribute uses-library

13 years agoDOC CHANGE: Bug 3396898 add attribute uses-library
Joe Malin [Fri, 4 Feb 2011 21:02:23 +0000 (13:02 -0800)]
DOC CHANGE: Bug 3396898 add attribute uses-library

Change-Id: I21810676050abed04c0c69b61c05d8d7228f434d

13 years agoam 79a97489: (-s ours) am dbe09da6: DO NOT MERGE: Respond to RTSP server->client...
Andreas Huber [Wed, 16 Feb 2011 22:28:01 +0000 (14:28 -0800)]
am 79a97489: (-s ours) am dbe09da6: DO NOT MERGE: Respond to RTSP server->client requests.

* commit '79a97489494deb8bdae85696f612ec7acda54240':
  DO NOT MERGE: Respond to RTSP server->client requests.

13 years agoam dbe09da6: DO NOT MERGE: Respond to RTSP server->client requests.
Andreas Huber [Wed, 16 Feb 2011 22:24:53 +0000 (14:24 -0800)]
am dbe09da6: DO NOT MERGE: Respond to RTSP server->client requests.

* commit 'dbe09da6ac4d1e9e78e5c8f33fbc6d32822ba7ed':
  DO NOT MERGE: Respond to RTSP server->client requests.

13 years agoDO NOT MERGE: Respond to RTSP server->client requests.
Andreas Huber [Wed, 16 Feb 2011 21:20:02 +0000 (13:20 -0800)]
DO NOT MERGE: Respond to RTSP server->client requests.

Even if it's just to tell them that we don't support any (this is optional).

Change-Id: Iee50b4020f28a47dfbe5d56f1732fe044b3b3655
related-to-bug: 3353752

13 years agoam 0643d7c4: docs: add new tag for tasks doc
Scott Main [Wed, 16 Feb 2011 20:41:53 +0000 (12:41 -0800)]
am 0643d7c4: docs: add new tag for tasks doc

* commit '0643d7c442f975efa35c9e3729d74555627a32b5':
  docs: add new tag for tasks doc

13 years agodocs: add new tag for tasks doc
Scott Main [Wed, 16 Feb 2011 20:38:59 +0000 (12:38 -0800)]
docs: add new tag for tasks doc

Change-Id: I60248fb9ec1d98e89b526391c453d1bde9226cb0

13 years agoam b1835085: Merge "@hide DPM global proxy settings" into honeycomb
Andy Stadler [Wed, 16 Feb 2011 20:20:36 +0000 (12:20 -0800)]
am b1835085: Merge "@hide DPM global proxy settings" into honeycomb

* commit 'b18350851633b1d3717f2484d27b76aa64788ce1':
  @hide DPM global proxy settings

13 years agoMerge "@hide DPM global proxy settings" into honeycomb
Andy Stadler [Wed, 16 Feb 2011 20:18:39 +0000 (12:18 -0800)]
Merge "@hide DPM global proxy settings" into honeycomb

13 years agoresolved conflicts for merge of f722cecd to honeycomb-plus-aosp
Scott Main [Wed, 16 Feb 2011 20:08:36 +0000 (12:08 -0800)]
resolved conflicts for merge of f722cecd to honeycomb-plus-aosp

Change-Id: Iaaa3a3a1231ea0e0b7ad7442cdf664418472f27f

13 years agoMerge "docs: update homepage for 3.0 announcement" into honeycomb
Scott Main [Wed, 16 Feb 2011 19:58:40 +0000 (11:58 -0800)]
Merge "docs: update homepage for 3.0 announcement" into honeycomb

13 years agodocs: move new AIDL doc back into the existing doc, but move the side nav location...
Scott Main [Wed, 16 Feb 2011 00:25:52 +0000 (16:25 -0800)]
docs: move new AIDL doc back into the existing doc, but move the side nav location out of tools

Change-Id: I6021cd0eb9d37a004036249305819a352efa4f92

13 years agoam de27b519: (-s ours) am 3259d885: Merge "DO NOT MERGE - backport of l92a02b31 from...
Robert Greenwalt [Wed, 16 Feb 2011 18:55:54 +0000 (10:55 -0800)]
am de27b519: (-s ours) am 3259d885: Merge "DO NOT MERGE - backport of l92a02b31 from master" into gingerbread

* commit 'de27b519588ed46c0ba601a489c01d26ec31757d':
  DO NOT MERGE - backport of l92a02b31 from master

13 years ago@hide DPM global proxy settings
Andy Stadler [Wed, 16 Feb 2011 18:53:33 +0000 (10:53 -0800)]
@hide DPM global proxy settings

They don't work as advertised, so remove from SDK.

Bug: 3460938

Change-Id: I87f80ebf38b228a4085630f1c2526c1d86b93dd7

13 years agoam 3259d885: Merge "DO NOT MERGE - backport of l92a02b31 from master" into gingerbread
Robert Greenwalt [Wed, 16 Feb 2011 18:51:04 +0000 (10:51 -0800)]
am 3259d885: Merge "DO NOT MERGE - backport of l92a02b31 from master" into gingerbread

* commit '3259d8853760a72b811757e1711119d041962a1c':
  DO NOT MERGE - backport of l92a02b31 from master

13 years agoMerge "DO NOT MERGE - backport of l92a02b31 from master" into gingerbread
Robert Greenwalt [Wed, 16 Feb 2011 18:44:26 +0000 (10:44 -0800)]
Merge "DO NOT MERGE - backport of l92a02b31 from master" into gingerbread

13 years agoam 874ae43c: Merge "Import revised translations. DO NOT MERGE" into honeycomb
Eric Fischer [Wed, 16 Feb 2011 18:38:11 +0000 (10:38 -0800)]
am 874ae43c: Merge "Import revised translations.  DO NOT MERGE" into honeycomb

* commit '874ae43ce1c7fc1fe6c1423b581757fe14edce6e':
  Import revised translations.  DO NOT MERGE

13 years agoMerge "Import revised translations. DO NOT MERGE" into honeycomb
Eric Fischer [Wed, 16 Feb 2011 18:33:18 +0000 (10:33 -0800)]
Merge "Import revised translations.  DO NOT MERGE" into honeycomb

13 years agoam b79db4cd: (-s ours) am be5f82ab: Merge "DO NOT MERGE - Clear backoffs on reconnect...
Alon Albert [Wed, 16 Feb 2011 18:26:53 +0000 (10:26 -0800)]
am b79db4cd: (-s ours) am be5f82ab: Merge "DO NOT MERGE - Clear backoffs on reconnect" into gingerbread

* commit 'b79db4cd5ccbe17e837c8943abb658bbf0dd0854':
  DO NOT MERGE - Clear backoffs on reconnect

13 years agoam be5f82ab: Merge "DO NOT MERGE - Clear backoffs on reconnect" into gingerbread
Alon Albert [Wed, 16 Feb 2011 18:24:15 +0000 (10:24 -0800)]
am be5f82ab: Merge "DO NOT MERGE - Clear backoffs on reconnect" into gingerbread

* commit 'be5f82ab0ddacea3846cfa5aa846d1c97def0318':
  DO NOT MERGE - Clear backoffs on reconnect

13 years agoam 796ce77a: docs: add breadcrumbs to articles and tutorials
Scott Main [Wed, 16 Feb 2011 18:23:05 +0000 (10:23 -0800)]
am 796ce77a: docs: add breadcrumbs to articles and tutorials

* commit '796ce77abf3d1d006576490c286e72ebf0736280':
  docs: add breadcrumbs to articles and tutorials

13 years agoMerge "DO NOT MERGE - Clear backoffs on reconnect" into gingerbread
Alon Albert [Wed, 16 Feb 2011 18:20:13 +0000 (10:20 -0800)]
Merge "DO NOT MERGE - Clear backoffs on reconnect" into gingerbread

13 years agoImport revised translations. DO NOT MERGE
Eric Fischer [Wed, 16 Feb 2011 18:18:37 +0000 (10:18 -0800)]
Import revised translations.  DO NOT MERGE

Change-Id: Id7d999bfc9d422292aa81d5a8c579840e9cc1438

13 years agoDO NOT MERGE - Clear backoffs on reconnect
Alon Albert [Tue, 15 Feb 2011 23:07:59 +0000 (15:07 -0800)]
DO NOT MERGE - Clear backoffs on reconnect

Slightly modified backport from HC

Bug: 3460736
Change-Id: I155dfd34bb7abb76a10b5b58fe9a32af2449d4f1

13 years agodocs: add breadcrumbs to articles and tutorials
Scott Main [Wed, 16 Feb 2011 18:04:45 +0000 (10:04 -0800)]
docs: add breadcrumbs to articles and tutorials

Change-Id: If49368853e95d39bbe6b42c6fc3820a8a7319048

13 years agoam 99e267eb: am 7bcd2c62: New API added in NfcAdapter to enable/disable SE card emulation
daniel_tomas [Wed, 16 Feb 2011 17:43:08 +0000 (09:43 -0800)]
am 99e267eb: am 7bcd2c62: New API added in NfcAdapter to enable/disable SE card emulation

* commit '99e267ebcf8f950cbdcf8438cc7383e1fc6a56c2':
  New API added in NfcAdapter to enable/disable SE card emulation

13 years agoam 7bcd2c62: New API added in NfcAdapter to enable/disable SE card emulation
daniel_tomas [Wed, 16 Feb 2011 17:41:00 +0000 (09:41 -0800)]
am 7bcd2c62: New API added in NfcAdapter to enable/disable SE card emulation

* commit '7bcd2c62ebfad640e8082c1dc700c9d8c57aba81':
  New API added in NfcAdapter to enable/disable SE card emulation

13 years agoNew API added in NfcAdapter to enable/disable SE card emulation
daniel_tomas [Thu, 6 Jan 2011 23:44:10 +0000 (15:44 -0800)]
New API added in NfcAdapter to enable/disable SE card emulation

Change-Id: Ia0c123873ba9265b45e847d1a30c1300de3c1346

13 years agoam 8c8e9d9a: am 1df862a4: Minor doc update.
Nick Pelly [Wed, 16 Feb 2011 17:25:09 +0000 (09:25 -0800)]
am 8c8e9d9a: am 1df862a4: Minor doc update.

* commit '8c8e9d9a7f1bddbc995a5c088f19a0a3be1f6a5b':
  Minor doc update.

13 years agoam 1df862a4: Minor doc update.
Nick Pelly [Wed, 16 Feb 2011 17:23:08 +0000 (09:23 -0800)]
am 1df862a4: Minor doc update.

* commit '1df862a4656bb0d7a3329311b1e243fc6db32448':
  Minor doc update.

13 years agoam f79bbc30: Merge "docs: edit doc titles to match side nav and add breadcrumb links...
Scott Main [Wed, 16 Feb 2011 17:21:06 +0000 (09:21 -0800)]
am f79bbc30: Merge "docs: edit doc titles to match side nav and add breadcrumb links" into honeycomb

* commit 'f79bbc305bdb0c8aa46dd7e621e229b8fd447ab9':
  docs: edit doc titles to match side nav and add breadcrumb links

13 years agoMinor doc update.
Nick Pelly [Tue, 15 Feb 2011 21:34:38 +0000 (13:34 -0800)]
Minor doc update.

Change-Id: I1d29adfccbdc196a145a2c2a044d63b00e5f788b

13 years agoam 16d94f58: (-s ours) am 8db7a7bf: Merge "DO NOT MERGE: Derive the Transport "source...
Andreas Huber [Wed, 16 Feb 2011 17:10:19 +0000 (09:10 -0800)]
am 16d94f58: (-s ours) am 8db7a7bf: Merge "DO NOT MERGE: Derive the Transport "source" attribute from the RTSP endpoint address if necessary" into gingerbread

* commit '16d94f580a50dafbe4dda3e9fe2ef47897ac1fe5':
  DO NOT MERGE: Derive the Transport "source" attribute from the RTSP endpoint address if necessary

13 years agoMerge "docs: edit doc titles to match side nav and add breadcrumb links" into honeycomb
Scott Main [Wed, 16 Feb 2011 17:06:43 +0000 (09:06 -0800)]
Merge "docs: edit doc titles to match side nav and add breadcrumb links" into honeycomb

13 years agoam 8db7a7bf: Merge "DO NOT MERGE: Derive the Transport "source" attribute from the...
Andreas Huber [Wed, 16 Feb 2011 17:02:08 +0000 (09:02 -0800)]
am 8db7a7bf: Merge "DO NOT MERGE: Derive the Transport "source" attribute from the RTSP endpoint address if necessary" into gingerbread

* commit '8db7a7bfadc7bdfa30f60bb06063f91b19234096':
  DO NOT MERGE: Derive the Transport "source" attribute from the RTSP endpoint address if necessary

13 years agoMerge "DO NOT MERGE: Derive the Transport "source" attribute from the RTSP endpoint...
Andreas Huber [Wed, 16 Feb 2011 16:50:37 +0000 (08:50 -0800)]
Merge "DO NOT MERGE: Derive the Transport "source" attribute from the RTSP endpoint address if necessary" into gingerbread

13 years agoam c3ebf27a: am 4bebbe5f: Merge "Adding package summary for nfc.tech package" into...
Robert Ly [Wed, 16 Feb 2011 06:58:51 +0000 (22:58 -0800)]
am c3ebf27a: am 4bebbe5f: Merge "Adding package summary for nfc.tech package" into gingerbread

* commit 'c3ebf27a511934d7529b2fbde223169e83c74561':
  Adding package summary for nfc.tech package

13 years agoam 4bebbe5f: Merge "Adding package summary for nfc.tech package" into gingerbread
Robert Ly [Wed, 16 Feb 2011 06:54:52 +0000 (22:54 -0800)]
am 4bebbe5f: Merge "Adding package summary for nfc.tech package" into gingerbread

* commit '4bebbe5fea1b6d7f5deff6d41d7633308607c08b':
  Adding package summary for nfc.tech package

13 years agoam 9cf2fa02: docs: add breadcrumbs to developing docs
Scott Main [Wed, 16 Feb 2011 04:08:30 +0000 (20:08 -0800)]
am 9cf2fa02: docs: add breadcrumbs to developing docs

* commit '9cf2fa023bb55979853995a34a9fa9996a2212f0':
  docs: add breadcrumbs to developing docs

13 years agoam a766a8be: docs: add breadcrumbs to testing docs
Scott Main [Wed, 16 Feb 2011 04:08:26 +0000 (20:08 -0800)]
am a766a8be: docs: add breadcrumbs to testing docs

* commit 'a766a8bee24b46fdeea2cc891e6ce202d906245f':
  docs: add breadcrumbs to testing docs

13 years agoam f2d52938: Merge "docs: revise loader doc title" into honeycomb
Scott Main [Wed, 16 Feb 2011 04:08:21 +0000 (20:08 -0800)]
am f2d52938: Merge "docs: revise loader doc title" into honeycomb

* commit 'f2d5293844a3c782ccd415d327007ec5e7681a26':
  docs: revise loader doc title

13 years agoam e250cbb8: Merge "doc change: add rel note links to external tools site" into honeycomb
Robert Ly [Wed, 16 Feb 2011 04:08:17 +0000 (20:08 -0800)]
am e250cbb8: Merge "doc change: add rel note links to external tools site" into honeycomb

* commit 'e250cbb8d5ea787c318bba384fd9cb46b446ea3d':
  doc change: add rel note links to external tools site

13 years agoam c918e4a8: docs: add parent links to graphics docs
Scott Main [Wed, 16 Feb 2011 04:08:12 +0000 (20:08 -0800)]
am c918e4a8: docs: add parent links to graphics docs

* commit 'c918e4a86d42d89cb893b0150358cfd01ef7d532':
  docs: add parent links to graphics docs

13 years agoam 13033ea5: docs: fix misc broken links
Scott Main [Wed, 16 Feb 2011 04:08:07 +0000 (20:08 -0800)]
am 13033ea5: docs: fix misc broken links

* commit '13033ea52714d48d754c6bc8fccb18514c645a47':
  docs: fix misc broken links

13 years agodocs: add breadcrumbs to developing docs
Scott Main [Wed, 16 Feb 2011 02:26:07 +0000 (18:26 -0800)]
docs: add breadcrumbs to developing docs

Change-Id: Id63b53a77daff2fa45424dc6607a467dc55a10e3

13 years agodocs: add breadcrumbs to testing docs
Scott Main [Wed, 16 Feb 2011 02:02:55 +0000 (18:02 -0800)]
docs: add breadcrumbs to testing docs

Change-Id: Ib2b3ef1871fba52b8f34513e9279acb98d26fb6c

13 years agodocs: edit doc titles to match side nav and add breadcrumb links
Scott Main [Wed, 16 Feb 2011 01:59:36 +0000 (17:59 -0800)]
docs: edit doc titles to match side nav and add breadcrumb links

Change-Id: Ie3dbc42122119c23baeb83b005fff3b8995f744a

13 years agoMerge "docs: revise loader doc title" into honeycomb
Scott Main [Wed, 16 Feb 2011 01:54:28 +0000 (17:54 -0800)]
Merge "docs: revise loader doc title" into honeycomb

13 years agodocs: revise loader doc title
Scott Main [Wed, 16 Feb 2011 01:25:26 +0000 (17:25 -0800)]
docs: revise loader doc title

Change-Id: I232eb1da8270625afa0f26951dbd20d9a61fe15d

13 years agoMerge "Adding package summary for nfc.tech package" into gingerbread
Robert Ly [Wed, 16 Feb 2011 01:44:56 +0000 (17:44 -0800)]
Merge "Adding package summary for nfc.tech package" into gingerbread

13 years agoAdding package summary for nfc.tech package
Robert Ly [Tue, 15 Feb 2011 21:10:07 +0000 (13:10 -0800)]
Adding package summary for nfc.tech package

Change-Id: Ibbf55c21dcaf48b4eb369e78c54fb1023abb3cb3

13 years agoMerge "doc change: add rel note links to external tools site" into honeycomb
Robert Ly [Wed, 16 Feb 2011 01:38:56 +0000 (17:38 -0800)]
Merge "doc change: add rel note links to external tools site" into honeycomb

13 years agodocs: add parent links to graphics docs
Scott Main [Wed, 16 Feb 2011 01:37:14 +0000 (17:37 -0800)]
docs: add parent links to graphics docs

Change-Id: I8dafe4c717e9169bf85cdf0594553558827f73ae

13 years agodoc change: add rel note links to external tools site
Robert Ly [Wed, 16 Feb 2011 00:08:03 +0000 (16:08 -0800)]
doc change: add rel note links to external tools site

Change-Id: I5b956db99fa1065699d7fe2322fe00e90c88c724

13 years agodocs: fix misc broken links
Scott Main [Tue, 15 Feb 2011 21:18:30 +0000 (13:18 -0800)]
docs: fix misc broken links

Change-Id: Id7d0ee36398aca452ceb2c3d15982397f58a06c6

13 years agoam a460a9ac: docs: add \'new\' tags and resolve some doc title regressions
Scott Main [Tue, 15 Feb 2011 23:49:43 +0000 (15:49 -0800)]
am a460a9ac: docs: add \'new\' tags and resolve some doc title regressions

* commit 'a460a9ac79bb79c2a410401a907a6bdf21320746':
  docs: add 'new' tags and resolve some doc title regressions

13 years agodocs: add 'new' tags and resolve some doc title regressions
Scott Main [Tue, 15 Feb 2011 23:45:24 +0000 (15:45 -0800)]
docs: add 'new' tags and resolve some doc title regressions

Change-Id: I4894d29dded74e4e47cdff6e816417de776cfe04

13 years agoam c00cc5f2: cherry pick Change-Id: I380cebe8d015749a00f6f3d22fdc5c55a380f447
Robert Ly [Tue, 15 Feb 2011 23:42:14 +0000 (15:42 -0800)]
am c00cc5f2: cherry pick Change-Id: I380cebe8d015749a00f6f3d22fdc5c55a380f447

* commit 'c00cc5f22689e0c6dba50b6bf8dc085ffca20d39':
  cherry pick Change-Id: I380cebe8d015749a00f6f3d22fdc5c55a380f447

13 years agocherry pick Change-Id: I380cebe8d015749a00f6f3d22fdc5c55a380f447
Robert Ly [Thu, 10 Feb 2011 21:42:13 +0000 (13:42 -0800)]
cherry pick Change-Id: I380cebe8d015749a00f6f3d22fdc5c55a380f447

Doc change: nfc dev guide

Change-Id: I918d0eddc51a96adf901170a6b2f6cbd38579d1d

13 years agoDO NOT MERGE: Derive the Transport "source" attribute from the RTSP endpoint address...
Andreas Huber [Tue, 15 Feb 2011 21:32:42 +0000 (13:32 -0800)]
DO NOT MERGE: Derive the Transport "source" attribute from the RTSP endpoint address if necessary

and continue even if we were unable to poke a hole into the firewall.

Change-Id: I5757a2521b8d81a42d03cca379179ce2c9ee46e7
related-to-bug: 3457201

13 years agoam 39014026: am 29853a35: Merge "Only decode EXT1 tag when it is available." into...
John Wang [Tue, 15 Feb 2011 20:40:49 +0000 (12:40 -0800)]
am 39014026: am 29853a35: Merge "Only decode EXT1 tag when it is available." into gingerbread

* commit '3901402600daa5ef9fbcae7b4b9400ee8ca1a317':
  Only decode EXT1 tag when it is available.

13 years agoam 29853a35: Merge "Only decode EXT1 tag when it is available." into gingerbread
John Wang [Tue, 15 Feb 2011 20:38:38 +0000 (12:38 -0800)]
am 29853a35: Merge "Only decode EXT1 tag when it is available." into gingerbread

* commit '29853a356bb6ddb094df6d0f5dd04e2a63f25147':
  Only decode EXT1 tag when it is available.

13 years agoMerge "Only decode EXT1 tag when it is available." into gingerbread
John Wang [Tue, 15 Feb 2011 20:34:37 +0000 (12:34 -0800)]
Merge "Only decode EXT1 tag when it is available." into gingerbread

13 years agoam 6d1387b6: Merge "SDK docs: Hierarchy Viewer V2" into honeycomb
Joe Malin [Tue, 15 Feb 2011 20:34:35 +0000 (12:34 -0800)]
am 6d1387b6: Merge "SDK docs: Hierarchy Viewer V2" into honeycomb

* commit '6d1387b6ecf0aaea6f36472fcd1a499824fd30b5':
  SDK docs: Hierarchy Viewer V2

13 years agoMerge "SDK docs: Hierarchy Viewer V2" into honeycomb
Joe Malin [Tue, 15 Feb 2011 20:32:48 +0000 (12:32 -0800)]
Merge "SDK docs: Hierarchy Viewer V2" into honeycomb

13 years agoam e0c9f275: (-s ours) am d1ba051a: DO NOT MERGE: Work around several issues with...
Andreas Huber [Tue, 15 Feb 2011 19:51:33 +0000 (11:51 -0800)]
am e0c9f275: (-s ours) am d1ba051a: DO NOT MERGE: Work around several issues with non-compliant RTSP servers.

* commit 'e0c9f2757b0ebd291fec89ebb520878aacd3f7dc':
  DO NOT MERGE: Work around several issues with non-compliant RTSP servers.

13 years agoam d1ba051a: DO NOT MERGE: Work around several issues with non-compliant RTSP servers.
Andreas Huber [Tue, 15 Feb 2011 19:49:03 +0000 (11:49 -0800)]
am d1ba051a: DO NOT MERGE: Work around several issues with non-compliant RTSP servers.

* commit 'd1ba051a465518fa4325c364ed77025fc1a2a794':
  DO NOT MERGE: Work around several issues with non-compliant RTSP servers.

13 years agoam 97ef3b41: Merge "docs: revise a couple sample app names to match side nav" into...
Scott Main [Tue, 15 Feb 2011 19:36:44 +0000 (11:36 -0800)]
am 97ef3b41: Merge "docs: revise a couple sample app names to match side nav" into honeycomb

* commit '97ef3b416ada559c446d1d21d70d2604433b92f5':
  docs: revise a couple sample app names to match side nav

13 years agoMerge "docs: revise a couple sample app names to match side nav" into honeycomb
Scott Main [Tue, 15 Feb 2011 19:33:43 +0000 (11:33 -0800)]
Merge "docs: revise a couple sample app names to match side nav" into honeycomb

13 years agoam 5a44efb4: docs: fix markup error
Scott Main [Tue, 15 Feb 2011 19:07:06 +0000 (11:07 -0800)]
am 5a44efb4: docs: fix markup error

* commit '5a44efb42738e4fd1b448004f74dc96372801936':
  docs: fix markup error

13 years agoDO NOT MERGE: Work around several issues with non-compliant RTSP servers.
Andreas Huber [Tue, 15 Feb 2011 18:39:48 +0000 (10:39 -0800)]
DO NOT MERGE: Work around several issues with non-compliant RTSP servers.

In this particular case these RTSP servers were implemented as local services,
retransmitting live streams via a local RTSP server instance.

They picked wrong rtp/rtcp port pairs (odd rtp port), blank lines in the session
description, wrong case of the format description, relative base URLs...

Change-Id: I502a04a7e1d690fd461b7ecf0b56c6a6c2ac1325
related-to-bug: 3452103

13 years agodocs: revise a couple sample app names to match side nav
Scott Main [Tue, 15 Feb 2011 18:58:34 +0000 (10:58 -0800)]
docs: revise a couple sample app names to match side nav

Change-Id: Ia45e78fe005c80934d70b585558cb4c6c0f52f30

13 years agodocs: fix markup error
Scott Main [Tue, 15 Feb 2011 18:45:46 +0000 (10:45 -0800)]
docs: fix markup error

Change-Id: Ic4f86094bbebaca7f9be37207a4126d083fff575

13 years agoOnly decode EXT1 tag when it is available.
John Wang [Tue, 15 Feb 2011 01:36:42 +0000 (17:36 -0800)]
Only decode EXT1 tag when it is available.

Normally ADN record is stored in two tags, EFADN_TAG and EFEXT1_TAG. But if the EFEXT1_TAG is not set in EF_PBR entry,
it shouldn't be decoded otherwise it causes NullPointerException in readAdnFileAndWait().

bug: 3376954
Change-Id: I744cf5cb8662c75be1e7c6219fa92c67bdda82f2

13 years agoam 64b12eac: docs: add links to sample apps
Scott Main [Tue, 15 Feb 2011 00:07:47 +0000 (16:07 -0800)]
am 64b12eac: docs: add links to sample apps

* commit '64b12eac53ba9acd456be2e23f34b5add18461ce':
  docs: add links to sample apps

13 years agodocs: add links to sample apps
Scott Main [Mon, 14 Feb 2011 21:41:03 +0000 (13:41 -0800)]
docs: add links to sample apps

Change-Id: I14ba8a84d469162ce2317d02985aebeb447570ea

13 years agoam 865cd1ca: Merge "docs: update sidenav; move loaders under activities, add "more...
Scott Main [Mon, 14 Feb 2011 22:44:30 +0000 (14:44 -0800)]
am 865cd1ca: Merge "docs: update sidenav; move loaders under activities, add "more" tags, remove duplicate for content providers, rename Copying/ to Copy/" into honeycomb

* commit '865cd1ca5c31243764545dc888ee117a9215e837':
  docs: update sidenav; move loaders under activities, add "more" tags, remove duplicate for content providers, rename Copying/ to Copy/

13 years agoMerge "docs: update sidenav; move loaders under activities, add "more" tags, remove...
Scott Main [Mon, 14 Feb 2011 22:42:18 +0000 (14:42 -0800)]
Merge "docs: update sidenav; move loaders under activities, add "more" tags, remove duplicate for content providers, rename Copying/ to Copy/" into honeycomb

13 years agoam 9ab0f2b2: Merge "docs: fix link to sample app" into honeycomb
Scott Main [Mon, 14 Feb 2011 22:41:14 +0000 (14:41 -0800)]
am 9ab0f2b2: Merge "docs: fix link to sample app" into honeycomb

* commit '9ab0f2b220a6b38cad020bb3f4940737a024a5f6':
  docs: fix link to sample app

13 years agoMerge "docs: fix link to sample app" into honeycomb
Scott Main [Mon, 14 Feb 2011 22:39:13 +0000 (14:39 -0800)]
Merge "docs: fix link to sample app" into honeycomb

13 years agodocs: fix link to sample app
Scott Main [Mon, 14 Feb 2011 22:38:24 +0000 (14:38 -0800)]
docs: fix link to sample app

Change-Id: Ie9127cc15ab527542bd5df564826ea703fba419b