OSDN Git Service
Scott Main [Thu, 14 Jan 2010 21:05:46 +0000 (13:05 -0800)]
am
0409b1ba: Merge "docs: remove dev guide link from download confirmation content so we only link to the install guide and re-affirm the system reqs bug:
2374363,
2374334" into eclair
Merge commit '
0409b1baaaebfe5deadfd43559e5d63b1d6e5fcb' into eclair-plus-aosp
* commit '
0409b1baaaebfe5deadfd43559e5d63b1d6e5fcb':
docs: remove dev guide link from download confirmation content
Scott Main [Thu, 14 Jan 2010 21:01:30 +0000 (13:01 -0800)]
Merge "docs: remove dev guide link from download confirmation content so we only link to the install guide and re-affirm the system reqs bug:
2374363,
2374334" into eclair
Scott Main [Thu, 14 Jan 2010 20:03:23 +0000 (12:03 -0800)]
docs: remove dev guide link from download confirmation content
so we only link to the install guide and re-affirm the system reqs
bug:
2374363,
2374334
Xavier Ducrohet [Thu, 14 Jan 2010 19:36:50 +0000 (11:36 -0800)]
am
5e083024: ADT/Layoutlib: shader clean-up.
Merge commit '
5e083024269e7c5bf904301a98fa6eade6fec094' into eclair-plus-aosp
* commit '
5e083024269e7c5bf904301a98fa6eade6fec094':
ADT/Layoutlib: shader clean-up.
Xavier Ducrohet [Thu, 14 Jan 2010 18:30:16 +0000 (10:30 -0800)]
ADT/Layoutlib: shader clean-up.
Change-Id: I0a200f438b7ccde2bfc19fd23614a647cb19d312
Xavier Ducrohet [Thu, 14 Jan 2010 18:08:37 +0000 (10:08 -0800)]
am
d3026e16: Merge "ADT/Layoutlib: 2 color, linear gradient support." into eclair
Merge commit '
d3026e1618d893db55c2131d66b08bc4a6e7aaf4' into eclair-plus-aosp
* commit '
d3026e1618d893db55c2131d66b08bc4a6e7aaf4':
ADT/Layoutlib: 2 color, linear gradient support.
Xavier Ducrohet [Thu, 14 Jan 2010 18:03:56 +0000 (10:03 -0800)]
Merge "ADT/Layoutlib: 2 color, linear gradient support." into eclair
Grace Kloba [Thu, 14 Jan 2010 17:41:36 +0000 (09:41 -0800)]
am
196926b9: Merge "DO NOT MERGE" into eclair
Merge commit '
196926b9803e586b06b753a0a02a6b0ba2e5a98c' into eclair-plus-aosp
* commit '
196926b9803e586b06b753a0a02a6b0ba2e5a98c':
DO NOT MERGE
Grace Kloba [Thu, 14 Jan 2010 17:29:52 +0000 (09:29 -0800)]
Merge "DO NOT MERGE" into eclair
Grace Kloba [Thu, 14 Jan 2010 02:02:09 +0000 (18:02 -0800)]
DO NOT MERGE
Use the common ScaleGestureDetector to detect the
multi-touch motion.
Check both supportZoom and getBuiltInZoomControls
to decide whether enable the multi-touch behavior.
This should the new pinch behavior only replace the
old +/-.
Fix http://b/issue?id=
2363260
Only update textWrapScale if it is different. This
should fix the performance decrease caused by initial
multi-touch code.
Fix http://b/issue?id=
2371694
Xavier Ducrohet [Thu, 14 Jan 2010 04:30:26 +0000 (20:30 -0800)]
ADT/Layoutlib: 2 color, linear gradient support.
Change-Id: Ifaafa4fc42a22f4851449a7c35a5b82e211aafe7
Xavier Ducrohet [Thu, 14 Jan 2010 03:17:07 +0000 (19:17 -0800)]
am
f73bd14a: Merge "ADT/Layoutlib: implement Canvas.concat(Matrix)" into eclair
Merge commit '
f73bd14a8d5932b34a0e6e4d2de78b74705276b8' into eclair-plus-aosp
* commit '
f73bd14a8d5932b34a0e6e4d2de78b74705276b8':
ADT/Layoutlib: implement Canvas.concat(Matrix)
Xavier Ducrohet [Thu, 14 Jan 2010 03:14:28 +0000 (19:14 -0800)]
Merge "ADT/Layoutlib: implement Canvas.concat(Matrix)" into eclair
Xavier Ducrohet [Thu, 14 Jan 2010 02:06:00 +0000 (18:06 -0800)]
ADT/Layoutlib: implement Canvas.concat(Matrix)
This prevented ImageView from making proper use of ScaleType.
Also fixed Canvas.getSaveCount() that returned the wrong
value and Matrix.getTransform() which used the wrong order
for the AffineTransform constructor!!
Bug:
2364564
Change-Id: I78babf4aa6689440e52ad06b1473f75b20eb66da
Adam Powell [Thu, 14 Jan 2010 02:04:39 +0000 (18:04 -0800)]
am
56a17690: Merge "TransformGestureDetector is now ScaleGestureDetector - scope reduced. N1 screen can\'t reliably handle translation and scaling at the same time." into eclair
Merge commit '
56a17690b0b9dc2a2e15ef38a37cc4c403c614fe' into eclair-plus-aosp
* commit '
56a17690b0b9dc2a2e15ef38a37cc4c403c614fe':
TransformGestureDetector is now ScaleGestureDetector - scope reduced.
Adam Powell [Thu, 14 Jan 2010 02:00:35 +0000 (18:00 -0800)]
Merge "TransformGestureDetector is now ScaleGestureDetector - scope reduced. N1 screen can't reliably handle translation and scaling at the same time." into eclair
Xavier Ducrohet [Thu, 14 Jan 2010 01:09:52 +0000 (17:09 -0800)]
am
ae4bd059: ADT/Layoutlib: Reimplement parts of BitmapFactory
Merge commit '
ae4bd059caa71aa4652c0f07fde7c2687169906e' into eclair-plus-aosp
* commit '
ae4bd059caa71aa4652c0f07fde7c2687169906e':
ADT/Layoutlib: Reimplement parts of BitmapFactory
Robert Greenwalt [Thu, 14 Jan 2010 01:09:40 +0000 (17:09 -0800)]
am
1193ae4e: Backport l53e91db7 from master.
Merge commit '
1193ae4e824c66b75083c444ce0f250594e138ee' into eclair-plus-aosp
* commit '
1193ae4e824c66b75083c444ce0f250594e138ee':
Backport l53e91db7 from master.
Adam Powell [Thu, 14 Jan 2010 00:29:27 +0000 (16:29 -0800)]
TransformGestureDetector is now ScaleGestureDetector - scope reduced.
N1 screen can't reliably handle translation and scaling at the same time.
Xavier Ducrohet [Thu, 14 Jan 2010 00:43:07 +0000 (16:43 -0800)]
ADT/Layoutlib: Reimplement parts of BitmapFactory
The original bitmap factory is mostly done in native and deals
with the normal android Bitmap class which has been replaced
in the layoutlib by a bitmap that is merely a wrapper around
an AWT BufferedImage.
This new BitmapFactory creates the layoutlib version of
Bitmap all in Java.
Change-Id: Ice8b5d19141a9a43f83349c159201bf85604b3b0
Robert Greenwalt [Wed, 13 Jan 2010 17:36:31 +0000 (09:36 -0800)]
Backport l53e91db7 from master.
Prevents sending out ConnectivityManager broadcasts when the connection
is repeating the same major state. This means continued wifi scanning
does not generate CM broadcasts (though wifi state broadcasts continue).
bug:
2265222
Dr No approval: jsh
Ying Wang [Wed, 13 Jan 2010 00:34:13 +0000 (16:34 -0800)]
am
a1d08886: Merge "Only output proguard keep for nonempty attribute name in the AndroidManifest.xml." into eclair
Merge commit '
a1d08886ec8549878ad16c19754a3239706fb61b' into eclair-plus-aosp
* commit '
a1d08886ec8549878ad16c19754a3239706fb61b':
Only output proguard keep for nonempty attribute name in the AndroidManifest.xml.
Ying Wang [Wed, 13 Jan 2010 00:31:14 +0000 (16:31 -0800)]
Merge "Only output proguard keep for nonempty attribute name in the AndroidManifest.xml." into eclair
Ying Wang [Wed, 13 Jan 2010 00:08:23 +0000 (16:08 -0800)]
Only output proguard keep for nonempty attribute name in the AndroidManifest.xml.
Before this change, aapt generates proguard keep flags like
"-keep class com.android.somepackage.", which proguard doesn't recognize.
Adam Powell [Tue, 12 Jan 2010 23:15:43 +0000 (15:15 -0800)]
am
8acdb201: Added TransformGestureDetector (still in progress) Modified VelocityTracker to track multiple pointers Added TransformTest
Merge commit '
8acdb201bdad2cd03c07ebad9cda29f7971ed164' into eclair-plus-aosp
* commit '
8acdb201bdad2cd03c07ebad9cda29f7971ed164':
Added TransformGestureDetector (still in progress)
Adam Powell [Thu, 7 Jan 2010 01:33:52 +0000 (17:33 -0800)]
Added TransformGestureDetector (still in progress)
Modified VelocityTracker to track multiple pointers
Added TransformTest
Grace Kloba [Tue, 12 Jan 2010 18:02:48 +0000 (10:02 -0800)]
am
ce63c639: Merge "DO NOT MERGE." into eclair
Merge commit '
ce63c639e90daafc3382020bb2d9e2b17350f1f0' into eclair-plus-aosp
* commit '
ce63c639e90daafc3382020bb2d9e2b17350f1f0':
DO NOT MERGE.
San Mehat [Tue, 12 Jan 2010 18:02:40 +0000 (10:02 -0800)]
am
c93c70c4: Merge "framework: storage: Ensure that filesystems are unmounted before shutdown/reboot" into eclair
Merge commit '
c93c70c4b849d31ff1b5e5cf2fb9462fd60e5da0' into eclair-plus-aosp
* commit '
c93c70c4b849d31ff1b5e5cf2fb9462fd60e5da0':
framework: storage: Ensure that filesystems are unmounted before shutdown/reboot
Grace Kloba [Tue, 12 Jan 2010 18:00:03 +0000 (10:00 -0800)]
Merge "DO NOT MERGE." into eclair
San Mehat [Tue, 12 Jan 2010 17:59:35 +0000 (09:59 -0800)]
Merge "framework: storage: Ensure that filesystems are unmounted before shutdown/reboot" into eclair
Grace Kloba [Tue, 12 Jan 2010 01:28:01 +0000 (17:28 -0800)]
DO NOT MERGE.
Couple of tweak for multi-touch in WebView.
1. If we can't zoom, don't get in multitouch mode.
This avoid the logo in google.com looks fuzzy.
2. Reset mAnchor after sending VIEW_SIZE_CHANGED.
3. Don't call zoom when finishing multitouch unless
zoom is called before.
4. Change the width for nativeSetSize, which was modified
in the last check-in. The new logic should make both
msn.com and news.google.com looks correct.
5. Use the pressure instead of distance/time to filter
out the jitter just before lifting the finger.
Fix http://b/issue?id=
2360032
San Mehat [Tue, 12 Jan 2010 15:57:42 +0000 (07:57 -0800)]
framework: storage: Ensure that filesystems are unmounted before shutdown/reboot
Signed-off-by: San Mehat <san@google.com>
Xavier Ducrohet [Mon, 11 Jan 2010 23:28:07 +0000 (15:28 -0800)]
am
dfe25b0e: Merge "LayoutLib: support for custom styles." into eclair
Merge commit '
dfe25b0e0c382d04a59bb03c7f5f8689ece5395e' into eclair-plus-aosp
* commit '
dfe25b0e0c382d04a59bb03c7f5f8689ece5395e':
LayoutLib: support for custom styles.
Xavier Ducrohet [Mon, 11 Jan 2010 23:25:16 +0000 (15:25 -0800)]
Merge "LayoutLib: support for custom styles." into eclair
Xavier Ducrohet [Mon, 11 Jan 2010 22:28:03 +0000 (14:28 -0800)]
LayoutLib: support for custom styles.
Change-Id: Ic6c2ef234589f45db15024261d698066aa6e2f4e
Jaikumar Ganesh [Mon, 11 Jan 2010 22:20:53 +0000 (14:20 -0800)]
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.
Jaikumar Ganesh [Sat, 9 Jan 2010 02:26:14 +0000 (18:26 -0800)]
Don't set priority in Bonding state.
This was causing A2DP get connected for Car Docks, when user didn't select it.
Bug:
2364328
Dr No: Eastham
Tom Taylor [Mon, 11 Jan 2010 22:15:51 +0000 (14:15 -0800)]
am
1edd8277: Merge "Hide unused fields" into eclair
Merge commit '
1edd8277440c83ef44e0128e86afb8c002e49b17' into eclair-plus-aosp
* commit '
1edd8277440c83ef44e0128e86afb8c002e49b17':
Hide unused fields
Tom Taylor [Mon, 11 Jan 2010 22:11:46 +0000 (14:11 -0800)]
Merge "Hide unused fields" into eclair
Trevor Johns [Mon, 11 Jan 2010 22:05:55 +0000 (14:05 -0800)]
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.
Trevor Johns [Mon, 11 Jan 2010 22:00:54 +0000 (14:00 -0800)]
Merge "Adding BusinessCard sample to Android.mk and to the Resources TOC on developer.android.com." into eclair
Trevor Johns [Fri, 8 Jan 2010 00:26:39 +0000 (16:26 -0800)]
Adding BusinessCard sample to Android.mk and to the Resources TOC on developer.android.com.
Dirk Dougherty [Mon, 11 Jan 2010 19:38:04 +0000 (11:38 -0800)]
am
595f48b2: Merge "SDK doc change: Miscellaneous fixes." into eclair
Merge commit '
595f48b2a4fa2751ad638b60d2476e77738b21da' into eclair-plus-aosp
* commit '
595f48b2a4fa2751ad638b60d2476e77738b21da':
SDK doc change: Miscellaneous fixes.
Dirk Dougherty [Mon, 11 Jan 2010 19:33:57 +0000 (11:33 -0800)]
Merge "SDK doc change: Miscellaneous fixes." into eclair
Dirk Dougherty [Thu, 7 Jan 2010 18:48:19 +0000 (10:48 -0800)]
SDK doc change: Miscellaneous fixes.
Bug:
2160782
Change-Id: I5f1e449bcb2c8f715858b6819f041349088a8a32
Grace Kloba [Mon, 11 Jan 2010 18:47:21 +0000 (10:47 -0800)]
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.
Grace Kloba [Wed, 6 Jan 2010 23:49:29 +0000 (15:49 -0800)]
First draft of multitouch in the WebView.
Currently we just handle a simple pinch action. We
will wait for framework support for more complicated
gesture.
When pinch in the webview, zoom level will be changed
on the fly. But we won't re-wrap the text until user
action like double tap, rotate screen.
Double tap will re-layout the page and wrap the text
to the screen width. We try to keep the spot you
tapped at the same place on the screen after relayout.
If the block after relayout fully fit on the current
screen, we will center it for easy reading.
Fix http://b/issue?id=
2360032
Jack Palevich [Sun, 10 Jan 2010 05:54:28 +0000 (21:54 -0800)]
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.
Jack Palevich [Sun, 10 Jan 2010 05:51:05 +0000 (21:51 -0800)]
Merge "DO NOT MERGE A library for encoding and decoding ETC1 textures." into eclair
Vasu Nori [Sat, 9 Jan 2010 00:33:50 +0000 (16:33 -0800)]
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
Scott Main [Sat, 9 Jan 2010 00:33:45 +0000 (16:33 -0800)]
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
Vasu Nori [Fri, 8 Jan 2010 23:09:12 +0000 (15:09 -0800)]
Merge "add eventlog message whenever sqlite reports db corruption error" into eclair
Scott Main [Fri, 8 Jan 2010 20:21:00 +0000 (12:21 -0800)]
javadoc change: fix the selector sample XML in the class
description (was broken due to improper ordering)
Daniel Sandler [Fri, 8 Jan 2010 20:33:17 +0000 (12:33 -0800)]
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)
Daniel Sandler [Fri, 8 Jan 2010 20:31:03 +0000 (12:31 -0800)]
Merge "Immediately close the shade when the status bar is disabled. (DO NOT MERGE)" into eclair
Eric Laurent [Fri, 8 Jan 2010 20:17:08 +0000 (12:17 -0800)]
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.
Vasu Nori [Fri, 8 Jan 2010 18:11:24 +0000 (10:11 -0800)]
add eventlog message whenever sqlite reports db corruption error
Eric Laurent [Fri, 8 Jan 2010 15:55:33 +0000 (07:55 -0800)]
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.
Jack Palevich [Fri, 8 Jan 2010 08:00:21 +0000 (16:00 +0800)]
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.
Trevor Johns [Fri, 8 Jan 2010 02:58:35 +0000 (18:58 -0800)]
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.
Trevor Johns [Thu, 7 Jan 2010 23:44:33 +0000 (15:44 -0800)]
Converting tabs to spaces in docs/html/resources/resources_toc.cs.
Dirk Dougherty [Thu, 7 Jan 2010 20:33:48 +0000 (12:33 -0800)]
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.
Dirk Dougherty [Thu, 7 Jan 2010 20:30:14 +0000 (12:30 -0800)]
Merge "SDK doc change: add "Optimizing Judiciously" excerpt to best practices. Clean up blockquote usage in other files." into eclair
Dirk Dougherty [Wed, 6 Jan 2010 01:03:39 +0000 (17:03 -0800)]
SDK doc change: add "Optimizing Judiciously" excerpt to best practices. Clean up blockquote usage in other files.
Bug:
2160782
Change-Id: I537194ecddc53d4f0e8456ce958ae8db6f521593
Scott Main [Thu, 7 Jan 2010 18:21:52 +0000 (10:21 -0800)]
am
d8858893: Merge "docs: fix some broken links" into eclair
Merge commit '
d88588935e3a09b4b13753d55dbe8a8e9ed240a1' into eclair-plus-aosp
* commit '
d88588935e3a09b4b13753d55dbe8a8e9ed240a1':
docs: fix some broken links
Scott Main [Thu, 7 Jan 2010 18:18:45 +0000 (10:18 -0800)]
Merge "docs: fix some broken links" into eclair
Xavier Ducrohet [Thu, 7 Jan 2010 17:16:32 +0000 (09:16 -0800)]
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
Xavier Ducrohet [Thu, 7 Jan 2010 17:08:06 +0000 (09:08 -0800)]
Merge "Move Layoutlib API library to sdk.git" into eclair
Xavier Ducrohet [Thu, 7 Jan 2010 16:30:16 +0000 (08:30 -0800)]
Move Layoutlib API library to sdk.git
Change-Id: I53f1c5d52447b6215ae7a6f2f1f82d0879e952ca
Jaikumar Ganesh [Wed, 6 Jan 2010 21:46:59 +0000 (13:46 -0800)]
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.
Dianne Hackborn [Wed, 6 Jan 2010 21:46:50 +0000 (13:46 -0800)]
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:"
Ying Wang [Wed, 6 Jan 2010 21:46:36 +0000 (13:46 -0800)]
am
42c98ada: Still use ro.monkey
Merge commit '
42c98ada113ae5b7c72ecb6d0de721ec1d0d3534' into eclair-plus-aosp
* commit '
42c98ada113ae5b7c72ecb6d0de721ec1d0d3534':
Still use ro.monkey
Jaikumar Ganesh [Wed, 6 Jan 2010 21:38:27 +0000 (13:38 -0800)]
Merge "Fix media option settings for A2DP." into eclair
Jaikumar Ganesh [Wed, 6 Jan 2010 19:41:41 +0000 (11:41 -0800)]
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
Dianne Hackborn [Wed, 6 Jan 2010 19:29:54 +0000 (11:29 -0800)]
Fix issue #
2357259: aapt tool prints "uses-configuation:"
Change-Id: Id3ea3a86bd4d385441b05fcbe85b8ab62c35afff
Ying Wang [Tue, 5 Jan 2010 02:51:25 +0000 (18:51 -0800)]
Still use ro.monkey
http://b/issue?id=
1681101
Tom Taylor [Wed, 6 Jan 2010 00:25:53 +0000 (16:25 -0800)]
Hide unused fields
When ContactHeaderWidget.bindFromPhoneNumber is called with a number
that's not in contacts, onQueryComplete takes a path that doesn't hide
fields that don't apply to the current phone number. As a result, the
user sees the new number, but old data from the previous display (such
as the facebook status). With this change, those fields are hidden.
Fixes bug
2336977.
Change-Id: Ib6253c18dc58c3d28b463c87d5d195a84d613600
Scott Main [Tue, 5 Jan 2010 20:31:06 +0000 (12:31 -0800)]
am
c20467f9: docs: update the device dashboard
Merge commit '
c20467f94afd2ac173dcb1d27f2a8fb91816edb0' into eclair-plus-aosp
* commit '
c20467f94afd2ac173dcb1d27f2a8fb91816edb0':
docs: update the device dashboard
Scott Main [Tue, 5 Jan 2010 18:46:44 +0000 (10:46 -0800)]
docs: update the device dashboard
Ying Wang [Mon, 4 Jan 2010 20:59:17 +0000 (12:59 -0800)]
am
08fa1428: Rename ro.monkey to monkey.running
Merge commit '
08fa1428eed52083789dc3b366aea4873199bd37' into eclair-plus-aosp
* commit '
08fa1428eed52083789dc3b366aea4873199bd37':
Rename ro.monkey to monkey.running
Ying Wang [Mon, 4 Jan 2010 19:56:24 +0000 (11:56 -0800)]
Rename ro.monkey to monkey.running
So that Monkey can set ro.mokey before running and reset it after running.
Daniel Sandler [Wed, 23 Dec 2009 20:47:18 +0000 (14:47 -0600)]
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
Eric Laurent [Wed, 23 Dec 2009 07:41:59 +0000 (23:41 -0800)]
am
eb5ffc23: Merge change Id8e98194 into eclair
Merge commit '
eb5ffc239b6482b9c1e046f6f5872187043d852c' into eclair-plus-aosp
* commit '
eb5ffc239b6482b9c1e046f6f5872187043d852c':
Fix issues
2333450 and
2333559:
Android (Google) Code Review [Wed, 23 Dec 2009 07:34:22 +0000 (23:34 -0800)]
Merge change Id8e98194 into eclair
* changes:
Fix issues
2333450 and
2333559:
Jack Palevich [Wed, 23 Dec 2009 02:31:58 +0000 (18:31 -0800)]
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
Android (Google) Code Review [Wed, 23 Dec 2009 02:29:29 +0000 (18:29 -0800)]
Merge change I49c9a3a3 into eclair
* changes:
Fix bug
2325244 screen turns black for a brief period of time
Eric Laurent [Thu, 17 Dec 2009 11:12:59 +0000 (03:12 -0800)]
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.
Eric Laurent [Tue, 22 Dec 2009 17:57:56 +0000 (09:57 -0800)]
am
d20a55af: Merge change Iccfa50fe into eclair
Merge commit '
d20a55af8215dff59f61f91ea89dbcbfc08836de' into eclair-plus-aosp
* commit '
d20a55af8215dff59f61f91ea89dbcbfc08836de':
Fix issue
2323920: Notification & A2DP audio stutter.
Android (Google) Code Review [Tue, 22 Dec 2009 17:50:42 +0000 (09:50 -0800)]
Merge change Iccfa50fe into eclair
* changes:
Fix issue
2323920: Notification & A2DP audio stutter.
Eric Laurent [Fri, 18 Dec 2009 13:47:48 +0000 (05:47 -0800)]
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.
Jack Palevich [Mon, 21 Dec 2009 06:47:35 +0000 (14:47 +0800)]
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.
Jean-Baptiste Queru [Mon, 21 Dec 2009 23:32:25 +0000 (15:32 -0800)]
merge from open-source master
Android Code Review [Mon, 21 Dec 2009 23:14:02 +0000 (15:14 -0800)]
Merge change I700e6d4d
* changes:
Time.parse3339 range checking and proper 'sec-frac' skip
Jaikumar Ganesh [Mon, 21 Dec 2009 22:19:50 +0000 (14:19 -0800)]
am
11b97c50: Merge change I551ed729 into eclair
Merge commit '
11b97c50e6fb6d723e88eac3c125b60ca42184f7' into eclair-plus-aosp
* commit '
11b97c50e6fb6d723e88eac3c125b60ca42184f7':
Use UNDEFINED priorities when unpaired.
Jaikumar Ganesh [Mon, 21 Dec 2009 22:19:43 +0000 (14:19 -0800)]
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.
Android (Google) Code Review [Mon, 21 Dec 2009 22:17:15 +0000 (14:17 -0800)]
Merge change I551ed729 into eclair
* changes:
Use UNDEFINED priorities when unpaired.
Android (Google) Code Review [Mon, 21 Dec 2009 22:16:44 +0000 (14:16 -0800)]
Merge change I577dd1f3 into eclair
* changes:
Accept incoming connections if no other sink is in NonDisconnecting state.
Scott Main [Mon, 21 Dec 2009 21:46:28 +0000 (13:46 -0800)]
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
Scott Main [Mon, 21 Dec 2009 19:53:00 +0000 (11:53 -0800)]
docs: fix some broken links
Scott Main [Mon, 21 Dec 2009 19:32:22 +0000 (11:32 -0800)]
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.