Commit Graph

7303 Commits

Author SHA1 Message Date
Xavier Ducrohet
f9c5c8ca43 am dfe25b0e: Merge "LayoutLib: support for custom styles." into eclair
Merge commit 'dfe25b0e0c382d04a59bb03c7f5f8689ece5395e' into eclair-plus-aosp

* commit 'dfe25b0e0c382d04a59bb03c7f5f8689ece5395e':
  LayoutLib: support for custom styles.
2010-01-11 15:28:07 -08:00
Xavier Ducrohet
94ff01104b Merge "LayoutLib: support for custom styles." into eclair 2010-01-11 15:25:16 -08:00
Jaikumar Ganesh
57bb82bdc4 am ccaebfc9: Don\'t set priority in Bonding state. This was causing A2DP get connected for Car Docks, when user didn\'t select it.
Merge commit 'ccaebfc9428aa7c167caf469f7393e1fb375307e' into eclair-plus-aosp

* commit 'ccaebfc9428aa7c167caf469f7393e1fb375307e':
  Don't set priority in Bonding state.
2010-01-11 14:20:53 -08:00
Tom Taylor
752eae6149 am 1edd8277: Merge "Hide unused fields" into eclair
Merge commit '1edd8277440c83ef44e0128e86afb8c002e49b17' into eclair-plus-aosp

* commit '1edd8277440c83ef44e0128e86afb8c002e49b17':
  Hide unused fields
2010-01-11 14:15:51 -08:00
Tom Taylor
216cb739d8 Merge "Hide unused fields" into eclair 2010-01-11 14:11:46 -08:00
Trevor Johns
bd74632bcb am 50a3977c: Merge "Adding BusinessCard sample to Android.mk and to the Resources TOC on developer.android.com." into eclair
Merge commit '50a3977c619be113bb35fb7fd53874effad6dbe4' into eclair-plus-aosp

* commit '50a3977c619be113bb35fb7fd53874effad6dbe4':
  Adding BusinessCard sample to Android.mk and to the Resources TOC on developer.android.com.
2010-01-11 14:05:55 -08:00
Trevor Johns
3fb5c80eb0 Merge "Adding BusinessCard sample to Android.mk and to the Resources TOC on developer.android.com." into eclair 2010-01-11 14:00:54 -08:00
Dirk Dougherty
1d4fcc764d am 595f48b2: Merge "SDK doc change: Miscellaneous fixes." into eclair
Merge commit '595f48b2a4fa2751ad638b60d2476e77738b21da' into eclair-plus-aosp

* commit '595f48b2a4fa2751ad638b60d2476e77738b21da':
  SDK doc change: Miscellaneous fixes.
2010-01-11 11:38:04 -08:00
Dirk Dougherty
8eeeeb1ba4 Merge "SDK doc change: Miscellaneous fixes." into eclair 2010-01-11 11:33:57 -08:00
Grace Kloba
e840bede1b am a2b0d38f: First draft of multitouch in the WebView.
Merge commit 'a2b0d38f8c6311e712c32318d4ebb68e5a2fecef' into eclair-plus-aosp

* commit 'a2b0d38f8c6311e712c32318d4ebb68e5a2fecef':
  First draft of multitouch in the WebView.
2010-01-11 10:47:21 -08:00
Jack Palevich
91ea437c47 am 6d0f6c78: Merge "DO NOT MERGE A library for encoding and decoding ETC1 textures." into eclair
Merge commit '6d0f6c78037225ef5648d10e45a513a2e7c612b5' into eclair-plus-aosp

* commit '6d0f6c78037225ef5648d10e45a513a2e7c612b5':
  DO NOT MERGE A library for encoding and decoding ETC1 textures.
2010-01-09 21:54:28 -08:00
Jack Palevich
8577a7d452 Merge "DO NOT MERGE A library for encoding and decoding ETC1 textures." into eclair 2010-01-09 21:51:05 -08:00
Vasu Nori
370c36a175 am a1759cea: Merge "add eventlog message whenever sqlite reports db corruption error" into eclair
Merge commit 'a1759ceac2f56f1c83ad6d1bc38e30ece2bf99fd' into eclair-plus-aosp

* commit 'a1759ceac2f56f1c83ad6d1bc38e30ece2bf99fd':
  add eventlog message whenever sqlite reports db corruption error
2010-01-08 16:33:50 -08:00
Scott Main
86a34cbd6d am aa3b5961: javadoc change: fix the selector sample XML in the class description (was broken due to improper ordering)
Merge commit 'aa3b5961c0142fe2fe87a5e4f67a12b3728f1bea' into eclair-plus-aosp

* commit 'aa3b5961c0142fe2fe87a5e4f67a12b3728f1bea':
  javadoc change: fix the selector sample XML in the class
2010-01-08 16:33:45 -08:00
Vasu Nori
a1322cae44 Merge "add eventlog message whenever sqlite reports db corruption error" into eclair 2010-01-08 15:09:12 -08:00
Daniel Sandler
1eea5185e5 am 3fb4ee4e: Merge "Immediately close the shade when the status bar is disabled. (DO NOT MERGE)" into eclair
Merge commit '3fb4ee4e03351078ceadf3d8dd05789ae152e8dd' into eclair-plus-aosp

* commit '3fb4ee4e03351078ceadf3d8dd05789ae152e8dd':
  Immediately close the shade when the status bar is disabled. (DO NOT MERGE)
2010-01-08 12:33:17 -08:00
Daniel Sandler
8fe921768f Merge "Immediately close the shade when the status bar is disabled. (DO NOT MERGE)" into eclair 2010-01-08 12:31:03 -08:00
Eric Laurent
ac5002e716 am 663ec308: Fix issue 2361949: A2DP suspend parameters set wrongly.
Merge commit '663ec308801a34de82db9ab993f0e906da690f89' into eclair-plus-aosp

* commit '663ec308801a34de82db9ab993f0e906da690f89':
  Fix issue 2361949: A2DP suspend parameters set wrongly.
2010-01-08 12:17:08 -08:00
Jack Palevich
618c755192 DO NOT MERGE A library for encoding and decoding ETC1 textures.
The ETC1 compressed texture format is commonly
supported by OpenGL ES 2.0-capable devices.

This change adds a host-only version of the library. It is used by
the etc1tool.
2010-01-08 16:00:21 +08:00
Trevor Johns
aac9e9f3fa am 063d03ed: Converting tabs to spaces in docs/html/resources/resources_toc.cs.
Merge commit '063d03ed0882582840c7db610635aa89c1a01eec' into eclair-plus-aosp

* commit '063d03ed0882582840c7db610635aa89c1a01eec':
  Converting tabs to spaces in docs/html/resources/resources_toc.cs.
2010-01-07 18:58:35 -08:00
Dirk Dougherty
e70b5fca84 am d71c2aa1: Merge "SDK doc change: add "Optimizing Judiciously" excerpt to best practices. Clean up blockquote usage in other files." into eclair
Merge commit 'd71c2aa1a33a456b631ae539fe57f8eb5615fcd5' into eclair-plus-aosp

* commit 'd71c2aa1a33a456b631ae539fe57f8eb5615fcd5':
  SDK doc change: add "Optimizing Judiciously" excerpt to best practices. Clean up blockquote usage in other files.
2010-01-07 12:33:48 -08:00
Dirk Dougherty
8fc26bc215 Merge "SDK doc change: add "Optimizing Judiciously" excerpt to best practices. Clean up blockquote usage in other files." into eclair 2010-01-07 12:30:14 -08:00
Scott Main
5c7069a340 am d8858893: Merge "docs: fix some broken links" into eclair
Merge commit 'd88588935e3a09b4b13753d55dbe8a8e9ed240a1' into eclair-plus-aosp

* commit 'd88588935e3a09b4b13753d55dbe8a8e9ed240a1':
  docs: fix some broken links
2010-01-07 10:21:52 -08:00
Scott Main
e90d1b1f60 Merge "docs: fix some broken links" into eclair 2010-01-07 10:18:45 -08:00
Xavier Ducrohet
05cba4c4b7 am ce60d4b2: Merge "Move Layoutlib API library to sdk.git" into eclair
Merge commit 'ce60d4b27e17d98423fd339f61e8b746866f1f4e' into eclair-plus-aosp

* commit 'ce60d4b27e17d98423fd339f61e8b746866f1f4e':
  Move Layoutlib API library to sdk.git
2010-01-07 09:16:32 -08:00
Xavier Ducrohet
421b581977 Merge "Move Layoutlib API library to sdk.git" into eclair 2010-01-07 09:08:06 -08:00
Jaikumar Ganesh
ed371412fe am 0b6c6f2c: Merge "Fix media option settings for A2DP." into eclair
Merge commit '0b6c6f2cbc7490c952141cee6a662ddcdb0bae5b' into eclair-plus-aosp

* commit '0b6c6f2cbc7490c952141cee6a662ddcdb0bae5b':
  Fix media option settings for A2DP.
2010-01-06 13:46:59 -08:00
Dianne Hackborn
4dcc8cb91b am cb2d50d0: Fix issue #2357259: aapt tool prints "uses-configuation:"
Merge commit 'cb2d50d0d6e2e37ae02b014999da23ecd32038b8' into eclair-plus-aosp

* commit 'cb2d50d0d6e2e37ae02b014999da23ecd32038b8':
  Fix issue #2357259: aapt tool prints "uses-configuation:"
2010-01-06 13:46:50 -08:00
Ying Wang
ea915a14f2 am 42c98ada: Still use ro.monkey
Merge commit '42c98ada113ae5b7c72ecb6d0de721ec1d0d3534' into eclair-plus-aosp

* commit '42c98ada113ae5b7c72ecb6d0de721ec1d0d3534':
  Still use ro.monkey
2010-01-06 13:46:36 -08:00
Jaikumar Ganesh
d83e098bf9 Merge "Fix media option settings for A2DP." into eclair 2010-01-06 13:38:27 -08:00
Scott Main
030910f5d5 am c20467f9: docs: update the device dashboard
Merge commit 'c20467f94afd2ac173dcb1d27f2a8fb91816edb0' into eclair-plus-aosp

* commit 'c20467f94afd2ac173dcb1d27f2a8fb91816edb0':
  docs: update the device dashboard
2010-01-05 12:31:06 -08:00
Ying Wang
8a7567f32d am 08fa1428: Rename ro.monkey to monkey.running
Merge commit '08fa1428eed52083789dc3b366aea4873199bd37' into eclair-plus-aosp

* commit '08fa1428eed52083789dc3b366aea4873199bd37':
  Rename ro.monkey to monkey.running
2010-01-04 12:59:17 -08:00
Eric Laurent
82db677f42 am eb5ffc23: Merge change Id8e98194 into eclair
Merge commit 'eb5ffc239b6482b9c1e046f6f5872187043d852c' into eclair-plus-aosp

* commit 'eb5ffc239b6482b9c1e046f6f5872187043d852c':
  Fix issues 2333450 and 2333559:
2009-12-22 23:41:59 -08:00
Android (Google) Code Review
3b42b7e746 Merge change Id8e98194 into eclair
* changes:
  Fix issues 2333450 and 2333559:
2009-12-22 23:34:22 -08:00
Jack Palevich
f8481346c8 am e3449553: Merge change I49c9a3a3 into eclair
Merge commit 'e344955393133ac2f99f06cc6a4fe97fbf76f62e' into eclair-plus-aosp

* commit 'e344955393133ac2f99f06cc6a4fe97fbf76f62e':
  Fix bug 2325244	screen turns black for a brief period of time
2009-12-22 18:31:58 -08:00
Android (Google) Code Review
0f0cdb40ab Merge change I49c9a3a3 into eclair
* changes:
  Fix bug 2325244	screen turns black for a brief period of time
2009-12-22 18:29:29 -08:00
Eric Laurent
bf41fc2be7 am d20a55af: Merge change Iccfa50fe into eclair
Merge commit 'd20a55af8215dff59f61f91ea89dbcbfc08836de' into eclair-plus-aosp

* commit 'd20a55af8215dff59f61f91ea89dbcbfc08836de':
  Fix issue 2323920: Notification & A2DP audio stutter.
2009-12-22 09:57:56 -08:00
Android (Google) Code Review
b1af3771c1 Merge change Iccfa50fe into eclair
* changes:
  Fix issue 2323920: Notification & A2DP audio stutter.
2009-12-22 09:50:42 -08:00
Eric Laurent
7e2aad1e27 Fix issue 2323920: Notification & A2DP audio stutter.
Modified AudioFlinger duplicating output thread so that audio tracks are not mixed until both outputs (A2DP and hardware) have exited standby mode. This avoids to have one output far ahead of the other and audio frames dropped because the compensation mechanism cannot keep up.
Also calculate the maximum wait time in OutputTrack::write() based the on smallest frame count of all output threads instead of the frame count of the thread the OutputTrack is connected to. This avoids starving the thread with the smallest frame count by waiting too long on the other thread.
Since the frame count was reduced on hardware output to reduce latency the difference between A2DP and hardware outputs frame counts had become problematic.
Also increased the number of overflow buffers to cope with bigger timing differences among outputs.
2009-12-22 09:06:46 -08:00
Jean-Baptiste Queru
78ffea7ef4 merge from open-source master 2009-12-21 15:32:25 -08:00
Android Code Review
97c7a443b7 Merge change I700e6d4d
* changes:
  Time.parse3339 range checking and proper 'sec-frac' skip
2009-12-21 15:14:02 -08:00
Jaikumar Ganesh
c85e5ac857 am 11b97c50: Merge change I551ed729 into eclair
Merge commit '11b97c50e6fb6d723e88eac3c125b60ca42184f7' into eclair-plus-aosp

* commit '11b97c50e6fb6d723e88eac3c125b60ca42184f7':
  Use UNDEFINED priorities when unpaired.
2009-12-21 14:19:50 -08:00
Jaikumar Ganesh
d9f1241527 am 87ed10d7: Merge change I577dd1f3 into eclair
Merge commit '87ed10d78d290f48d382a6e628241da0c61cfb45' into eclair-plus-aosp

* commit '87ed10d78d290f48d382a6e628241da0c61cfb45':
  Accept incoming connections if no other sink is in NonDisconnecting state.
2009-12-21 14:19:43 -08:00
Android (Google) Code Review
fb4fa224ae Merge change I551ed729 into eclair
* changes:
  Use UNDEFINED priorities when unpaired.
2009-12-21 14:17:15 -08:00
Android (Google) Code Review
87793027d4 Merge change I577dd1f3 into eclair
* changes:
  Accept incoming connections if no other sink is in NonDisconnecting state.
2009-12-21 14:16:44 -08:00
Scott Main
6698344e3d am 74962e56: upload new dev site robots.txt to disallow old tutorial and samples directories (while old pages are still orphaned) and upload new sitemap including new resources pages.
Merge commit '74962e56c5d625fe94a6bfc9cf1acd361382f0b6' into eclair-plus-aosp

* commit '74962e56c5d625fe94a6bfc9cf1acd361382f0b6':
  upload new dev site robots.txt to disallow old tutorial and
2009-12-21 13:46:28 -08:00
Scott Main
d4a56ac92e am e4c2a376: Merge change I2703edac into eclair
Merge commit 'e4c2a37624612c9708d0767f8643a10502e6887a' into eclair-plus-aosp

* commit 'e4c2a37624612c9708d0767f8643a10502e6887a':
  docs: add new device features for the uses-feature
2009-12-19 12:33:00 -08:00
Android (Google) Code Review
c717b34fa1 Merge change I2703edac into eclair
* changes:
  docs: add new device features for the uses-feature manifest element and edit some other pieces.
2009-12-19 12:30:15 -08:00
Scott Main
a12298e6f1 am 77fa05a4: Merge change Iab5952e1 into eclair
Merge commit '77fa05a43d3f3f967311d6806fe743017950cf92' into eclair-plus-aosp

* commit '77fa05a43d3f3f967311d6806fe743017950cf92':
  docs: add "required" attribute to the <uses-feature> docs
2009-12-19 00:39:26 -08:00
Android (Google) Code Review
4821a83057 Merge change Iab5952e1 into eclair
* changes:
  docs: add "required" attribute to the <uses-feature> docs and add a note to the CAMERA permission stating that it enables the <uses-feature> for camera. This is an incrimental update for the 2.0.1 docs. More changes to come for the 2.1 docs to include more features
2009-12-19 00:36:48 -08:00