Commit Graph

11481 Commits

Author SHA1 Message Date
Dianne Hackborn
0fb263888f am 9602d9ad: Fix issue #2325782 Missing location features
Merge commit '9602d9adf456410a5bfc4268f55adc1b7ab0efa8' into eclair-plus-aosp

* commit '9602d9adf456410a5bfc4268f55adc1b7ab0efa8':
  Fix issue #2325782 Missing location features
2009-12-14 11:59:30 -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
27b620f5ef am da4cc343: Fix issue 2324029: In-call (and other) audio screwed up after using Pandora (ERD72).
Merge commit 'da4cc34308d65730c404b669926a92e37b378555' into eclair-plus-aosp

* commit 'da4cc34308d65730c404b669926a92e37b378555':
  Fix issue 2324029: In-call (and other) audio screwed up after using Pandora (ERD72).
2009-12-14 11:57:42 -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
Paul Westbrook
c54f589d29 resolved conflicts for merge of 15d3bb2c to master 2009-12-14 10:56:45 -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
0809743596 am 80a13350: am b6ddc7ae: Notify native plugin code when the browser discards the customView.
Merge commit '80a1335049bd6653a558bd9a2c625c091900caff'

* commit '80a1335049bd6653a558bd9a2c625c091900caff':
  Notify native plugin code when the browser discards the customView.
2009-12-14 06:22: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
b5fcf5dcfd am acd29577: am a8eaaa10: Merge change If90ee7e2 into eclair-mr2
Merge commit 'acd295776f76f184b873a39cbd47ad5cced6236d'

* commit 'acd295776f76f184b873a39cbd47ad5cced6236d':
  Fix TabHost NPE when there are no tabs
2009-12-14 01:16:37 -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
5910c467f9 am e30e85c7: am e7c1b11e: am 54bb575e: am 6f95f461: Fix the dependencies to make online-sdk-docs.
Merge commit 'e30e85c7e6918129d73d332bb227b41abb5bdd47'

* commit 'e30e85c7e6918129d73d332bb227b41abb5bdd47':
  Fix the dependencies to make online-sdk-docs.
2009-12-13 12:42:04 -08:00
Dianne Hackborn
46e1c555ae am 6a6f43f5: am 8091424e: am 9b52a218: Fix #2269582 Sometimes camera preview screen is truncated
Merge commit '6a6f43f577c6cb22202ee86fb3c6d1601f36c3b5'

* commit '6a6f43f577c6cb22202ee86fb3c6d1601f36c3b5':
  Fix #2269582 Sometimes camera preview screen is truncated
2009-12-13 12:41:53 -08:00
Dianne Hackborn
83607fa141 am c1e6b91d: am c9ca93fb: am 474731d5: Merge change I2ffe306f into eclair
Merge commit 'c1e6b91d75ce1dd5e8cc23aaf49c84d32f1bf673'

* commit 'c1e6b91d75ce1dd5e8cc23aaf49c84d32f1bf673':
  Fix issue #2304284: contacts/dialer/recentcalls constantly flashing
2009-12-13 12:41:43 -08:00
Xavier Ducrohet
6982363d8f am 092de0a9: am a7d461e0: am 62d4395b: Merge change I6dc8a694 into eclair
Merge commit '092de0a989dc3e81a957938670fb147f34afaa36'

* commit '092de0a989dc3e81a957938670fb147f34afaa36':
  Layoutlib: Add a constant for default density value.
2009-12-13 12:41:32 -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
2aa91f86fc am 54bb575e: am 6f95f461: Fix the dependencies to make online-sdk-docs.
Merge commit '54bb575e85d1e40efbfbb868f37553cdd8ed318f' into eclair-plus-aosp

* commit '54bb575e85d1e40efbfbb868f37553cdd8ed318f':
  Fix the dependencies to make online-sdk-docs.
2009-12-12 15:42:33 -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
8165cea577 am de0205f3: 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 'de0205f3bbda265cf8b53a912190dff86ab5d34e'

* commit 'de0205f3bbda265cf8b53a912190dff86ab5d34e':
  Post a Runnable to execute setNewZoomScale when
2009-12-12 15:13:28 -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
Dianne Hackborn
0f94746286 am 9b52a218: Fix #2269582 Sometimes camera preview screen is truncated
Merge commit '9b52a2184e99565bcd7f77effb321c95a2a4837e' into eclair-plus-aosp

* commit '9b52a2184e99565bcd7f77effb321c95a2a4837e':
  Fix #2269582 Sometimes camera preview screen is truncated
2009-12-11 18:56:47 -08:00
Dianne Hackborn
a93aacced1 am 474731d5: Merge change I2ffe306f into eclair
Merge commit '474731d5efb30c1e9184f998610054747eb8e764' into eclair-plus-aosp

* commit '474731d5efb30c1e9184f998610054747eb8e764':
  Fix issue #2304284: contacts/dialer/recentcalls constantly flashing
2009-12-11 18:28:45 -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
e1fcb347e4 am 28fdcf93: am 08945576: Merge change I9ac0777e into eclair-mr2
Merge commit '28fdcf93bd4150299d1b7eda0c9bdcf4ae75069a'

* commit '28fdcf93bd4150299d1b7eda0c9bdcf4ae75069a':
  Initial checkin of software AMR NB encoder based on PV source code.
2009-12-11 15:48:50 -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
Xavier Ducrohet
787cae2183 am 62d4395b: Merge change I6dc8a694 into eclair
Merge commit '62d4395bdb3114b9a75e46140456bc54fd13a3e7' into eclair-plus-aosp

* commit '62d4395bdb3114b9a75e46140456bc54fd13a3e7':
  Layoutlib: Add a constant for default density value.
2009-12-11 14:58:41 -08:00
Dan Egnor
eaa0b03ff4 resolved conflicts for merge of f6bb01b0 to master 2009-12-11 14:55:24 -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
8badc8e2a5 am 09f82ec6: am af1255da: resolved conflicts for merge of 2624fbca to eclair-mr2
Merge commit '09f82ec61cca00bd8b08529a94139dd6ac5cec73'

* commit '09f82ec61cca00bd8b08529a94139dd6ac5cec73':
  Fix #2320798: Device hang then runtime restart
2009-12-11 13:26:05 -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
Christopher Tate
7d900f2697 resolved conflicts for merge of 2624fbca to eclair-mr2 2009-12-11 13:16:41 -08:00
Andreas Huber
c2833b53e3 am e86a37c6: am 8eac1637: Merge change I85adf5e5 into eclair-mr2
Merge commit 'e86a37c6bfb0a0aa9ce871fdfc9e884ab3ddd1d8'

* commit 'e86a37c6bfb0a0aa9ce871fdfc9e884ab3ddd1d8':
  Propagate duration from input to output only if available, support multiple full frames of audio per input buffer in AMR/AAC decoders.
2009-12-11 13:06:05 -08:00
Christopher Tate
91f1a1c57a am 2624fbca: Fix #2320798: Device hang then runtime restart
Merge commit '2624fbcaaa74b3a6d8d60d22d9e16ef26a98a6b2' into eclair-plus-aosp

* commit '2624fbcaaa74b3a6d8d60d22d9e16ef26a98a6b2':
  Fix #2320798: Device hang then runtime restart
2009-12-11 13:05:57 -08:00
Andreas Huber
23e1b91e2c am 8eac1637: Merge change I85adf5e5 into eclair-mr2
Merge commit '8eac1637b0f8ec7a2417eb53ebe56bb64c3b2b23' into eclair-mr2-plus-aosp

* commit '8eac1637b0f8ec7a2417eb53ebe56bb64c3b2b23':
  Propagate duration from input to output only if available, support multiple full frames of audio per input buffer in AMR/AAC decoders.
2009-12-11 13:01:12 -08:00
Android (Google) Code Review
a22790ef39 Merge change I85adf5e5 into eclair-mr2
* changes:
  Propagate duration from input to output only if available, support multiple full frames of audio per input buffer in AMR/AAC decoders.
2009-12-11 12:56:30 -08:00
Ken Shirriff
7893bb4acd am 9ed0a872: am 930ab3d9: Fix broken sdk build.
Merge commit '9ed0a8721990303e6264c6affb93b25c8249127b'

* commit '9ed0a8721990303e6264c6affb93b25c8249127b':
  Fix broken sdk build.
2009-12-11 12:42:43 -08:00
Ken Shirriff
f22f7af324 am 930ab3d9: Fix broken sdk build.
Merge commit '930ab3d955a40c1de167b7142215af37f9f9bfe4' into eclair-mr2-plus-aosp

* commit '930ab3d955a40c1de167b7142215af37f9f9bfe4':
  Fix broken sdk build.
2009-12-11 12:38:07 -08:00
Andreas Huber
8c302e0dca am ea113f30: am d8729c59: Removing an unused header file and a stale forward declaration. Also handling one more nalType as a no-op.
Merge commit 'ea113f307d459577e9ed3ea2cbbbb77c92235a6e'

* commit 'ea113f307d459577e9ed3ea2cbbbb77c92235a6e':
  Removing an unused header file and a stale forward declaration. Also handling one more nalType as a no-op.
2009-12-11 10:11:43 -08:00