Commit Graph

11162 Commits

Author SHA1 Message Date
Mike Reed
b26ab46355 am 10d32a33: Merge change I16dc1411 into eclair-mr2
Merge commit '10d32a338d5400786e784a0d6f51b53acea76b44' into eclair-mr2-plus-aosp

* commit '10d32a338d5400786e784a0d6f51b53acea76b44':
  add boundary patch
2009-10-28 12:46:55 -07:00
Amith Yamasani
9acffe7639 am 26d4e539: am 678cdbe5: Fix build.
Merge commit '26d4e539676346236082ed1d3eccdf078980b7d5' into eclair-mr2-plus-aosp

* commit '26d4e539676346236082ed1d3eccdf078980b7d5':
  Fix build.
2009-10-28 12:46:41 -07:00
Amith Yamasani
ef20445432 am 4ac5066d: am aea1b3b2: Disambiguation between multiple pointers and swipe gestures.
Merge commit '4ac5066d53b40ec59a1f30ca11b8d5e1ba25659d' into eclair-mr2-plus-aosp

* commit '4ac5066d53b40ec59a1f30ca11b8d5e1ba25659d':
  Disambiguation between multiple pointers and swipe gestures.
2009-10-28 12:46:26 -07:00
Wink Saville
e6028e52c9 am 02d89898: am a2058e43: Merge change I11c3cdc7 into eclair
Merge commit '02d89898c9b48426d5add48868a640c198a3321f' into eclair-mr2-plus-aosp

* commit '02d89898c9b48426d5add48868a640c198a3321f':
  Change default TIME_DELAYED_TO_RESTART_RADIO to 60secs from 20secs.
2009-10-28 12:46:11 -07:00
Mike Lockwood
80b6367dc6 am 8d1eeb21: am 2d155d26: PowerManagerService: Fix bug resulting in backlights turning on while screen is off.
Merge commit '8d1eeb2144945365cae281552bd7bc5eb14f7688' into eclair-mr2-plus-aosp

* commit '8d1eeb2144945365cae281552bd7bc5eb14f7688':
  PowerManagerService: Fix bug resulting in backlights turning on while screen is off.
2009-10-28 12:45:54 -07:00
Mike Lockwood
e1da9d3583 am 7c64d448: am 8061f64f: Merge change Ib0d3d9d0 into eclair
Merge commit '7c64d4486ad8704f0b63474e2da0dd89147771ad' into eclair-mr2-plus-aosp

* commit '7c64d4486ad8704f0b63474e2da0dd89147771ad':
  PowerManagerService: Clear Binder calling identity around calls to Sensor Manager.
2009-10-28 12:45:38 -07:00
Dirk Dougherty
a292fefeb7 am 4c071f0d: am 59625fa8: am 946f9d1e: Merge change I020b31e1 into eclair-sdk
Merge commit '4c071f0d69ac0e3eaf386797faeb52d63de30806' into eclair-mr2-plus-aosp

* commit '4c071f0d69ac0e3eaf386797faeb52d63de30806':
  doc change: add SDK sizes, checksums, small changes for online SDK doc set, add layoutopt doc.
2009-10-28 12:45:22 -07:00
Scott Main
aaeafec5cd am 66e69251: am 91bfbfb9: am 08c57535: docs: add 2.0 highlights doc and updated homepage
Merge commit '66e6925154a64d4fab53e6241e9e1fd227f42352' into eclair-mr2-plus-aosp

* commit '66e6925154a64d4fab53e6241e9e1fd227f42352':
  docs: add 2.0 highlights doc and updated homepage
2009-10-28 12:45:03 -07:00
Dirk Dougherty
838bb98931 am 53976509: am 37ebfad1: am a250f0c8: doc change: fix broken link at top of installing doc
Merge commit '53976509639b136150a844ff92544f96cf048943' into eclair-mr2-plus-aosp

* commit '53976509639b136150a844ff92544f96cf048943':
  doc change: fix broken link at top of installing doc
2009-10-28 12:44:46 -07:00
Yu Shan Emily Lau
f97dec837c am 42ea8dc7: am adf4b4f5: Merge change I96458368 into eclair
Merge commit '42ea8dc732b8231df497a7a21fb3b55e1346fd63' into eclair-mr2-plus-aosp

* commit '42ea8dc732b8231df497a7a21fb3b55e1346fd63':
  Fixed the H263 video duation which caused the incorrect video validation.
2009-10-28 12:44:28 -07:00
Dave Sparks
687545fc9e am 5a7691f0: am e8543418: Merge change I7c0d20a7 into eclair
Merge commit '5a7691f0e13620322103d61c9f2b1eeb908fd37b' into eclair-mr2-plus-aosp

* commit '5a7691f0e13620322103d61c9f2b1eeb908fd37b':
  Run the metadataretriever at background priority. Bug 2187133.
2009-10-28 12:44:10 -07:00
Brett Chabot
32be57d100 am 622b190c: am b81df8e3: Merge change I5535bbdf into eclair
Merge commit '622b190c878e38468096ef0fe1cd28dbc10c3b33' into eclair-mr2-plus-aosp

* commit '622b190c878e38468096ef0fe1cd28dbc10c3b33':
  Disable flaky and failing tests.
2009-10-28 12:43:52 -07:00
Andreas Huber
7373755ac3 am 013ecbfc: am 54620b1a: Merge change I6e50a8c6 into eclair
Merge commit '013ecbfca236f3b4c2fd0eedd89c70f116f641ed' into eclair-mr2-plus-aosp

* commit '013ecbfca236f3b4c2fd0eedd89c70f116f641ed':
  Revert "Now that the underlying bug is fixed we can continue using OMX_UseBuffer for this decoder's input buffers."
2009-10-28 12:43:31 -07:00
Android (Google) Code Review
10d32a338d Merge change I16dc1411 into eclair-mr2
* changes:
  add boundary patch
2009-10-28 15:37:34 -04:00
Mike Reed
c04851fd0a add boundary patch 2009-10-28 15:18:41 -04:00
Amith Yamasani
26d4e53967 am 678cdbe5: Fix build.
Merge commit '678cdbe55e0de71436f8aad5f139eafc2ab6f937' into eclair-mr2

* commit '678cdbe55e0de71436f8aad5f139eafc2ab6f937':
  Fix build.
2009-10-28 11:42:56 -07:00
Amith Yamasani
4ac5066d53 am aea1b3b2: Disambiguation between multiple pointers and swipe gestures.
Merge commit 'aea1b3b24ee895c24ed25c5706bc2f390b41689d' into eclair-mr2

* commit 'aea1b3b24ee895c24ed25c5706bc2f390b41689d':
  Disambiguation between multiple pointers and swipe gestures.
2009-10-28 11:42:35 -07:00
Wink Saville
02d89898c9 am a2058e43: Merge change I11c3cdc7 into eclair
Merge commit 'a2058e431736810503bc85fadec31a8e0bfcad95' into eclair-mr2

* commit 'a2058e431736810503bc85fadec31a8e0bfcad95':
  Change default TIME_DELAYED_TO_RESTART_RADIO to 60secs from 20secs.
2009-10-28 11:42:07 -07:00
Mike Lockwood
8d1eeb2144 am 2d155d26: PowerManagerService: Fix bug resulting in backlights turning on while screen is off.
Merge commit '2d155d264e5cefc27abf2c5020fcfa06bde755ec' into eclair-mr2

* commit '2d155d264e5cefc27abf2c5020fcfa06bde755ec':
  PowerManagerService: Fix bug resulting in backlights turning on while screen is off.
2009-10-28 11:41:10 -07:00
Mike Lockwood
7c64d4486a am 8061f64f: Merge change Ib0d3d9d0 into eclair
Merge commit '8061f64f6246116381131fc7951b6d88be37161a' into eclair-mr2

* commit '8061f64f6246116381131fc7951b6d88be37161a':
  PowerManagerService: Clear Binder calling identity around calls to Sensor Manager.
2009-10-28 11:40:47 -07:00
Dirk Dougherty
4c071f0d69 am 59625fa8: am 946f9d1e: Merge change I020b31e1 into eclair-sdk
Merge commit '59625fa86ad0e520931361aba120e2d868f01618' into eclair-mr2

* commit '59625fa86ad0e520931361aba120e2d868f01618':
  doc change: add SDK sizes, checksums, small changes for online SDK doc set, add layoutopt doc.
2009-10-28 11:39:48 -07:00
Scott Main
66e6925154 am 91bfbfb9: am 08c57535: docs: add 2.0 highlights doc and updated homepage
Merge commit '91bfbfb9e571cd2ee79e69d5fb1d0d2b368223c4' into eclair-mr2

* commit '91bfbfb9e571cd2ee79e69d5fb1d0d2b368223c4':
  docs: add 2.0 highlights doc and updated homepage
2009-10-28 11:39:26 -07:00
Dirk Dougherty
5397650963 am 37ebfad1: am a250f0c8: doc change: fix broken link at top of installing doc
Merge commit '37ebfad1619f250bda4803dfb8683f408d9482cb' into eclair-mr2

* commit '37ebfad1619f250bda4803dfb8683f408d9482cb':
  doc change: fix broken link at top of installing doc
2009-10-28 11:39:04 -07:00
Yu Shan Emily Lau
42ea8dc732 am adf4b4f5: Merge change I96458368 into eclair
Merge commit 'adf4b4f5cd5982a56f8027a5a91b25762dd7b1bd' into eclair-mr2

* commit 'adf4b4f5cd5982a56f8027a5a91b25762dd7b1bd':
  Fixed the H263 video duation which caused the incorrect video validation.
2009-10-28 11:38:34 -07:00
Dave Sparks
5a7691f0e1 am e8543418: Merge change I7c0d20a7 into eclair
Merge commit 'e8543418783f8f8f9a6bafdaa1dd6289661eac85' into eclair-mr2

* commit 'e8543418783f8f8f9a6bafdaa1dd6289661eac85':
  Run the metadataretriever at background priority. Bug 2187133.
2009-10-28 11:38:08 -07:00
Brett Chabot
622b190c87 am b81df8e3: Merge change I5535bbdf into eclair
Merge commit 'b81df8e3a2f72546508fcdf92adc39cfa2985c56' into eclair-mr2

* commit 'b81df8e3a2f72546508fcdf92adc39cfa2985c56':
  Disable flaky and failing tests.
2009-10-28 11:37:42 -07:00
Andreas Huber
013ecbfca2 am 54620b1a: Merge change I6e50a8c6 into eclair
Merge commit '54620b1a77e51b3fa531dbd099bd69c39d7d0029' into eclair-mr2

* commit '54620b1a77e51b3fa531dbd099bd69c39d7d0029':
  Revert "Now that the underlying bug is fixed we can continue using OMX_UseBuffer for this decoder's input buffers."
2009-10-28 11:37:16 -07:00
Jaikumar Ganesh
e1cba3dbad am 9fa7048c: am 6158038a: Merge change I2811f162 into eclair
Merge commit '9fa7048ca3a7b5184ce761bbf908c512d524b9e2' into eclair-mr2-plus-aosp

* commit '9fa7048ca3a7b5184ce761bbf908c512d524b9e2':
  Add Authentication Type field to the APN settings.
2009-10-28 10:37:57 -07:00
Mike Lockwood
5b9dee8c07 am 4dee223c: am 86328a99: LocationManagerService: clear calling identity in mock provider calls.
Merge commit '4dee223c68d98ebac6bb3d91c2d6e47eb2b0a001' into eclair-mr2-plus-aosp

* commit '4dee223c68d98ebac6bb3d91c2d6e47eb2b0a001':
  LocationManagerService: clear calling identity in mock provider calls.
2009-10-28 10:37:43 -07:00
Mike Lockwood
84b0d236a3 am ed7755cc: am 3333fa4f: PowerManagerService: Ensure that recent changes do not effect the hardware ALS case.
Merge commit 'ed7755cc30fe6b2b0254207347629ad0cae094db' into eclair-mr2-plus-aosp

* commit 'ed7755cc30fe6b2b0254207347629ad0cae094db':
  PowerManagerService: Ensure that recent changes do not effect the hardware ALS case.
2009-10-28 10:37:28 -07:00
Eric Laurent
20fcfac829 am 34180d32: am a47d1536: (-s ours) do not merge - Fix for issue 2184627 cherry picked from eclair-mr2
Merge commit '34180d328c57a6a38bc85651fda0e69890ad7a9b' into eclair-mr2-plus-aosp

* commit '34180d328c57a6a38bc85651fda0e69890ad7a9b':
  do not merge - Fix for issue 2184627 cherry picked from eclair-mr2
2009-10-28 10:37:13 -07:00
Andreas Huber
e113d6af62 am 76a54294: Merge change I155e2ad0 into eclair-mr2
Merge commit '76a5429407e821c22508eca92e7475b6433cd668' into eclair-mr2-plus-aosp

* commit '76a5429407e821c22508eca92e7475b6433cd668':
  Re-enable CameraSource.
2009-10-28 10:36:57 -07:00
Jaikumar Ganesh
9fa7048ca3 am 6158038a: Merge change I2811f162 into eclair
Merge commit '6158038a09069bc178970160d4b3667573bfc655' into eclair-mr2

* commit '6158038a09069bc178970160d4b3667573bfc655':
  Add Authentication Type field to the APN settings.
2009-10-28 10:30:11 -07:00
Mike Lockwood
4dee223c68 am 86328a99: LocationManagerService: clear calling identity in mock provider calls.
Merge commit '86328a99bd55532e318441d48ee9eb96cdc42403' into eclair-mr2

* commit '86328a99bd55532e318441d48ee9eb96cdc42403':
  LocationManagerService: clear calling identity in mock provider calls.
2009-10-28 10:28:19 -07:00
Mike Lockwood
ed7755cc30 am 3333fa4f: PowerManagerService: Ensure that recent changes do not effect the hardware ALS case.
Merge commit '3333fa4f3d2e1bd3842fe7d41d19557ff9a98372' into eclair-mr2

* commit '3333fa4f3d2e1bd3842fe7d41d19557ff9a98372':
  PowerManagerService: Ensure that recent changes do not effect the hardware ALS case.
2009-10-28 10:27:45 -07:00
Eric Laurent
34180d328c am a47d1536: (-s ours) do not merge - Fix for issue 2184627 cherry picked from eclair-mr2
Merge commit 'a47d153647d8750b667942ad80e7b905ea98c68b' into eclair-mr2

* commit 'a47d153647d8750b667942ad80e7b905ea98c68b':
  do not merge - Fix for issue 2184627 cherry picked from eclair-mr2
2009-10-28 10:26:33 -07:00
Android (Google) Code Review
76a5429407 Merge change I155e2ad0 into eclair-mr2
* changes:
  Re-enable CameraSource.
2009-10-28 13:25:09 -04:00
Andreas Huber
155e2ad04c Re-enable CameraSource. 2009-10-28 10:15:07 -07:00
Andreas Huber
b1a8f54bf6 am 27123468: Use a simple replacement for String8 that allocates its storage beforehand to avoid reentering the heap while we\'re examining it (leak checker).
Merge commit '27123468b33cb61a1600079d583302b1b078b2ee' into eclair-mr2-plus-aosp

* commit '27123468b33cb61a1600079d583302b1b078b2ee':
  Use a simple replacement for String8 that allocates its storage beforehand to avoid reentering the heap while we're examining it (leak checker).
2009-10-27 16:06:21 -07:00
Andreas Huber
27123468b3 Use a simple replacement for String8 that allocates its storage beforehand to avoid reentering the heap while we're examining it (leak checker). 2009-10-27 15:50:04 -07:00
Leon Scroggins
6ba3ef31fd am bb107bd6: Many fixes to text input in the browser, particularly when moving to a new field.
Merge commit 'bb107bd6f7981cd2b2e31a0afc6f6bf2a6d5118f' into eclair-mr2-plus-aosp

* commit 'bb107bd6f7981cd2b2e31a0afc6f6bf2a6d5118f':
  Many fixes to text input in the browser, particularly when moving to a new field.
2009-10-27 13:20:33 -07:00
Amith Yamasani
678cdbe55e Fix build. 2009-10-27 11:45:08 -07:00
Leon Scroggins
bb107bd6f7 Many fixes to text input in the browser, particularly when moving to a new field.
Remove many instances where we are setting selection unnecessarily.  Instead, only
set the selection due to a click, touch, or inserting a character.  A touch will
now set the selection properly, rather than at the beginning/end, fixing
http://b/issue?id=1650395  Also fixes http://b/issue?id=2208188

Requires a change to external/webkit.
2009-10-27 13:34:45 -04:00
Amith Yamasani
aea1b3b24e Disambiguation between multiple pointers and swipe gestures.
Sometimes quickly touching the screen with two fingers will result
in the firmware thinking one finger moved very quickly. This code
tries to identify the difference between the two based on velocity
of the last N points versus the velocity of the last M points and
figure out if there was mostly acceleration or a sudden deceleration.

It's still not perfect and very dependent on the touch hardware.
2009-10-27 10:27:49 -07:00
Android (Google) Code Review
a2058e4317 Merge change I11c3cdc7 into eclair
* changes:
  Change default TIME_DELAYED_TO_RESTART_RADIO to 60secs from 20secs.
2009-10-27 13:02:43 -04:00
Derek Sollenberger
29abcf9769 am 718d69f9: changing how plugins gain/lose focus.
Merge commit '718d69f931e320b9a8d98371a0b4925d7c2e83f4' into eclair-mr2-plus-aosp

* commit '718d69f931e320b9a8d98371a0b4925d7c2e83f4':
  changing how plugins gain/lose focus.
2009-10-27 08:24:32 -07:00
Derek Sollenberger
718d69f931 changing how plugins gain/lose focus.
Previously we were keeping our own state in the UI thread to
determine when to send events to the plugin. This change removes
that logic and uses the document focus to determine when events
are to be sent. This also fixes problems with the plugins
occasionally not receiving lose focus events.

see bug http://b/2033843
2009-10-27 11:09:17 -04:00
Cary Clark
f751227b84 am 09e383c9: tweak select text
Merge commit '09e383c9ff4a3b762084e999dfb5fdd347abc151' into eclair-mr2-plus-aosp

* commit '09e383c9ff4a3b762084e999dfb5fdd347abc151':
  tweak select text
2009-10-27 08:00:49 -07:00
Cary Clark
09e383c9ff tweak select text
Explicitly draw the region and pointer from java.

Set up the starting selection criteria from both hard keyboard
and menu 'Select Text'.

Add invalidate() to show transition from arrow to ibeam
immediately, and to dismiss copy region immediately.

partially fixes http://b/issue?id=1667690
2009-10-27 10:50:16 -04:00
Mike Lockwood
2d155d264e PowerManagerService: Fix bug resulting in backlights turning on while screen is off.
Fixes bugs b/2216879 and b/2197060

Change-Id: I5de3cbdbc0601dd7950dba74cacfff06d41ad18e
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-10-27 09:47:50 -04:00