Commit Graph

8918 Commits

Author SHA1 Message Date
Michael Chan
91b2faef49 am cdaeafd4: b/2224837 Changed the plumbing of how alerts/notifications work.
Merge commit 'cdaeafd440e61e1b64fbd46107157f3c74d1c09c' into eclair-mr2-plus-aosp

* commit 'cdaeafd440e61e1b64fbd46107157f3c74d1c09c':
  b/2224837 Changed the plumbing of how alerts/notifications work.
2009-12-15 15:27:31 -08:00
Andreas Huber
76cdbb927f am ae77561b: Merge change I7f11a67a into eclair-mr2
Merge commit 'ae77561b8f4de45228b0d63f0d7508d428b9516a' into eclair-mr2-plus-aosp

* commit 'ae77561b8f4de45228b0d63f0d7508d428b9516a':
  Properly integrate the software codecs into the OMXCodec::Create hierarchy of available components.
2009-12-15 14:04:07 -08:00
Android (Google) Code Review
19b8aa8545 Merge change I7f11a67a into eclair-mr2
* changes:
  Properly integrate the software codecs into the OMXCodec::Create hierarchy of available components.
2009-12-15 14:02:15 -08:00
Dmitri Plotnikov
8d956b29e1 am 3170f9a7: Fixing broken javadoc.
Merge commit '3170f9a7cf32d6935e6c468e907f9b5427ebadbc' into eclair-mr2-plus-aosp

* commit '3170f9a7cf32d6935e6c468e907f9b5427ebadbc':
  Fixing broken javadoc.
2009-12-15 13:58:28 -08:00
Dmitri Plotnikov
b315667fc9 am 07ab85b3: Introducing fields for capturing national specifics of contact names.
Merge commit '07ab85b338d6e08a901a13230ae4cedc57e418ea' into eclair-mr2-plus-aosp

* commit '07ab85b338d6e08a901a13230ae4cedc57e418ea':
  Introducing fields for capturing national specifics of contact names.
2009-12-15 12:01:46 -08:00
Cary Clark
1a798b2b60 am 1cb97eed: check to see if nav cache is up to date on tap
Merge commit '1cb97eed566014e36a7c2a0b487ec132b7d45e6c' into eclair-mr2-plus-aosp

* commit '1cb97eed566014e36a7c2a0b487ec132b7d45e6c':
  check to see if nav cache is up to date on tap
2009-12-15 10:45:38 -08:00
Ken Shirriff
2e064bb6f7 am 98d1803d: Merge change I11f66b41 into eclair-mr2
Merge commit '98d1803d4d00540695c63c0d52361e8e784d043e' into eclair-mr2-plus-aosp

* commit '98d1803d4d00540695c63c0d52361e8e784d043e':
  Remove unused SOURCE_ID constant.
2009-12-15 09:36:08 -08:00
Android (Google) Code Review
8340eb6644 Merge change I11f66b41 into eclair-mr2
* changes:
  Remove unused SOURCE_ID constant.
2009-12-15 09:33:17 -08:00
Leon Scroggins
79cebff55f am aacced6b: Provide localized strings for <input> labels.
Merge commit 'aacced6bc5a64c7daa4af2f29b94a1b00770f083' into eclair-mr2-plus-aosp

* commit 'aacced6bc5a64c7daa4af2f29b94a1b00770f083':
  Provide localized strings for <input> labels.
2009-12-15 05:56:11 -08:00
Fred Quintana
0e13738b08 am 274dc9d3: moved the hidden sync helpers out of the framework
Merge commit '274dc9d35fdf5d0464f74071a9a8f14e497d4d5f' into eclair-mr2-plus-aosp

* commit '274dc9d35fdf5d0464f74071a9a8f14e497d4d5f':
  moved the hidden sync helpers out of the framework
2009-12-15 05:56:03 -08:00
Kenny Root
d884af6a8b am 15f1bfb0: Merge change I70d0bddb into eclair-mr2
Merge commit '15f1bfb0d29915ed1790b22a00fd7032f035ddb0' into eclair-mr2-plus-aosp

* commit '15f1bfb0d29915ed1790b22a00fd7032f035ddb0':
  Revise aapt options for UTF8/16 encoding
2009-12-14 16:28:03 -08:00
Android (Google) Code Review
e6459adb75 Merge change I70d0bddb into eclair-mr2
* changes:
  Revise aapt options for UTF8/16 encoding
2009-12-14 16:24:32 -08:00
Dianne Hackborn
a3c15ab7e3 am 3a3fd2ba: Merge change Iaf1f0918 into eclair-mr2
Merge commit '3a3fd2ba1ffc6171725375396cc59711a34bb39e' into eclair-mr2-plus-aosp

* commit '3a3fd2ba1ffc6171725375396cc59711a34bb39e':
  Implement API to have new broadcasts replace existing broadcasts.
2009-12-14 16:10:13 -08:00
Android (Google) Code Review
38d0f0c05f Merge change Iaf1f0918 into eclair-mr2
* changes:
  Implement API to have new broadcasts replace existing broadcasts.
2009-12-14 16:06:49 -08:00
Andreas Huber
7762a6ef4a am 67f1db1c: Merge change Ib1f5ee41 into eclair-mr2
Merge commit '67f1db1cd1ed4af67c76c52542f753af57aa0a85' into eclair-mr2-plus-aosp

* commit '67f1db1cd1ed4af67c76c52542f753af57aa0a85':
  It's important that seek requests are only specified in the initial call to MediaSource::read and are not repeated in subsequent calls.
2009-12-14 15:54:19 -08:00
Android (Google) Code Review
7c76a149cd Merge change Ib1f5ee41 into eclair-mr2
* changes:
  It's important that seek requests are only specified in the initial call to MediaSource::read and are not repeated in subsequent calls.
2009-12-14 15:48:48 -08:00
Paul Westbrook
290e02b049 am 16396414: Merge change If5b0b6fa into eclair-mr2
Merge commit '163964143fe27b7fdbeb51a4fc65d72769c83481' into eclair-mr2-plus-aosp

* commit '163964143fe27b7fdbeb51a4fc65d72769c83481':
  Fixed class paths in layout xml files
2009-12-14 15:29:46 -08:00
Andreas Huber
c77a6c7f4a am 19553241: Merge change I1314e737 into eclair-mr2
Merge commit '19553241513bd2ee2610026ebbce8c45c7ae0dbc' into eclair-mr2-plus-aosp

* commit '19553241513bd2ee2610026ebbce8c45c7ae0dbc':
  AwesomePlayer now renders either remote (IOMXRenderer) or locally depending on what kind of decoder was instantiated. Split off color conversion code into its own shared library.
2009-12-14 15:27:01 -08:00
Andreas Huber
727f895ee0 am 0483f1c1: Merge change Ib5ae1c87 into eclair-mr2
Merge commit '0483f1c192201f75f7c2bd9b22cb6680801dabbb' into eclair-mr2-plus-aosp

* commit '0483f1c192201f75f7c2bd9b22cb6680801dabbb':
  The software AVCDecoder now properly seeks as requested.
2009-12-14 15:26:55 -08:00
Dianne Hackborn
3c8b4608ac am 91afce93: am 9602d9ad: Fix issue #2325782 Missing location features
Merge commit '91afce93866a5fb1bafbd3407d6bc1806caf8c41' into eclair-mr2-plus-aosp

* commit '91afce93866a5fb1bafbd3407d6bc1806caf8c41':
  Fix issue #2325782 Missing location features
2009-12-14 15:26:48 -08:00
Eric Laurent
120f1d29b4 am 59e03a0a: am da4cc343: Fix issue 2324029: In-call (and other) audio screwed up after using Pandora (ERD72).
Merge commit '59e03a0a4d62f214cf5cfab49f16223f89670f2a' into eclair-mr2-plus-aosp

* commit '59e03a0a4d62f214cf5cfab49f16223f89670f2a':
  Fix issue 2324029: In-call (and other) audio screwed up after using Pandora (ERD72).
2009-12-14 15:26:41 -08:00
Maryam Garrett
ac5ac92c9f am 39f0efba: Fixes context-menu trigger behavior after scroll in TextView
Merge commit '39f0efba92a4420f77e3abc53c367ea3cacde3cf' into eclair-mr2-plus-aosp

* commit '39f0efba92a4420f77e3abc53c367ea3cacde3cf':
  Fixes context-menu trigger behavior after scroll in TextView
2009-12-14 15:26:33 -08:00
Android (Google) Code Review
f6560ff2be Merge change If5b0b6fa into eclair-mr2
* changes:
  Fixed class paths in layout xml files
2009-12-14 15:17:24 -08:00
Android (Google) Code Review
ccf0138d7f Merge change I1314e737 into eclair-mr2
* changes:
  AwesomePlayer now renders either remote (IOMXRenderer) or locally depending on what kind of decoder was instantiated. Split off color conversion code into its own shared library.
2009-12-14 14:32:13 -08:00
Android (Google) Code Review
4a86f6fc01 Merge change Ib5ae1c87 into eclair-mr2
* changes:
  The software AVCDecoder now properly seeks as requested.
2009-12-14 12:34:16 -08:00
Dianne Hackborn
5972e96ad4 am 9602d9ad: Fix issue #2325782 Missing location features
Merge commit '9602d9adf456410a5bfc4268f55adc1b7ab0efa8' into eclair-mr2

* commit '9602d9adf456410a5bfc4268f55adc1b7ab0efa8':
  Fix issue #2325782 Missing location features
2009-12-14 11:59:10 -08:00
Eric Laurent
85385e47aa am da4cc343: Fix issue 2324029: In-call (and other) audio screwed up after using Pandora (ERD72).
Merge commit 'da4cc34308d65730c404b669926a92e37b378555' into eclair-mr2

* commit 'da4cc34308d65730c404b669926a92e37b378555':
  Fix issue 2324029: In-call (and other) audio screwed up after using Pandora (ERD72).
2009-12-14 11:57:24 -08:00
Ken Shirriff
b348b711d4 am ba8e4d24: Merge change Ib5343691 into eclair-mr2
Merge commit 'ba8e4d240b3d5eaebbdba9351b247ac20bedadc5' into eclair-mr2-plus-aosp

* commit 'ba8e4d240b3d5eaebbdba9351b247ac20bedadc5':
  Add account name / type query parameters for calendar Events.
2009-12-14 11:50:09 -08:00
Android (Google) Code Review
4b1192d74c Merge change Ib5343691 into eclair-mr2
* changes:
  Add account name / type query parameters for calendar Events.
2009-12-14 10:41:33 -08:00
Paul Westbrook
169fdda7f1 am 7762d936: Unbundling work
Merge commit '7762d93621f508f4410fd37b5bbdfec0071b0420' into eclair-mr2-plus-aosp

* commit '7762d93621f508f4410fd37b5bbdfec0071b0420':
  Unbundling work
2009-12-14 10:10:20 -08:00
Paul Westbrook
8bf1ad00e7 Unbundling work
Moved AndroidHttpClient, Rfc822InputFilter, Rfc822Validator
NumberPicker, NumberPickerButton to android-common
---
2009-12-14 09:24:09 -08:00
Derek Sollenberger
9b079a508d am b6ddc7ae: Notify native plugin code when the browser discards the customView.
Merge commit 'b6ddc7ae3507f0e1ea9a76c76f829bc8b26a292c' into eclair-mr2-plus-aosp

* commit 'b6ddc7ae3507f0e1ea9a76c76f829bc8b26a292c':
  Notify native plugin code when the browser discards the customView.
2009-12-14 06:11:05 -08:00
Bjorn Bringert
2a17e6a98b am a8eaaa10: Merge change If90ee7e2 into eclair-mr2
Merge commit 'a8eaaa1027e09daab01224cfe4a27b19570d35b0' into eclair-mr2-plus-aosp

* commit 'a8eaaa1027e09daab01224cfe4a27b19570d35b0':
  Fix TabHost NPE when there are no tabs
2009-12-14 01:09:19 -08:00
Android (Google) Code Review
c417b68c3a Merge change If90ee7e2 into eclair-mr2
* changes:
  Fix TabHost NPE when there are no tabs
2009-12-14 01:01:21 -08:00
Ying Wang
855f00573d am e7c1b11e: am 54bb575e: am 6f95f461: Fix the dependencies to make online-sdk-docs.
Merge commit 'e7c1b11ec892fbb1eb053f9aa4f6839031b19c1c' into eclair-mr2-plus-aosp

* commit 'e7c1b11ec892fbb1eb053f9aa4f6839031b19c1c':
  Fix the dependencies to make online-sdk-docs.
2009-12-13 12:34:26 -08:00
Dianne Hackborn
12b88959af am 8091424e: am 9b52a218: Fix #2269582 Sometimes camera preview screen is truncated
Merge commit '8091424ea332f754e6f1c712a9e28bfa7d02741e' into eclair-mr2-plus-aosp

* commit '8091424ea332f754e6f1c712a9e28bfa7d02741e':
  Fix #2269582 Sometimes camera preview screen is truncated
2009-12-13 12:34:18 -08:00
Dianne Hackborn
573d6ad942 am c9ca93fb: am 474731d5: Merge change I2ffe306f into eclair
Merge commit 'c9ca93fbf9ff49ca4b74c4ec72d3f7580b3b7659' into eclair-mr2-plus-aosp

* commit 'c9ca93fbf9ff49ca4b74c4ec72d3f7580b3b7659':
  Fix issue #2304284: contacts/dialer/recentcalls constantly flashing
2009-12-13 12:34:09 -08:00
Xavier Ducrohet
5487857ae5 am a7d461e0: am 62d4395b: Merge change I6dc8a694 into eclair
Merge commit 'a7d461e09adf716c2148b45a5d94f5b8cb37f9ba' into eclair-mr2-plus-aosp

* commit 'a7d461e09adf716c2148b45a5d94f5b8cb37f9ba':
  Layoutlib: Add a constant for default density value.
2009-12-13 12:34:01 -08:00
Ying Wang
14f7281346 am 54bb575e: am 6f95f461: Fix the dependencies to make online-sdk-docs.
Merge commit '54bb575e85d1e40efbfbb868f37553cdd8ed318f' into eclair-mr2

* commit '54bb575e85d1e40efbfbb868f37553cdd8ed318f':
  Fix the dependencies to make online-sdk-docs.
2009-12-13 12:26:11 -08:00
Dianne Hackborn
0dba9eb91e am 9b52a218: Fix #2269582 Sometimes camera preview screen is truncated
Merge commit '9b52a2184e99565bcd7f77effb321c95a2a4837e' into eclair-mr2

* commit '9b52a2184e99565bcd7f77effb321c95a2a4837e':
  Fix #2269582 Sometimes camera preview screen is truncated
2009-12-13 12:25:10 -08:00
Dianne Hackborn
ec9853781a am 474731d5: Merge change I2ffe306f into eclair
Merge commit '474731d5efb30c1e9184f998610054747eb8e764' into eclair-mr2

* commit '474731d5efb30c1e9184f998610054747eb8e764':
  Fix issue #2304284: contacts/dialer/recentcalls constantly flashing
2009-12-13 12:25:00 -08:00
Xavier Ducrohet
3215201093 am 62d4395b: Merge change I6dc8a694 into eclair
Merge commit '62d4395bdb3114b9a75e46140456bc54fd13a3e7' into eclair-mr2

* commit '62d4395bdb3114b9a75e46140456bc54fd13a3e7':
  Layoutlib: Add a constant for default density value.
2009-12-13 12:24:17 -08:00
Ying Wang
8de909ce00 am 6f95f461: Fix the dependencies to make online-sdk-docs.
Merge commit '6f95f461098d5b9e93212cf9cc7c7a6498eecf3a' into eclair

* commit '6f95f461098d5b9e93212cf9cc7c7a6498eecf3a':
  Fix the dependencies to make online-sdk-docs.
2009-12-12 15:38:29 -08:00
Grace Kloba
f7755388a6 am 70b942d3: Post a Runnable to execute setNewZoomScale when WebView\'s onSizeChanged is called. This will ensure requestLayout of the Child View works.
Merge commit '70b942d34d1d1a30ab2d73bbefe214f5db0f4853' into eclair-mr2-plus-aosp

* commit '70b942d34d1d1a30ab2d73bbefe214f5db0f4853':
  Post a Runnable to execute setNewZoomScale when
2009-12-12 15:08:22 -08:00
Android (Google) Code Review
093a48b1ab Merge change I2ffe306f into eclair
* changes:
  Fix issue #2304284: contacts/dialer/recentcalls constantly flashing
2009-12-11 18:25:21 -08:00
Andreas Huber
25eebe07d7 am 08945576: Merge change I9ac0777e into eclair-mr2
Merge commit '089455760c05289c1315268a6cb896577ceebc64' into eclair-mr2-plus-aosp

* commit '089455760c05289c1315268a6cb896577ceebc64':
  Initial checkin of software AMR NB encoder based on PV source code.
2009-12-11 15:44:59 -08:00
Android (Google) Code Review
afdd49fa24 Merge change I9ac0777e into eclair-mr2
* changes:
  Initial checkin of software AMR NB encoder based on PV source code.
2009-12-11 15:39:17 -08:00
Android (Google) Code Review
827573fad5 Merge change I6dc8a694 into eclair
* changes:
  Layoutlib: Add a constant for default density value.
2009-12-11 14:54:19 -08:00
Dan Egnor
60a5ad8be7 am b7f0367c: Eliminate CrashData and friends.
Merge commit 'b7f0367cec1c744aa66ef397b0244e25d507491c' into eclair-mr2-plus-aosp

* commit 'b7f0367cec1c744aa66ef397b0244e25d507491c':
  Eliminate CrashData and friends.
2009-12-11 14:32:40 -08:00
Christopher Tate
fd47cf27bf am af1255da: resolved conflicts for merge of 2624fbca to eclair-mr2
Merge commit 'af1255dab8fa3eab1caf9bae799f80de14a74470' into eclair-mr2-plus-aosp

* commit 'af1255dab8fa3eab1caf9bae799f80de14a74470':
  Fix #2320798: Device hang then runtime restart
2009-12-11 13:20:15 -08:00