Commit Graph

11791 Commits

Author SHA1 Message Date
Jack Palevich
90ce68a99f 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
6d0f6c7803 Merge "DO NOT MERGE A library for encoding and decoding ETC1 textures." into eclair 2010-01-09 21:51:05 -08:00
Vasu Nori
9c74295fb1 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
c9a26f291b 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
a1759ceac2 Merge "add eventlog message whenever sqlite reports db corruption error" into eclair 2010-01-08 15:09:12 -08:00
Scott Main
aa3b5961c0 javadoc change: fix the selector sample XML in the class
description (was broken due to improper ordering)
2010-01-08 12:35:11 -08:00
Daniel Sandler
cffea95e1e 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
3fb4ee4e03 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
d31d7397ba 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
Vasu Nori
dd1b39be1e add eventlog message whenever sqlite reports db corruption error 2010-01-08 10:11:24 -08:00
Eric Laurent
663ec30880 Fix issue 2361949: A2DP suspend parameters set wrongly.
Move reset of A2DP suspend state from handleSinkStateChange() in BluetoothA2dpService to
BluetoothA2dp.ACTION_SINK_STATE_CHANGED intent receiver in AudioService.
Previous implementation could cause a false reset of suspend state if a new sink attempted to
connect while A2DP was suspended.
New implementation only resets A2DP suspend state when a new sink is actually connected.
2010-01-08 08:48:18 -08:00
Jack Palevich
994cd7959d 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
f6de904a3c 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
Trevor Johns
063d03ed08 Converting tabs to spaces in docs/html/resources/resources_toc.cs. 2010-01-07 15:44:33 -08:00
Dirk Dougherty
5f6002ec5f 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
d71c2aa1a3 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
Dirk Dougherty
4e7db25687 SDK doc change: add "Optimizing Judiciously" excerpt to best practices. Clean up blockquote usage in other files.
Bug: 2160782
Change-Id: I537194ecddc53d4f0e8456ce958ae8db6f521593
2010-01-07 12:05:01 -08:00
Scott Main
707ca41d1f 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
d88588935e Merge "docs: fix some broken links" into eclair 2010-01-07 10:18:45 -08:00
Xavier Ducrohet
de0ef18151 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
ce60d4b27e Merge "Move Layoutlib API library to sdk.git" into eclair 2010-01-07 09:08:06 -08:00
Xavier Ducrohet
82935938fa Move Layoutlib API library to sdk.git
Change-Id: I53f1c5d52447b6215ae7a6f2f1f82d0879e952ca
2010-01-07 08:57:32 -08:00
Jaikumar Ganesh
2790b20c53 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
ce56857ef7 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
80410b55f1 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
0b6c6f2cbc Merge "Fix media option settings for A2DP." into eclair 2010-01-06 13:38:27 -08:00
Jaikumar Ganesh
6309689e6c Fix media option settings for A2DP.
Incoming connections move the A2DP state to Connecting
before getting authorized, which messes up the priorities.

Dr No: Eastham
Bug: 2358414
2010-01-06 11:43:10 -08:00
Dianne Hackborn
cb2d50d0d6 Fix issue #2357259: aapt tool prints "uses-configuation:"
Change-Id: Id3ea3a86bd4d385441b05fcbe85b8ab62c35afff
2010-01-06 11:29:54 -08:00
Ying Wang
42c98ada11 Still use ro.monkey
http://b/issue?id=1681101
2010-01-06 09:52:57 -08:00
Scott Main
95eeedfe8d 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
Scott Main
c20467f94a docs: update the device dashboard 2010-01-05 10:46:44 -08:00
Ying Wang
5c529a0cb5 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
Ying Wang
08fa1428ee Rename ro.monkey to monkey.running
So that Monkey can set ro.mokey before running and reset it after running.
2010-01-04 11:56:24 -08:00
Daniel Sandler
5808317af8 Immediately close the shade when the status bar is disabled. (DO NOT MERGE)
This provides a quick fix for http://b/2298803 (if the
in-call UI comes up while the user is holding the
windowshade, the shade sticks in place and the display
becomes unresponsive).

Merged from master (I92a824fe).

TODO: safely restore code to animate the shade closed rather
than simply causing it to disappear.

Change-Id: I53dc76fdfe86636f30f37a223a88d27a5766d3eb
2009-12-27 14:08:51 -05:00
Eric Laurent
f31f365a77 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
eb5ffc239b Merge change Id8e98194 into eclair
* changes:
  Fix issues 2333450 and 2333559:
2009-12-22 23:34:22 -08:00
Jack Palevich
244cc72fdf 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
e344955393 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
eb14a783be Fix issues 2333450 and 2333559:
Add new config values to AudioSystem::FOR_DOCK force usage to differenciate car and desk docks.
Use a receiver for the sticky Intent.ACTION_DOCK_EVENT in AudioService to detect the type
of dock and select force usage accordingly.
2009-12-22 16:20:46 -08:00
Eric Laurent
0c5cc224b0 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
d20a55af82 Merge change Iccfa50fe into eclair
* changes:
  Fix issue 2323920: Notification & A2DP audio stutter.
2009-12-22 09:50:42 -08:00
Eric Laurent
8ac9f8d1c7 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
Jack Palevich
49c9a3a3d4 Fix bug 2325244 screen turns black for a brief period of time
The problem was a black first frame when creating a surface, or a
garbage frame when the surface was resized.

The cause was lack of synchronization between the render thread and the
UI thread. The UI thread would typically return before the render thread
had a chance to draw its first frame.

The fix was to make the UI thread wait until at least one frame had been
rendered by the rendering thread.

The waiting is done in the surfaceChanged method because we know
that surfaceChanged will be called in both the surface created
and surface changed cases.
2009-12-22 11:45:31 +08:00
Jean-Baptiste Queru
c4978805dc merge from open-source master 2009-12-21 15:32:25 -08:00
Android Code Review
f8e104135b Merge change I700e6d4d
* changes:
  Time.parse3339 range checking and proper 'sec-frac' skip
2009-12-21 15:14:02 -08:00
Jaikumar Ganesh
f5d2eec4fd 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
1aa2559797 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
11b97c50e6 Merge change I551ed729 into eclair
* changes:
  Use UNDEFINED priorities when unpaired.
2009-12-21 14:17:15 -08:00
Android (Google) Code Review
87ed10d78d 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
186b94fe60 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