git.osdn.net Git - android-x86/frameworks-native.git/log

Christopher Tate [Fri, 4 Dec 2009 20:56:40 +0000 (12:56 -0800)]

am ed6dd2e6: am d3bc1994: Merge change I397b6a93 into eclair

Merge commit 'ed6dd2e6a5921044ba841f17627d7a8cd444171a' into eclair-mr2-plus-aosp

* commit 'ed6dd2e6a5921044ba841f17627d7a8cd444171a':
Don't accidentally signal multiple exceptions in setThreadPriority()

commit | commitdiff | tree

Christopher Tate [Fri, 4 Dec 2009 20:54:36 +0000 (12:54 -0800)]

am d3bc1994: Merge change I397b6a93 into eclair

Merge commit 'd3bc1994b0c2c5e9c60fa748de47eebbe1984fda' into eclair-mr2

* commit 'd3bc1994b0c2c5e9c60fa748de47eebbe1984fda':
Don't accidentally signal multiple exceptions in setThreadPriority()

commit | commitdiff | tree

Android (Google) Code Review [Fri, 4 Dec 2009 20:51:44 +0000 (12:51 -0800)]

Merge change I397b6a93 into eclair

* changes:
Don't accidentally signal multiple exceptions in setThreadPriority()

commit | commitdiff | tree

Doug Zongker [Fri, 4 Dec 2009 20:02:09 +0000 (12:02 -0800)]

am 48476b0a: Merge change Iab5c49c7 into eclair-mr2

Merge commit '48476b0ade7594a64612db2b867792737193b2ec' into eclair-mr2-plus-aosp

* commit '48476b0ade7594a64612db2b867792737193b2ec':
move event log tags used by system server into this package

am 8a576620: am 052d9c8b: Images.Media.DATE_TAKEN should be in milliseconds. b/2297371

Merge commit '8a576620cdc7257fc026026c77f7c946bfb760d1' into eclair-mr2-plus-aosp

* commit '8a576620cdc7257fc026026c77f7c946bfb760d1':
Images.Media.DATE_TAKEN should be in milliseconds.

commit | commitdiff | tree

Android (Google) Code Review [Fri, 4 Dec 2009 20:00:13 +0000 (12:00 -0800)]

Merge change Iab5c49c7 into eclair-mr2

* changes:
move event log tags used by system server into this package

am 052d9c8b: Images.Media.DATE_TAKEN should be in milliseconds. b/2297371

Merge commit '052d9c8b414dc9eb1c70d849660592d9bc3b2644' into eclair-mr2

* commit '052d9c8b414dc9eb1c70d849660592d9bc3b2644':
Images.Media.DATE_TAKEN should be in milliseconds.

am 6d72f725: Merge change If32b488b into eclair-mr2

Merge commit '6d72f725f18a63afd68f14cc1e2ff8f21d254c77' into eclair-mr2-plus-aosp

* commit '6d72f725f18a63afd68f14cc1e2ff8f21d254c77':
Add new unit test for RadioGroup/RadioButton.

commit | commitdiff | tree

Andy McFadden [Fri, 4 Dec 2009 19:54:55 +0000 (11:54 -0800)]

am 5c9d6e5b: Merge change Ie46db339 into eclair-mr2

Merge commit '5c9d6e5b8abce6d524c863cffc27e3ecf1c28c01' into eclair-mr2-plus-aosp

* commit '5c9d6e5b8abce6d524c863cffc27e3ecf1c28c01':
Remove "unused" opcodes from API.

commit | commitdiff | tree

Android (Google) Code Review [Fri, 4 Dec 2009 19:51:05 +0000 (11:51 -0800)]

Merge change If32b488b into eclair-mr2

* changes:
Add new unit test for RadioGroup/RadioButton.

commit | commitdiff | tree

Android (Google) Code Review [Fri, 4 Dec 2009 19:20:54 +0000 (11:20 -0800)]

Merge change Ie46db339 into eclair-mr2

* changes:
Remove "unused" opcodes from API.

commit | commitdiff | tree

Patrick Scott [Fri, 4 Dec 2009 19:12:55 +0000 (11:12 -0800)]

am c593d607: Merge change I4261c58d into eclair-mr2

Merge commit 'c593d60787e9abd75c94f70bd929ae13414411e9' into eclair-mr2-plus-aosp

* commit 'c593d60787e9abd75c94f70bd929ae13414411e9':
Check if another Activity wants to intercept an xml mime type.

commit | commitdiff | tree

Android (Google) Code Review [Fri, 4 Dec 2009 19:08:28 +0000 (11:08 -0800)]

Merge change I4261c58d into eclair-mr2

* changes:
Check if another Activity wants to intercept an xml mime type.

am f2feb0fa: am 48a65d99: Merge change I8c5f2fc3 into eclair

Merge commit 'f2feb0faa266e5e0844c20a8adb9cdb5f360322f' into eclair-mr2-plus-aosp

* commit 'f2feb0faa266e5e0844c20a8adb9cdb5f360322f':
Fix invalidate code path (#2273209).

am 48a65d99: Merge change I8c5f2fc3 into eclair

Merge commit '48a65d99cba33db3af2e05982a6825b883be2030' into eclair-mr2

* commit '48a65d99cba33db3af2e05982a6825b883be2030':
Fix invalidate code path (#2273209).

commit | commitdiff | tree

Android (Google) Code Review [Fri, 4 Dec 2009 18:22:47 +0000 (10:22 -0800)]

Merge change I8c5f2fc3 into eclair

* changes:
Fix invalidate code path (#2273209).

commit | commitdiff | tree

Daisuke Miyakawa [Fri, 4 Dec 2009 08:53:53 +0000 (00:53 -0800)]

am 8280c2b1: Implement new MockContentProvider. Also make ContentProvider aware of the class.

Merge commit '8280c2b15f6875b2d387c05df23d264864eb9cd5' into eclair-mr2-plus-aosp

* commit '8280c2b15f6875b2d387c05df23d264864eb9cd5':
Implement new MockContentProvider. Also make ContentProvider aware of the class.

am 3077f7df: am 1296d562: Merge change I8b63ab66 into eclair

Merge commit '3077f7df2eaf4127438d4337a9a25766261b02ee' into eclair-mr2-plus-aosp

* commit '3077f7df2eaf4127438d4337a9a25766261b02ee':
Better animation for sliding widget.

am 1296d562: Merge change I8b63ab66 into eclair

Merge commit '1296d562cf9b80e439724e15b4fdaf6626d2b4df' into eclair-mr2

* commit '1296d562cf9b80e439724e15b4fdaf6626d2b4df':
Better animation for sliding widget.

commit | commitdiff | tree

Android (Google) Code Review [Fri, 4 Dec 2009 06:14:19 +0000 (22:14 -0800)]

Merge change I8b63ab66 into eclair

* changes:
Better animation for sliding widget.

commit | commitdiff | tree

Naveen Kalla [Fri, 4 Dec 2009 04:11:07 +0000 (20:11 -0800)]

am 104d3f75: Merge change I6c84d731 into eclair-mr2

Merge commit '104d3f755e5ebc15d66154526c2c149beb33a7ee' into eclair-mr2-plus-aosp

* commit '104d3f755e5ebc15d66154526c2c149beb33a7ee':
Media/ToneGenerator: Change tone format for TONE_CDMA_ANSWER

commit | commitdiff | tree

Android (Google) Code Review [Fri, 4 Dec 2009 04:03:59 +0000 (20:03 -0800)]

Merge change I6c84d731 into eclair-mr2

* changes:
Media/ToneGenerator: Change tone format for TONE_CDMA_ANSWER

commit | commitdiff | tree

Dianne Hackborn [Fri, 4 Dec 2009 02:30:21 +0000 (18:30 -0800)]

am 39b08235: Add API level 8, currently a copy of 7.

Merge commit '39b082356851e29ba7a0af981eaa27d3b08a387b' into eclair-mr2-plus-aosp

* commit '39b082356851e29ba7a0af981eaa27d3b08a387b':
Add API level 8, currently a copy of 7.

commit | commitdiff | tree

Fred Quintana [Fri, 4 Dec 2009 01:25:36 +0000 (17:25 -0800)]

am 298de218: am 0ce8431c: Merge change Iaa7edda4 into eclair

Merge commit '298de218c540eab6c4e6c3415ab8a5c985c57772' into eclair-mr2-plus-aosp

* commit '298de218c540eab6c4e6c3415ab8a5c985c57772':
don't reschedule syncs that failed with a tooManyRetries error

commit | commitdiff | tree

Fred Quintana [Fri, 4 Dec 2009 01:17:00 +0000 (17:17 -0800)]

am 0ce8431c: Merge change Iaa7edda4 into eclair

Merge commit '0ce8431c15078e095a22a123dbabcd91049a9652' into eclair-mr2

* commit '0ce8431c15078e095a22a123dbabcd91049a9652':
don't reschedule syncs that failed with a tooManyRetries error

commit | commitdiff | tree

Android (Google) Code Review [Fri, 4 Dec 2009 01:10:59 +0000 (17:10 -0800)]

Merge change Iaa7edda4 into eclair

* changes:
don't reschedule syncs that failed with a tooManyRetries error

commit | commitdiff | tree

Andreas Huber [Fri, 4 Dec 2009 00:53:27 +0000 (16:53 -0800)]

am 2a428fd4: Merge change I85e5d39e into eclair-mr2

Merge commit '2a428fd463431e2b3d3680faf2e9640989ca7791' into eclair-mr2-plus-aosp

* commit '2a428fd463431e2b3d3680faf2e9640989ca7791':
Two more uses of strlcpy that break the sim build. Now fixed.

am 9737dc4d: am 5c49a908: (-s ours) Merge change Ic73ec39b into eclair

Merge commit '9737dc4de2ce56c5fb3d6911e48cfbfd63a19325' into eclair-mr2-plus-aosp

* commit '9737dc4de2ce56c5fb3d6911e48cfbfd63a19325':
DO NOT MERGE. Implement WAR which should prevent the white square bug from appearing on user devices. If we see a 0 texture id during bind for rendering, attempt to re-upload. If this fails log debug info and restart the app.

am 9f0fa1f4: Merge branch \'eclair-mr2\' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2

Merge commit '9f0fa1f4c1ed8499bf53479cf51c440a8f665d5e' into eclair-mr2-plus-aosp

* commit '9f0fa1f4c1ed8499bf53479cf51c440a8f665d5e':
Apparently strlcpy is not part of a standard linux distribution... Unbreaking the sim build.

am e08361d7: am 5d0806c9: Merge change Ia70bd8c4 into eclair

Merge commit 'e08361d7fda2234f447f4ffb7f480d045f8c5f78' into eclair-mr2-plus-aosp

* commit 'e08361d7fda2234f447f4ffb7f480d045f8c5f78':
add BluetoothChat sample app to the dev guide

commit | commitdiff | tree

Andreas Huber [Fri, 4 Dec 2009 00:44:26 +0000 (16:44 -0800)]

am 8d670d34: Merge change I1f1c7bad into eclair-mr2

Merge commit '8d670d345893fb9b9566f6b8c20202b77d4d211a' into eclair-mr2-plus-aosp

* commit '8d670d345893fb9b9566f6b8c20202b77d4d211a':
I accidentally broke this code while refactoring MediaScanner. This is the fix.

commit | commitdiff | tree

Erik Gilling [Fri, 4 Dec 2009 00:43:05 +0000 (16:43 -0800)]

am 9b565d5b: am cef8d031: Merge change I00d0b54a into eclair

Merge commit '9b565d5bf38e77774956524f137d509471ae5fb2' into eclair-mr2-plus-aosp

* commit '9b565d5bf38e77774956524f137d509471ae5fb2':
surfaceflinger: remove un-cached buffer hack for SGX

commit | commitdiff | tree

Dianne Hackborn [Fri, 4 Dec 2009 00:41:47 +0000 (16:41 -0800)]

am eefe7b1b: am b2e49a23: Add API level 7.

Merge commit 'eefe7b1b3e24a84a62f1b711cc9fa4aaca4a62c6' into eclair-mr2-plus-aosp

* commit 'eefe7b1b3e24a84a62f1b711cc9fa4aaca4a62c6':
Add API level 7.

commit | commitdiff | tree

Daisuke Miyakawa [Fri, 4 Dec 2009 00:40:50 +0000 (16:40 -0800)]

am 67d9aa15: Merge change I6173d7c7 into eclair-mr2

Merge commit '67d9aa15b6c6217a7d3b7b017924af132d048e56' into eclair-mr2-plus-aosp

* commit '67d9aa15b6c6217a7d3b7b017924af132d048e56':
Add isPrintableAscii() and isPrintableAsciiOnly() to TextUtils.java as hidden methods, and make vCard code use them.

commit | commitdiff | tree

Andreas Huber [Fri, 4 Dec 2009 00:40:04 +0000 (16:40 -0800)]

am 2d6d609c: Merge change I74bf38a0 into eclair-mr2

Merge commit '2d6d609c9ede7ed8924001df00af9c13effab8ad' into eclair-mr2-plus-aosp

* commit '2d6d609c9ede7ed8924001df00af9c13effab8ad':
Squashed commit of the following:

commit | commitdiff | tree

Andreas Huber [Fri, 4 Dec 2009 00:39:27 +0000 (16:39 -0800)]

am bfb9fb14: Refactor MediaScanner. Some steps on the way towards being able to build the tree without OpenCore.

Merge commit 'bfb9fb143b67c2d0307af2bce9af3c08f362b29a' into eclair-mr2-plus-aosp

* commit 'bfb9fb143b67c2d0307af2bce9af3c08f362b29a':
Refactor MediaScanner. Some steps on the way towards being able to build the tree without OpenCore.

am d345c6ac: am 0a42b811: base: process: Abort setting the process group if one of the threads fails to switch

Merge commit 'd345c6acedb22c9408553ef9f38c196984177e6b' into eclair-mr2-plus-aosp

* commit 'd345c6acedb22c9408553ef9f38c196984177e6b':
base: process: Abort setting the process group if one of the threads fails to switch

commit | commitdiff | tree

Ken Shirriff [Fri, 4 Dec 2009 00:37:27 +0000 (16:37 -0800)]

am 4850b5cd: Merge change I20d77880 into eclair-mr2

Merge commit '4850b5cd743f4513d59ff41cd6cb548a3a9879d6' into eclair-mr2-plus-aosp

* commit '4850b5cd743f4513d59ff41cd6cb548a3a9879d6':
Make Gservices setting constants public.

commit | commitdiff | tree

Jaikumar Ganesh [Fri, 4 Dec 2009 00:36:29 +0000 (16:36 -0800)]

am 11a2853e: am 8c411fb1: Merge change I79420b02 into eclair

Merge commit '11a2853e0196905e25a2dc5c227320688e04e950' into eclair-mr2-plus-aosp

* commit '11a2853e0196905e25a2dc5c227320688e04e950':
Add support for Car Dock.

am 7f1ab539: am 90d311ff: Merge change I33e0f00e into eclair

Merge commit '7f1ab539ceb56182d36d8782171a2dd84f96ea3b' into eclair-mr2-plus-aosp

* commit '7f1ab539ceb56182d36d8782171a2dd84f96ea3b':
docs: fix markup error in xml sample

commit | commitdiff | tree

Dave Sparks [Fri, 4 Dec 2009 00:34:07 +0000 (16:34 -0800)]

am 7c09a0ff: Merge change Ib904c2a4 into eclair-mr2

Merge commit '7c09a0ff365d6df96e880422a7b389ddf63401da' into eclair-mr2-plus-aosp

* commit '7c09a0ff365d6df96e880422a7b389ddf63401da':
Remove old hack A/V sync hack that is no longer needed.

commit | commitdiff | tree

Mike Lockwood [Fri, 4 Dec 2009 00:33:14 +0000 (16:33 -0800)]

am 44000eb2: am 678c2e35: Merge change I9ef88863 into eclair

Merge commit '44000eb2a2340b1a47eaa587d4829810e04cbcdc' into eclair-mr2-plus-aosp

* commit '44000eb2a2340b1a47eaa587d4829810e04cbcdc':
Add WindowManagerPolicy.OFF_BECAUSE_OF_PROX_SENSOR to indicate screen was turned off by the proximity sensor.

am 1b794bbb: am e12de4d5: Merge change Id5fa58cf into eclair

Merge commit '1b794bbbdc961558a9f0ee956d9d3f684d1f0497' into eclair-mr2-plus-aosp

* commit '1b794bbbdc961558a9f0ee956d9d3f684d1f0497':
Fix timezone issue to comply with EXIF standard.

am 6d1ec0d8: dealloc compiled-sql statements before deref\'ing them from SQLiteDatabase obj.

Merge commit '6d1ec0d81cd8ecdd390b31e724bac554bb955a94' into eclair-mr2-plus-aosp

* commit '6d1ec0d81cd8ecdd390b31e724bac554bb955a94':
dealloc compiled-sql statements before deref'ing them from SQLiteDatabase obj.

commit | commitdiff | tree

Daniel Sandler [Fri, 4 Dec 2009 00:30:21 +0000 (16:30 -0800)]

am add86719: am 14bee131: Fix lock screen layouts with emergency call buttons.

Merge commit 'add867197c0ae81b8120d70e4ae936df4a9c29bb' into eclair-mr2-plus-aosp

* commit 'add867197c0ae81b8120d70e4ae936df4a9c29bb':
Fix lock screen layouts with emergency call buttons.

commit | commitdiff | tree

Android (Google) Code Review [Fri, 4 Dec 2009 00:27:16 +0000 (16:27 -0800)]

Merge change I85e5d39e into eclair-mr2

* changes:
Two more uses of strlcpy that break the sim build. Now fixed.

am 5c49a908: (-s ours) Merge change Ic73ec39b into eclair

Merge commit '5c49a9080df9e46193efa8326318c86bc8976eea' into eclair-mr2

* commit '5c49a9080df9e46193efa8326318c86bc8976eea':
DO NOT MERGE. Implement WAR which should prevent the white square bug from appearing on user devices. If we see a 0 texture id during bind for rendering, attempt to re-upload. If this fails log debug info and restart the app.

commit | commitdiff | tree

Android (Google) Code Review [Fri, 4 Dec 2009 00:15:46 +0000 (16:15 -0800)]

Merge change Ic73ec39b into eclair

* changes:
DO NOT MERGE. Implement WAR which should prevent the white square bug from appearing on user devices. If we see a 0 texture id during bind for rendering, attempt to re-upload. If this fails log debug info and restart the app.

Merge branch 'eclair-mr2' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2

am 5d0806c9: Merge change Ia70bd8c4 into eclair

Merge commit '5d0806c9c3e0e6c8673ac4238f8ec2e0f82ad7e6' into eclair-mr2

* commit '5d0806c9c3e0e6c8673ac4238f8ec2e0f82ad7e6':
add BluetoothChat sample app to the dev guide

commit | commitdiff | tree

Android (Google) Code Review [Fri, 4 Dec 2009 00:06:52 +0000 (16:06 -0800)]

Merge change Ia70bd8c4 into eclair

* changes:
add BluetoothChat sample app to the dev guide

commit | commitdiff | tree

Android (Google) Code Review [Thu, 3 Dec 2009 23:51:09 +0000 (15:51 -0800)]

Merge change I1f1c7bad into eclair-mr2

* changes:
I accidentally broke this code while refactoring MediaScanner. This is the fix.

commit | commitdiff | tree

Erik Gilling [Thu, 3 Dec 2009 23:35:55 +0000 (15:35 -0800)]

am cef8d031: Merge change I00d0b54a into eclair

Merge commit 'cef8d031e842b773bbd6481b517996a185391e92' into eclair-mr2

* commit 'cef8d031e842b773bbd6481b517996a185391e92':
surfaceflinger: remove un-cached buffer hack for SGX

commit | commitdiff | tree

Android (Google) Code Review [Thu, 3 Dec 2009 23:30:23 +0000 (15:30 -0800)]

Merge change I00d0b54a into eclair

* changes:
surfaceflinger: remove un-cached buffer hack for SGX

commit | commitdiff | tree

Dianne Hackborn [Thu, 3 Dec 2009 22:52:46 +0000 (14:52 -0800)]

am b2e49a23: Add API level 7.

Merge commit 'b2e49a2319a40976a60d51d9a7c55d20f0b2d0e9' into eclair-mr2

* commit 'b2e49a2319a40976a60d51d9a7c55d20f0b2d0e9':
Add API level 7.

commit | commitdiff | tree

Erik Gilling [Thu, 3 Dec 2009 22:08:19 +0000 (14:08 -0800)]

surfaceflinger: remove un-cached buffer hack for SGX

Signed-off-by: Erik Gilling <konkers@android.com>

commit | commitdiff | tree

Android (Google) Code Review [Thu, 3 Dec 2009 21:55:07 +0000 (13:55 -0800)]

Merge change I6173d7c7 into eclair-mr2

* changes:
Add isPrintableAscii() and isPrintableAsciiOnly() to TextUtils.java as hidden methods, and make vCard code use them.

commit | commitdiff | tree

Android (Google) Code Review [Thu, 3 Dec 2009 21:27:08 +0000 (13:27 -0800)]

Merge change I74bf38a0 into eclair-mr2

* changes:
Squashed commit of the following:

am 0a42b811: base: process: Abort setting the process group if one of the threads fails to switch

Merge commit '0a42b811aea490a9a605b75f0320101f6eafd283' into eclair-mr2

* commit '0a42b811aea490a9a605b75f0320101f6eafd283':
base: process: Abort setting the process group if one of the threads fails to switch

commit | commitdiff | tree

Android (Google) Code Review [Thu, 3 Dec 2009 20:10:12 +0000 (12:10 -0800)]

Merge change I20d77880 into eclair-mr2

* changes:
Make Gservices setting constants public.

commit | commitdiff | tree

Jaikumar Ganesh [Thu, 3 Dec 2009 20:01:38 +0000 (12:01 -0800)]

am 8c411fb1: Merge change I79420b02 into eclair

Merge commit '8c411fb13923d1fa28fcd98452bf3d17b8b1a338' into eclair-mr2

* commit '8c411fb13923d1fa28fcd98452bf3d17b8b1a338':
Add support for Car Dock.

am 90d311ff: Merge change I33e0f00e into eclair

Merge commit '90d311ff33f33024f642ef03a02fb62566c9f46b' into eclair-mr2

* commit '90d311ff33f33024f642ef03a02fb62566c9f46b':
docs: fix markup error in xml sample

commit | commitdiff | tree

Android (Google) Code Review [Thu, 3 Dec 2009 19:49:38 +0000 (11:49 -0800)]

Merge change I79420b02 into eclair

* changes:
Add support for Car Dock.

commit | commitdiff | tree

Android (Google) Code Review [Thu, 3 Dec 2009 19:40:22 +0000 (11:40 -0800)]

Merge change I33e0f00e into eclair

* changes:
docs: fix markup error in xml sample

commit | commitdiff | tree

Android (Google) Code Review [Thu, 3 Dec 2009 19:25:54 +0000 (11:25 -0800)]

Merge change Ib904c2a4 into eclair-mr2

* changes:
Remove old hack A/V sync hack that is no longer needed.

commit | commitdiff | tree

Mike Lockwood [Thu, 3 Dec 2009 19:18:48 +0000 (11:18 -0800)]

am 678c2e35: Merge change I9ef88863 into eclair

Merge commit '678c2e35768a5426b4ad8f67c836008e7751a353' into eclair-mr2

* commit '678c2e35768a5426b4ad8f67c836008e7751a353':
Add WindowManagerPolicy.OFF_BECAUSE_OF_PROX_SENSOR to indicate screen was turned off by the proximity sensor.

commit | commitdiff | tree

Android (Google) Code Review [Thu, 3 Dec 2009 18:59:25 +0000 (10:59 -0800)]

Merge change I9ef88863 into eclair

* changes:
Add WindowManagerPolicy.OFF_BECAUSE_OF_PROX_SENSOR to indicate screen was turned off by the proximity sensor.

am e12de4d5: Merge change Id5fa58cf into eclair

Merge commit 'e12de4d5041e05f77cc4376a6bfc953a48e2c3c1' into eclair-mr2

* commit 'e12de4d5041e05f77cc4376a6bfc953a48e2c3c1':
Fix timezone issue to comply with EXIF standard.

commit | commitdiff | tree

Android (Google) Code Review [Thu, 3 Dec 2009 18:24:18 +0000 (10:24 -0800)]

Merge change Id5fa58cf into eclair

* changes:
Fix timezone issue to comply with EXIF standard.

commit | commitdiff | tree

Daniel Sandler [Thu, 3 Dec 2009 16:42:34 +0000 (08:42 -0800)]

am 14bee131: Fix lock screen layouts with emergency call buttons.

Merge commit '14bee131da68404b33655a241de83c2eeb417559' into eclair-mr2

* commit '14bee131da68404b33655a241de83c2eeb417559':
Fix lock screen layouts with emergency call buttons.

commit | commitdiff | tree

Wu-cheng Li [Thu, 3 Dec 2009 08:22:43 +0000 (00:22 -0800)]

am 64fc8082: am 40057ce7: Document that stopPreview is not needed before takePicture.

Merge commit '64fc80823e1e954a419bdcb0a193e4c56a8da959' into eclair-mr2-plus-aosp

* commit '64fc80823e1e954a419bdcb0a193e4c56a8da959':
Document that stopPreview is not needed before takePicture.

commit | commitdiff | tree

Wu-cheng Li [Thu, 3 Dec 2009 08:16:35 +0000 (00:16 -0800)]

am 40057ce7: Document that stopPreview is not needed before takePicture.

Merge commit '40057ce749c8c4d274db0352a2af4344bda92dba' into eclair-mr2

* commit '40057ce749c8c4d274db0352a2af4344bda92dba':
Document that stopPreview is not needed before takePicture.

commit | commitdiff | tree

Joe Onorato [Thu, 3 Dec 2009 07:39:16 +0000 (23:39 -0800)]

am a8974b63: am 19a4157c: Make the notification panel send the position as well.

Merge commit 'a8974b637c384d10bac10d94fae7487afdb2c16d' into eclair-mr2-plus-aosp

* commit 'a8974b637c384d10bac10d94fae7487afdb2c16d':
Make the notification panel send the position as well.

commit | commitdiff | tree

Joe Onorato [Thu, 3 Dec 2009 07:33:56 +0000 (23:33 -0800)]

am 19a4157c: Make the notification panel send the position as well.

Merge commit '19a4157ce40f4ab77b60445b8e73069c5877bb8a' into eclair-mr2

* commit '19a4157ce40f4ab77b60445b8e73069c5877bb8a':
Make the notification panel send the position as well.

commit | commitdiff | tree

Joe Onorato [Thu, 3 Dec 2009 07:22:52 +0000 (23:22 -0800)]

am 6c5401d8: am 7597065d: Make RemoteViews also set the sourceBounds in the PendingIntent.

Merge commit '6c5401d8b780d324afb784d4c0fba69cee4a6a9a' into eclair-mr2-plus-aosp

* commit '6c5401d8b780d324afb784d4c0fba69cee4a6a9a':
Make RemoteViews also set the sourceBounds in the PendingIntent.

commit | commitdiff | tree

Joe Onorato [Thu, 3 Dec 2009 07:22:19 +0000 (23:22 -0800)]

am b28632a5: am c7a63eea: Add a new field to Intent that allows you to give a hint about what on screen caused the intent to be sent.

Merge commit 'b28632a5206d11844db39ca1ab5f64a99ec74e29' into eclair-mr2-plus-aosp

* commit 'b28632a5206d11844db39ca1ab5f64a99ec74e29':
Add a new field to Intent that allows you to give a hint about what on screen caused the intent to

commit | commitdiff | tree

Joe Onorato [Thu, 3 Dec 2009 07:16:11 +0000 (23:16 -0800)]

am 7597065d: Make RemoteViews also set the sourceBounds in the PendingIntent.

Merge commit '7597065d6b0877ffc460b443fdb1595965ccd7b2' into eclair-mr2

* commit '7597065d6b0877ffc460b443fdb1595965ccd7b2':
Make RemoteViews also set the sourceBounds in the PendingIntent.

commit | commitdiff | tree

Joe Onorato [Thu, 3 Dec 2009 06:40:57 +0000 (22:40 -0800)]

am c7a63eea: Add a new field to Intent that allows you to give a hint about what on screen caused the intent to be sent.

Merge commit 'c7a63eea8d3d346addaaf892b5bbe0aa80651640' into eclair-mr2

* commit 'c7a63eea8d3d346addaaf892b5bbe0aa80651640':
Add a new field to Intent that allows you to give a hint about what on screen caused the intent to

commit | commitdiff | tree

Dmitri Plotnikov [Thu, 3 Dec 2009 06:08:38 +0000 (22:08 -0800)]

am 780211a9: Fixing broken build

Merge commit '780211a9a792dcc4cd57df0a4e8da34d05eb99f1' into eclair-mr2-plus-aosp

* commit '780211a9a792dcc4cd57df0a4e8da34d05eb99f1':
Fixing broken build

am 2b3509c9: Merge change I51438c18 into eclair-mr2

Merge commit '2b3509c9a5d6f3a7142430cd0b81d135a9c0a5df' into eclair-mr2-plus-aosp

* commit '2b3509c9a5d6f3a7142430cd0b81d135a9c0a5df':
the vertex index should be "first + i".

commit | commitdiff | tree

Android (Google) Code Review [Thu, 3 Dec 2009 05:17:57 +0000 (21:17 -0800)]

Merge change I51438c18 into eclair-mr2

* changes:
the vertex index should be "first + i".

commit | commitdiff | tree

Jack Veenstra [Thu, 3 Dec 2009 05:15:51 +0000 (21:15 -0800)]

am 1b04daf9: am de534329: Merge change Ica5efffe into eclair

Merge commit '1b04daf92b2f76da532c35e92eaa9ed2a9663d36' into eclair-mr2-plus-aosp

* commit '1b04daf92b2f76da532c35e92eaa9ed2a9663d36':
Fix bug 2216426: correct the hdpi star assets for RatingBar.

commit | commitdiff | tree

Jack Veenstra [Thu, 3 Dec 2009 05:09:10 +0000 (21:09 -0800)]

am de534329: Merge change Ica5efffe into eclair

Merge commit 'de5343290c4bac9b10b6fdd328b70da6f5e4d626' into eclair-mr2

* commit 'de5343290c4bac9b10b6fdd328b70da6f5e4d626':
Fix bug 2216426: correct the hdpi star assets for RatingBar.

commit | commitdiff | tree

Android (Google) Code Review [Thu, 3 Dec 2009 05:01:20 +0000 (21:01 -0800)]

Merge change Ica5efffe into eclair

* changes:
Fix bug 2216426: correct the hdpi star assets for RatingBar.

commit | commitdiff | tree

Dianne Hackborn [Thu, 3 Dec 2009 03:01:31 +0000 (19:01 -0800)]

am a45e9251: am dcd58cfd: Merge change I7b9328c7 into eclair

Merge commit 'a45e925108f6c9d35d9e7b5e8def9aba49ee0dba' into eclair-mr2-plus-aosp

* commit 'a45e925108f6c9d35d9e7b5e8def9aba49ee0dba':
Fix issue #2300232: Bugs in resolving conflicting pointers

commit | commitdiff | tree

Dianne Hackborn [Thu, 3 Dec 2009 02:56:20 +0000 (18:56 -0800)]

am dcd58cfd: Merge change I7b9328c7 into eclair

Merge commit 'dcd58cfda366c915b1f0739cb115f9d972351c73' into eclair-mr2

* commit 'dcd58cfda366c915b1f0739cb115f9d972351c73':
Fix issue #2300232: Bugs in resolving conflicting pointers

commit | commitdiff | tree

Android (Google) Code Review [Thu, 3 Dec 2009 02:51:19 +0000 (18:51 -0800)]

Merge change I7b9328c7 into eclair

* changes:
Fix issue #2300232: Bugs in resolving conflicting pointers

commit | commitdiff | tree

Omari Stephens [Thu, 3 Dec 2009 02:32:51 +0000 (18:32 -0800)]

am 21eb1738: am 7dfecb86: Merge change Iaa6e73a6 into eclair

Merge commit '21eb173864670c2f759258016d95f0bcd06313e7' into eclair-mr2-plus-aosp

* commit '21eb173864670c2f759258016d95f0bcd06313e7':
Revive backup tests

commit | commitdiff | tree

Omari Stephens [Thu, 3 Dec 2009 02:26:05 +0000 (18:26 -0800)]

am 7dfecb86: Merge change Iaa6e73a6 into eclair

Merge commit '7dfecb86db7c3c08a0fb0f6c6b06a11eabc60c54' into eclair-mr2

* commit '7dfecb86db7c3c08a0fb0f6c6b06a11eabc60c54':
Revive backup tests

commit | commitdiff | tree

Android (Google) Code Review [Thu, 3 Dec 2009 02:21:49 +0000 (18:21 -0800)]

Merge change Iaa6e73a6 into eclair

* changes:
Revive backup tests

am 7dd3337b: Merge change I8179742a into eclair-mr2

Merge commit '7dd3337b8e3ef27fd64df9afdbd0f658de77f3ab' into eclair-mr2-plus-aosp

* commit '7dd3337b8e3ef27fd64df9afdbd0f658de77f3ab':
Add support for extracting render time and image in page cycler

commit | commitdiff | tree

Takaoka G. Tadashi [Thu, 3 Dec 2009 02:11:04 +0000 (18:11 -0800)]

am d5b325aa: Add WSP header to WAP_PUSH_RECEIVED intent in addition to data Import CL 146651 from //branches/cupcake_dcm

Merge commit 'd5b325aaaca7e5197851d26332f48b917d961b9d' into eclair-mr2-plus-aosp

* commit 'd5b325aaaca7e5197851d26332f48b917d961b9d':
Add WSP header to WAP_PUSH_RECEIVED intent in addition to data

commit | commitdiff | tree

Takaoka G. Tadashi [Thu, 3 Dec 2009 02:10:34 +0000 (18:10 -0800)]

am 7d51517c: Merge change I611c15cf into eclair-mr2

Merge commit '7d51517cec75cbccd1ac53ac6ca7dd506af4637e' into eclair-mr2-plus-aosp

* commit '7d51517cec75cbccd1ac53ac6ca7dd506af4637e':
Add DoCoMo vendor specific OMNA WSP content type number

commit | commitdiff | tree

Dmitri Plotnikov [Thu, 3 Dec 2009 02:09:59 +0000 (18:09 -0800)]

am bbdba641: Merge change Icae1a990 into eclair-mr2

Merge commit 'bbdba6414ff4adccad2a56195c8c144f7e3a025a' into eclair-mr2-plus-aosp

* commit 'bbdba6414ff4adccad2a56195c8c144f7e3a025a':
Adding NAME_RAW_CONTACT_ID column to Contacts.

commit | commitdiff | tree

Mathias Agopian [Thu, 3 Dec 2009 02:09:22 +0000 (18:09 -0800)]

am 96dac84b: am 121a31ac: Merge change Id86beb99 into eclair

Merge commit '96dac84be4143d83b13648045b9af31ac0f81004' into eclair-mr2-plus-aosp

* commit '96dac84be4143d83b13648045b9af31ac0f81004':
fix [2291418] Camera preview cannot work in Emulator

commit | commitdiff | tree

Android (Google) Code Review [Thu, 3 Dec 2009 02:04:23 +0000 (18:04 -0800)]

Merge change I8179742a into eclair-mr2

* changes:
Add support for extracting render time and image in page cycler

commit | commitdiff | tree

Android (Google) Code Review [Thu, 3 Dec 2009 01:56:20 +0000 (17:56 -0800)]

Merge change I611c15cf into eclair-mr2

* changes:
Add DoCoMo vendor specific OMNA WSP content type number Import CL 145261 from //branches/cupcake_dcm

commit | commitdiff | tree

Android (Google) Code Review [Thu, 3 Dec 2009 01:55:39 +0000 (17:55 -0800)]

Merge change Icae1a990 into eclair-mr2

* changes:
Adding NAME_RAW_CONTACT_ID column to Contacts.

commit | commitdiff | tree

Mike Lockwood [Thu, 3 Dec 2009 01:51:09 +0000 (17:51 -0800)]

am f72fb68b: resolved conflicts for merge of 9b7dba93 to eclair-mr2

Merge commit 'f72fb68bf32014b075fe577c8495c2c8a86476a9' into eclair-mr2-plus-aosp

* commit 'f72fb68bf32014b075fe577c8495c2c8a86476a9':
Implement new notification LED blinking logic:

commit | commitdiff | tree

Mathias Agopian [Thu, 3 Dec 2009 01:50:45 +0000 (17:50 -0800)]

am 121a31ac: Merge change Id86beb99 into eclair

Merge commit '121a31ac3901fcb81c808da2b4a9a7cf66c12b7c' into eclair-mr2

* commit '121a31ac3901fcb81c808da2b4a9a7cf66c12b7c':
fix [2291418] Camera preview cannot work in Emulator