Commit Graph

5390 Commits

Author SHA1 Message Date
Amith Yamasani
9ce13a3993 am 1224b101: am 42c4c589: am a9791d30: Merge change Iae3ed706 into eclair
Merge commit '1224b1016d2a4ec172f13741e632e59c7528b319'

* commit '1224b1016d2a4ec172f13741e632e59c7528b319':
  Add new setting for notification light pulsing. Bug #2238250
2009-12-02 20:29:40 -08:00
Leon Scroggins
736f0092ff am 1e8c9625: am cfc2915d: In setDefaultSelection ensure that webkit is notified of the new selection.
Merge commit '1e8c96251ca885db700978a3566a67af27099b02'

* commit '1e8c96251ca885db700978a3566a67af27099b02':
  In setDefaultSelection ensure that webkit is notified of the new selection.
2009-12-02 20:25:53 -08:00
Dianne Hackborn
8a1b6decfb am e2585127: am 9ed7dc10: am 5886050f: Merge change I0d8f7593 into eclair
Merge commit 'e2585127974ce972a013407e2af95d8776a99a8e'

* commit 'e2585127974ce972a013407e2af95d8776a99a8e':
  Fix issue #2296457: PackageManager.addPackageToPreferred needs to a no-op
2009-12-02 20:24:44 -08:00
Amith Yamasani
1224b1016d am 42c4c589: am a9791d30: Merge change Iae3ed706 into eclair
Merge commit '42c4c589003c029309c823e8f06ed00b3cdb21de' into eclair-mr2-plus-aosp

* commit '42c4c589003c029309c823e8f06ed00b3cdb21de':
  Add new setting for notification light pulsing. Bug #2238250
2009-12-02 09:57:47 -08:00
Amith Yamasani
42c4c58900 am a9791d30: Merge change Iae3ed706 into eclair
Merge commit 'a9791d304b8ec03e04ad4533b1820a64794e1bcc' into eclair-mr2

* commit 'a9791d304b8ec03e04ad4533b1820a64794e1bcc':
  Add new setting for notification light pulsing. Bug #2238250
2009-12-02 09:50:40 -08:00
Android (Google) Code Review
a9791d304b Merge change Iae3ed706 into eclair
* changes:
  Add new setting for notification light pulsing. Bug #2238250
2009-12-02 08:35:55 -08:00
Leon Scroggins
1e8c96251c am cfc2915d: In setDefaultSelection ensure that webkit is notified of the new selection.
Merge commit 'cfc2915d926cee14380b54d0960262e748eed4f5' into eclair-mr2-plus-aosp

* commit 'cfc2915d926cee14380b54d0960262e748eed4f5':
  In setDefaultSelection ensure that webkit is notified of the new selection.
2009-12-02 07:42:26 -08:00
Leon Scroggins
cfc2915d92 In setDefaultSelection ensure that webkit is notified of the new selection.
Fix for http://b/issue?id=2254732
2009-12-02 10:27:22 -05:00
Dianne Hackborn
e258512797 am 9ed7dc10: am 5886050f: Merge change I0d8f7593 into eclair
Merge commit '9ed7dc10d263a505da32522139098f085fee811a' into eclair-mr2-plus-aosp

* commit '9ed7dc10d263a505da32522139098f085fee811a':
  Fix issue #2296457: PackageManager.addPackageToPreferred needs to a no-op
2009-12-02 05:35:46 -08:00
Dianne Hackborn
9ed7dc10d2 am 5886050f: Merge change I0d8f7593 into eclair
Merge commit '5886050fad97923c33cbc831fe07a5b1746b2b58' into eclair-mr2

* commit '5886050fad97923c33cbc831fe07a5b1746b2b58':
  Fix issue #2296457: PackageManager.addPackageToPreferred needs to a no-op
2009-12-02 05:26:12 -08:00
Romain Guy
f00c322952 am e8b002ba: am f7b4accb: Fix scroll jump in ScrollView.
Merge commit 'e8b002ba63dd5302ca679016cae0f4242d1a93e9'

* commit 'e8b002ba63dd5302ca679016cae0f4242d1a93e9':
  Fix scroll jump in ScrollView.
2009-12-01 19:12:40 -08:00
Romain Guy
e8b002ba63 am f7b4accb: Fix scroll jump in ScrollView.
Merge commit 'f7b4accbda1a4d98a5fadbf3984cb9666a4fe9e9' into eclair-mr2-plus-aosp

* commit 'f7b4accbda1a4d98a5fadbf3984cb9666a4fe9e9':
  Fix scroll jump in ScrollView.
2009-12-01 19:05:57 -08:00
Amith Yamasani
ae3ed70670 Add new setting for notification light pulsing. Bug #2238250
New System setting and code to set the defaults on upgrade.
2009-12-01 19:02:05 -08:00
Romain Guy
f7b4accbda Fix scroll jump in ScrollView.
If a touch event was targeted at a ScrollView child, the content would jump after
the user moved her finger by the required threshold. This is inconsistent with
ListView's behavior.

Fixes #2296622.
2009-12-01 18:58:46 -08:00
Romain Guy
d2ad57d9ea am 9e2d2e74: am cf98f426: Merge change I325e22ca into eclair-mr2
Merge commit '9e2d2e746bc1310f87da84c93b95584ac99a6c86'

* commit '9e2d2e746bc1310f87da84c93b95584ac99a6c86':
  Fix a leak in WebView.
2009-12-01 17:27:21 -08:00
Vasu Nori
fe124cffd8 am 3414c67a: am 1533aed6: Merge change Ib1dd3235 into eclair-mr2
Merge commit '3414c67afaf745400735f27eb1aad7dbf5e79423'

* commit '3414c67afaf745400735f27eb1aad7dbf5e79423':
  fix NPE. don't release an already released compiledSql obj
2009-12-01 17:25:55 -08:00
Jaikumar Ganesh
bec1634f21 am 4b9e9c37: am 03cb1f15: Merge change I249345ee into eclair-mr2
Merge commit '4b9e9c37d56e4cd8e948698fb6ac948d0f875544'

* commit '4b9e9c37d56e4cd8e948698fb6ac948d0f875544':
  Add AUTO_CONNECT priority for Headset profile.
2009-12-01 17:25:25 -08:00
Derek Sollenberger
5b39125807 am 079324bf: am 732a1223: Merge change I42d00fbe into eclair-mr2
Merge commit '079324bf5b0713a698c42c9fb4377ef8851c404b'

* commit '079324bf5b0713a698c42c9fb4377ef8851c404b':
  fix issue with plugin surfaces not updating properly within the view system.
2009-12-01 17:24:24 -08:00
Romain Guy
9e2d2e746b am cf98f426: Merge change I325e22ca into eclair-mr2
Merge commit 'cf98f4268cc70228ef49350f1ccef1266f2e3cf8' into eclair-mr2-plus-aosp

* commit 'cf98f4268cc70228ef49350f1ccef1266f2e3cf8':
  Fix a leak in WebView.
2009-12-01 17:11:38 -08:00
Vasu Nori
3414c67afa am 1533aed6: Merge change Ib1dd3235 into eclair-mr2
Merge commit '1533aed6d90b776c815bae819d1413064aa1f0d9' into eclair-mr2-plus-aosp

* commit '1533aed6d90b776c815bae819d1413064aa1f0d9':
  fix NPE. don't release an already released compiledSql obj
2009-12-01 17:08:38 -08:00
Jaikumar Ganesh
4b9e9c37d5 am 03cb1f15: Merge change I249345ee into eclair-mr2
Merge commit '03cb1f15ca73900f62c12694e05bb0b0e0b6669d' into eclair-mr2-plus-aosp

* commit '03cb1f15ca73900f62c12694e05bb0b0e0b6669d':
  Add AUTO_CONNECT priority for Headset profile.
2009-12-01 17:06:59 -08:00
Derek Sollenberger
079324bf5b am 732a1223: Merge change I42d00fbe into eclair-mr2
Merge commit '732a1223b21cef3561ffbbb9f6ec2d2d2a8b5e5c' into eclair-mr2-plus-aosp

* commit '732a1223b21cef3561ffbbb9f6ec2d2d2a8b5e5c':
  fix issue with plugin surfaces not updating properly within the view system.
2009-12-01 17:05:18 -08:00
Android (Google) Code Review
cf98f4268c Merge change I325e22ca into eclair-mr2
* changes:
  Fix a leak in WebView.
2009-12-01 16:40:07 -08:00
Romain Guy
01d0fbfa68 Fix a leak in WebView.
Fixes #2296601.

WebView and its related APIs are keeping static objects that hold references to
Context instance. This could cause applications to leak their first Activity
and all the associated resources.
2009-12-01 16:37:59 -08:00
Android (Google) Code Review
5886050fad Merge change I0d8f7593 into eclair
* changes:
  Fix issue #2296457: PackageManager.addPackageToPreferred needs to a no-op
2009-12-01 15:57:50 -08:00
Dianne Hackborn
a7ca0e5e32 Fix issue #2296457: PackageManager.addPackageToPreferred needs to a no-op
Change-Id: I0d8f75938226e1bb49cf7b1154445631b0bb0bc9
2009-12-01 14:31:55 -08:00
Android (Google) Code Review
1533aed6d9 Merge change Ib1dd3235 into eclair-mr2
* changes:
  fix NPE. don't release an already released compiledSql obj
2009-12-01 14:24:52 -08:00
Vasu Nori
b1dd3235a9 fix NPE. don't release an already released compiledSql obj 2009-12-01 14:16:24 -08:00
Android (Google) Code Review
03cb1f15ca Merge change I249345ee into eclair-mr2
* changes:
  Add AUTO_CONNECT priority for Headset profile.
2009-12-01 12:45:49 -08:00
Android (Google) Code Review
732a1223b2 Merge change I42d00fbe into eclair-mr2
* changes:
  fix issue with plugin surfaces not updating properly within the view system.
2009-12-01 12:26:54 -08:00
Derek Sollenberger
42d00fbe55 fix issue with plugin surfaces not updating properly within the view system. 2009-12-01 15:19:42 -05:00
Leon Scroggins
db08d5cd44 DO NOT MERGE.
Fix for http://b/issue?id=2292512

When pressing the trackball on a WebTextView, open the IME.

Change-Id: I5ea74ca7ce51ac509dc8649b8f8d1869287bb7a9
2009-12-01 14:42:55 -05:00
Leon Scroggins
123da9e933 am e459aa64: am ed90811e: Do not peform a click/move if longpress has been performed in WebTextView.
Merge commit 'e459aa64515f91b494843d2eb2852be2da3d1628'

* commit 'e459aa64515f91b494843d2eb2852be2da3d1628':
  Do not peform a click/move if longpress has been performed in WebTextView.
2009-12-01 09:20:19 -08:00
Derek Sollenberger
acd9492cca am d9342817: am 51e45ff0: Cleanup how a plugin goes full-screen.
Merge commit 'd93428177a3b54a5fdb9b660a04ec4001cd0efb6'

* commit 'd93428177a3b54a5fdb9b660a04ec4001cd0efb6':
  Cleanup how a plugin goes full-screen.
2009-12-01 09:15:19 -08:00
Jaikumar Ganesh
c8b99148e9 am 7e8ebcea: am e34fbbd7: Merge change I77b4ad0e into eclair-mr2
Merge commit '7e8ebcead7469032e08c4cb9e5bda3d73961f0b3'

* commit '7e8ebcead7469032e08c4cb9e5bda3d73961f0b3':
  Register Handsfree profile before headset profile.
2009-12-01 09:12:56 -08:00
Leon Scroggins
e459aa6451 am ed90811e: Do not peform a click/move if longpress has been performed in WebTextView.
Merge commit 'ed90811e711065bcc82a45f4173587cd95ef6b6f' into eclair-mr2-plus-aosp

* commit 'ed90811e711065bcc82a45f4173587cd95ef6b6f':
  Do not peform a click/move if longpress has been performed in WebTextView.
2009-12-01 09:12:01 -08:00
Mike Lockwood
4cbe8ef11e am 15740edd: am b70da2bb: Merge change I1c281504 into eclair-mr2
Merge commit '15740edd2ac0026e97699028d07e6b0e773d3643'

* commit '15740edd2ac0026e97699028d07e6b0e773d3643':
  Remove some unused window manager methods.
2009-12-01 09:10:03 -08:00
Leon Scroggins
ed90811e71 Do not peform a click/move if longpress has been performed in WebTextView. 2009-12-01 11:39:46 -05:00
Derek Sollenberger
d93428177a am 51e45ff0: Cleanup how a plugin goes full-screen.
Merge commit '51e45ff0d53ce299be316e14e48cdd3e3a51d0b0' into eclair-mr2-plus-aosp

* commit '51e45ff0d53ce299be316e14e48cdd3e3a51d0b0':
  Cleanup how a plugin goes full-screen.
2009-12-01 06:14:33 -08:00
Derek Sollenberger
51e45ff0d5 Cleanup how a plugin goes full-screen.
The plugin activity now fetches the plugin's existing java class from native code instead of creating a new one.
2009-12-01 08:50:24 -05:00
Jaikumar Ganesh
7e8ebcead7 am e34fbbd7: Merge change I77b4ad0e into eclair-mr2
Merge commit 'e34fbbd739329e5aeda2c1a2ef26b96bb1ae42fa' into eclair-mr2-plus-aosp

* commit 'e34fbbd739329e5aeda2c1a2ef26b96bb1ae42fa':
  Register Handsfree profile before headset profile.
2009-11-30 16:40:52 -08:00
Jaikumar Ganesh
5f24a24004 Register Handsfree profile before headset profile. DO NOT MERGE.
There is a delay between registering the two profiles,
and handsfree profile is a superset of the headset profile.
So some devices do an SDP and get the headset profile record
before we have registered the handsfree profile.

a) We can reject all incoming connections till all profiles are
registered, but then this would mean we connect later in some cases.
Registering profiles in this order seems fine to me.

Note: There is a also the need to fix forking sdptool to register
profiles, which would obliviate the need to wait 500 msecs between
profile registrations.

Bug: 2293792
Dr No: Eastham
2009-11-30 16:37:18 -08:00
Android (Google) Code Review
e34fbbd739 Merge change I77b4ad0e into eclair-mr2
* changes:
  Register Handsfree profile before headset profile.
2009-11-30 16:35:43 -08:00
Jaikumar Ganesh
77b4ad0e49 Register Handsfree profile before headset profile.
There is a delay between registering the two profiles,
and handsfree profile is a superset of the headset profile.
So some devices do an SDP and get the headset profile record
before we have registered the handsfree profile.

a) We can reject all incoming connections till all profiles are
registered, but then this would mean we connect later in some cases.
Registering profiles in this order seems fine to me.

Note: There is a also the need to fix forking sdptool to register
profiles, which would obliviate the need to wait 500 msecs between
profile registrations.
2009-11-30 14:17:30 -08:00
Jaikumar Ganesh
249345ee5a Add AUTO_CONNECT priority for Headset profile.
Also, don't set priority to ON while disconnecting.
This logic has been pushed up to the Settings app.
2009-11-30 14:06:59 -08:00
Robert Greenwalt
5154ae7665 Cleanup ConnectivityServices network configuration
Don't instantiate objects not needed for the device.

bug: 2226064
2009-11-30 12:56:02 -08:00
Mike Lockwood
15740edd2a am b70da2bb: Merge change I1c281504 into eclair-mr2
Merge commit 'b70da2bbc594b093472d5333386d79f677fd9e01' into eclair-mr2-plus-aosp

* commit 'b70da2bbc594b093472d5333386d79f677fd9e01':
  Remove some unused window manager methods.
2009-11-30 11:00:34 -08:00
Android (Google) Code Review
b70da2bbc5 Merge change I1c281504 into eclair-mr2
* changes:
  Remove some unused window manager methods.
2009-11-30 10:54:28 -08:00
Derek Sollenberger
7179339cdf am 4cab4e2b: am cb37e715: Refactoring plugins to use new java interfaces.
Merge commit '4cab4e2bf66a9193e0fe049b078158107a5a8fc0'

* commit '4cab4e2bf66a9193e0fe049b078158107a5a8fc0':
  Refactoring plugins to use new java interfaces.
2009-11-30 08:02:06 -08:00
Derek Sollenberger
4cab4e2bf6 am cb37e715: Refactoring plugins to use new java interfaces.
Merge commit 'cb37e71509da43e0d8d809591b09e8f5a582b5cd' into eclair-mr2-plus-aosp

* commit 'cb37e71509da43e0d8d809591b09e8f5a582b5cd':
  Refactoring plugins to use new java interfaces.
2009-11-30 07:55:59 -08:00