5602 Commits

Author SHA1 Message Date
Doug Zongker
36b1907693 am fc96523b: am b3c1f1cf: Merge change I7daa7ae8 into eclair-mr2
Merge commit 'fc96523b94ddaad1da39bee0d6861e2186d8479c'

* commit 'fc96523b94ddaad1da39bee0d6861e2186d8479c':
  move event log tags used by SyncAdapter into a local .logtags file
2009-12-10 14:41:31 -08:00
Bjorn Bringert
da157b94df am deb83f99: am 159f0015: Merge change I98819b18 into eclair-mr2
Merge commit 'deb83f9944bb08d1d042330d9f8969f3f6124f3b'

* commit 'deb83f9944bb08d1d042330d9f8969f3f6124f3b':
  Allow resource and file URIs in ImageView.setImageURI()
2009-12-10 14:40:09 -08:00
Bjorn Bringert
e11a001119 am c0c7b32e: am 45e77ce3: Merge change I154386b1 into eclair-mr2
Merge commit 'c0c7b32e0b5ab6af749db638a7f08d8a3767d167'

* commit 'c0c7b32e0b5ab6af749db638a7f08d8a3767d167':
  Use unbundled QSB for global search
2009-12-10 14:39:57 -08:00
Patrick Scott
1baf0871cc am 6f04e61b: am c7f7c940: Merge change Id469ba88 into eclair-mr2
Merge commit '6f04e61b9e8133976a19d863eef63e53857e1060'

* commit '6f04e61b9e8133976a19d863eef63e53857e1060':
  Listen for window orientation events.
2009-12-10 13:31:49 -08:00
Grace Kloba
35fb30b63e am bf0b4da2: am 5f68d6fa: Enable longpress and doubletap to WebKit as touch event if it is requested.
Merge commit 'bf0b4da21fc66aed658608ec2861646c280681e2'

* commit 'bf0b4da21fc66aed658608ec2861646c280681e2':
  Enable longpress and doubletap to WebKit as touch
2009-12-10 13:31:36 -08:00
Patrick Scott
aaeef5cc64 am a14b4890: am a50d4508: Merge change I75481cb8 into eclair-mr2
Merge commit 'a14b4890b914971c01bf130697090e7e775aeab4'

* commit 'a14b4890b914971c01bf130697090e7e775aeab4':
  Check that the resolved activity is not in our package.
2009-12-10 12:17:12 -08:00
Leon Scroggins
613e1632e0 am b23806b9: am 47fabbfc: Pass a message to move the focus when user hits "Next".
Merge commit 'b23806b92f8f5e19a7a73380da4689607c4d4e49'

* commit 'b23806b92f8f5e19a7a73380da4689607c4d4e49':
  Pass a message to move the focus when user hits "Next".
2009-12-10 12:16:57 -08:00
Marco Nelissen
e3d05fcf39 cherry-pick of am 7cd40294: Merge change I2cb78a66 into eclair-mr2
Merge commit '7cd4029473431c56100e52f631b9733829dc3171' into eclair-mr2-plus-aosp

* commit '7cd4029473431c56100e52f631b9733829dc3171':
  Add convenience function to MediaStore to move a playlist item
2009-12-10 11:36:44 -08:00
Fred Quintana
2ec6c56991 am 328c0e79: - removed the concept of Entity from the ContentProvider APIs - removed the parcelling ability from Entity and EntityIterator and made them public - added an EntityIterator abstract implementation that allow easy wrapping of a Cursor - changed the VCard c
Merge commit '328c0e7986aa6bb7752ec6de3da9c999920bb55f' into eclair-mr2-plus-aosp

* commit '328c0e7986aa6bb7752ec6de3da9c999920bb55f':
  - removed the concept of Entity from the ContentProvider APIs
2009-12-10 10:37:52 -08:00
Doug Zongker
fc96523b94 am b3c1f1cf: Merge change I7daa7ae8 into eclair-mr2
Merge commit 'b3c1f1cff4ecf5c88a0bd00d421beeb022bb41e4' into eclair-mr2-plus-aosp

* commit 'b3c1f1cff4ecf5c88a0bd00d421beeb022bb41e4':
  move event log tags used by SyncAdapter into a local .logtags file
2009-12-10 10:21:39 -08:00
Android (Google) Code Review
b3c1f1cff4 Merge change I7daa7ae8 into eclair-mr2
* changes:
  move event log tags used by SyncAdapter into a local .logtags file
2009-12-10 10:17:17 -08:00
Romain Guy
55b2951973 am 274b8c58: am 7b935e84: Merge change Iead0d4d8 into eclair-mr2
Merge commit '274b8c584161342af2d1f6dc616995d98f6796ad'

* commit '274b8c584161342af2d1f6dc616995d98f6796ad':
  Fix the build when ViewDebug.TRACE_RECYCLER is set to true.
2009-12-10 09:12:00 -08:00
Paul Westbrook
b223e93bd2 resolved conflicts for merge of 1cf55c56 to master 2009-12-10 08:51:27 -08:00
Dianne Hackborn
9b902a5266 am eb68a226: am af9788a9: Merge change Ia53c6725 into eclair-mr2
Merge commit 'eb68a226563f60265663f1688dda77c4f909e5de'

* commit 'eb68a226563f60265663f1688dda77c4f909e5de':
  Add bindService API to not bring ot foreground.
2009-12-10 07:55:00 -08:00
Romain Guy
c623ae0122 am e0b52cad: am ea4823c1: Improve javadoc in View.
Merge commit 'e0b52cad927259b1a9ea2e68887dd769e8667faf'

* commit 'e0b52cad927259b1a9ea2e68887dd769e8667faf':
  Improve javadoc in View.
2009-12-10 07:54:26 -08:00
Amith Yamasani
c006604c78 am 774568f7: am 1ee7b645: Merge change I0743a389 into eclair-mr2
Merge commit '774568f73911ae2bb35c816a40d49376ea8300df'

* commit '774568f73911ae2bb35c816a40d49376ea8300df':
  Close popup when Keyboard gets a CANCEL motion event.
2009-12-10 07:53:58 -08:00
Christopher Tate
d1879255c2 am 3a0a9e25: am a5ba0a78: am 767eb427: Merge change If990cab0 into eclair
Merge commit '3a0a9e25a8331e4fb7ea3b7bf7a436db1a155523'

* commit '3a0a9e25a8331e4fb7ea3b7bf7a436db1a155523':
  Make sure to acknowledge stale broadcasts
2009-12-10 07:53:40 -08:00
Grace Kloba
9516bf5647 am 506afbd6: am 3f40bd48: Remove the code where we suspect webkit draw during drag. It was added for the better performance of panning while loading. But it does make sites using touch event look bad as we don\'t have the display tree until touch up.
Merge commit '506afbd600d82a324f59ceb875f664ead4338600'

* commit '506afbd600d82a324f59ceb875f664ead4338600':
  Remove the code where we suspect webkit draw during
2009-12-10 07:53:03 -08:00
Ken Shirriff
630432e424 am d44c2f2c: am 1270e2e2: Merge change I96ddd6e2 into eclair-mr2
Merge commit 'd44c2f2c85c8720763837b89a8988b6e5cc248bf'

* commit 'd44c2f2c85c8720763837b89a8988b6e5cc248bf':
  Migration to TrafficStats.
2009-12-10 07:06:25 -08:00
Bjorn Bringert
507ecd5306 am c99f154b: am dcd8bad3: Merge change Ia28d9547 into eclair-mr2
Merge commit 'c99f154b549ff0bae84b082dc4d80351b341494e'

* commit 'c99f154b549ff0bae84b082dc4d80351b341494e':
  Expose SearchableInfo and getSearchablesInGlobalSearch()
2009-12-10 07:06:00 -08:00
Romain Guy
d35566c77f am 8f4bca2a: am 06ffc12a: Merge change I237c1cee into eclair-mr2
Merge commit '8f4bca2acada86c36c7de59e8891ef120098aa19'

* commit '8f4bca2acada86c36c7de59e8891ef120098aa19':
  Improve exception message thrown when a View's state is of the wrong type.
2009-12-10 07:05:39 -08:00
Leon Scroggins
5b214e0f96 am 9f1ea0d4: am 6be3bf23: Some fixes for positioning the WebTextView.
Merge commit '9f1ea0d47f5aa18cf949593e6bfd36af9c6a55be'

* commit '9f1ea0d47f5aa18cf949593e6bfd36af9c6a55be':
  Some fixes for positioning the WebTextView.
2009-12-10 07:04:57 -08:00
Ken Shirriff
8ea486788f am 0e933c85: am f7d0b013: Add TrafficStats class to SDK.
Merge commit '0e933c853ad53037631e5bca5b4a46f056c1e538'

* commit '0e933c853ad53037631e5bca5b4a46f056c1e538':
  Add TrafficStats class to SDK.
2009-12-10 07:04:31 -08:00
Derek Sollenberger
db78a58667 am 45ccb6a5: am 51ef573a: Switching from activity based full screen plugins to a view system overlay.
Merge commit '45ccb6a55e0c3ec23a5bbf710d0d170bc39985ed'

* commit '45ccb6a55e0c3ec23a5bbf710d0d170bc39985ed':
  Switching from activity based full screen plugins to a view system overlay.
2009-12-10 07:02:04 -08:00
Trevor Johns
936b1ba33d am 15650af4: am 7e42e8f3: am d59fb6e7: Updating list of standard Intents in android.content.Intent documentation.
Merge commit '15650af4ab1df7fb84839162f9409d88cb4a3ccc'

* commit '15650af4ab1df7fb84839162f9409d88cb4a3ccc':
  Updating list of standard Intents in android.content.Intent
2009-12-10 07:01:37 -08:00
Wu-cheng Li
13778accfe am 90073aad: am ebc77994: am 9c79938d: Document that some parameters will not be null and fix getSupportedPictureFormats.
Merge commit '90073aadd5dfdbb0e7ca9b53ae086536f976793f'

* commit '90073aadd5dfdbb0e7ca9b53ae086536f976793f':
  Document that some parameters will not be null and fix getSupportedPictureFormats.
2009-12-10 07:01:12 -08:00
Dianne Hackborn
b2909dbb87 am aeabdf32: am 0766b2d0: Update service example code.
Merge commit 'aeabdf32a2a38c1627102b90628b7261447d3a5c'

* commit 'aeabdf32a2a38c1627102b90628b7261447d3a5c':
  Update service example code.
2009-12-10 07:00:47 -08:00
Fred Quintana
f7ae3c958b am 517ebaa6: am 18ff0e32: am 1067c3cb: Merge change Ia5ef9acd into eclair
Merge commit '517ebaa69a9c4baed99bb5667b956dab129c96e7'

* commit '517ebaa69a9c4baed99bb5667b956dab129c96e7':
  remove an old STOPSHIP comment
2009-12-10 06:59:55 -08:00
Bjorn Bringert
deb83f9944 am 159f0015: Merge change I98819b18 into eclair-mr2
Merge commit '159f0015418955501d8cf2744b0393db2e73f394' into eclair-mr2-plus-aosp

* commit '159f0015418955501d8cf2744b0393db2e73f394':
  Allow resource and file URIs in ImageView.setImageURI()
2009-12-09 23:35:07 -08:00
Bjorn Bringert
c0c7b32e0b am 45e77ce3: Merge change I154386b1 into eclair-mr2
Merge commit '45e77ce36ae1d26bcf35afb1f7662d7b6fb08212' into eclair-mr2-plus-aosp

* commit '45e77ce36ae1d26bcf35afb1f7662d7b6fb08212':
  Use unbundled QSB for global search
2009-12-09 23:34:57 -08:00
Android (Google) Code Review
159f001541 Merge change I98819b18 into eclair-mr2
* changes:
  Allow resource and file URIs in ImageView.setImageURI()
2009-12-09 23:32:58 -08:00
Android (Google) Code Review
45e77ce36a Merge change I154386b1 into eclair-mr2
* changes:
  Use unbundled QSB for global search
2009-12-09 23:32:31 -08:00
Marco Nelissen
92993a620b am 7cd40294: Merge change I2cb78a66 into eclair-mr2
Merge commit '7cd4029473431c56100e52f631b9733829dc3171' into eclair-mr2-plus-aosp

* commit '7cd4029473431c56100e52f631b9733829dc3171':
  Add convenience function to MediaStore to move a playlist item
2009-12-09 16:01:46 -08:00
Patrick Scott
6f04e61b9e am c7f7c940: Merge change Id469ba88 into eclair-mr2
Merge commit 'c7f7c94034ea0708161af9f718678c70b13c9a8d' into eclair-mr2-plus-aosp

* commit 'c7f7c94034ea0708161af9f718678c70b13c9a8d':
  Listen for window orientation events.
2009-12-09 16:01:07 -08:00
Grace Kloba
bf0b4da21f am 5f68d6fa: Enable longpress and doubletap to WebKit as touch event if it is requested.
Merge commit '5f68d6fafc29bb14b4b407b4221395332409fc9c' into eclair-mr2-plus-aosp

* commit '5f68d6fafc29bb14b4b407b4221395332409fc9c':
  Enable longpress and doubletap to WebKit as touch
2009-12-09 16:00:59 -08:00
Fred Quintana
3d2560ad92 am 328c0e79: - removed the concept of Entity from the ContentProvider APIs - removed the parcelling ability from Entity and EntityIterator and made them public - added an EntityIterator abstract implementation that allow easy wrapping of a Cursor - changed the VCard c
Merge commit '328c0e7986aa6bb7752ec6de3da9c999920bb55f' into eclair-mr2-plus-aosp

* commit '328c0e7986aa6bb7752ec6de3da9c999920bb55f':
  - removed the concept of Entity from the ContentProvider APIs
2009-12-09 16:00:31 -08:00
Patrick Scott
a14b4890b9 am a50d4508: Merge change I75481cb8 into eclair-mr2
Merge commit 'a50d450863cb84805ac6809a4c1f7b83984da1ee' into eclair-mr2-plus-aosp

* commit 'a50d450863cb84805ac6809a4c1f7b83984da1ee':
  Check that the resolved activity is not in our package.
2009-12-09 15:59:44 -08:00
Leon Scroggins
b23806b92f am 47fabbfc: Pass a message to move the focus when user hits "Next".
Merge commit '47fabbfcbf99e5e3b73a6ee09059c77932ef1b7b' into eclair-mr2-plus-aosp

* commit '47fabbfcbf99e5e3b73a6ee09059c77932ef1b7b':
  Pass a message to move the focus when user hits "Next".
2009-12-09 15:59:30 -08:00
Romain Guy
274b8c5841 am 7b935e84: Merge change Iead0d4d8 into eclair-mr2
Merge commit '7b935e84264fa1cfe36a1fa9f8cb5954d09cb9ef' into eclair-mr2-plus-aosp

* commit '7b935e84264fa1cfe36a1fa9f8cb5954d09cb9ef':
  Fix the build when ViewDebug.TRACE_RECYCLER is set to true.
2009-12-09 15:56:20 -08:00
Paul Westbrook
1cf55c566c am b882b361: Merge change Iee7f2457 into eclair-mr2
Merge commit 'b882b361f123e4ef7870c99e8a9fd9e1be48e396' into eclair-mr2-plus-aosp

* commit 'b882b361f123e4ef7870c99e8a9fd9e1be48e396':
  Deleted Gmail.java from frameworks.  Previously it had been moved to vendor/google/.../Gmail/...
2009-12-09 15:55:42 -08:00
Dianne Hackborn
eb68a22656 am af9788a9: Merge change Ia53c6725 into eclair-mr2
Merge commit 'af9788a9d6c238dd97f40dc020e036739daf0811' into eclair-mr2-plus-aosp

* commit 'af9788a9d6c238dd97f40dc020e036739daf0811':
  Add bindService API to not bring ot foreground.
2009-12-09 15:55:28 -08:00
Romain Guy
e0b52cad92 am ea4823c1: Improve javadoc in View.
Merge commit 'ea4823c1c7fdee093789850d0f76a3df22ca58d2' into eclair-mr2-plus-aosp

* commit 'ea4823c1c7fdee093789850d0f76a3df22ca58d2':
  Improve javadoc in View.
2009-12-09 15:53:26 -08:00
Amith Yamasani
774568f739 am 1ee7b645: Merge change I0743a389 into eclair-mr2
Merge commit '1ee7b6453aaae47a6493a97790b9483aca1556c9' into eclair-mr2-plus-aosp

* commit '1ee7b6453aaae47a6493a97790b9483aca1556c9':
  Close popup when Keyboard gets a CANCEL motion event.
2009-12-09 15:53:02 -08:00
Christopher Tate
3a0a9e25a8 am a5ba0a78: am 767eb427: Merge change If990cab0 into eclair
Merge commit 'a5ba0a78811fcd5d3470bfa09df3e0106b77567e' into eclair-mr2-plus-aosp

* commit 'a5ba0a78811fcd5d3470bfa09df3e0106b77567e':
  Make sure to acknowledge stale broadcasts
2009-12-09 15:52:43 -08:00
Grace Kloba
506afbd600 am 3f40bd48: Remove the code where we suspect webkit draw during drag. It was added for the better performance of panning while loading. But it does make sites using touch event look bad as we don\'t have the display tree until touch up.
Merge commit '3f40bd48d278a40603f3f7d7b9d602ecbc09246d' into eclair-mr2-plus-aosp

* commit '3f40bd48d278a40603f3f7d7b9d602ecbc09246d':
  Remove the code where we suspect webkit draw during
2009-12-09 15:51:58 -08:00
Ken Shirriff
d44c2f2c85 am 1270e2e2: Merge change I96ddd6e2 into eclair-mr2
Merge commit '1270e2e22b0b3f0705cee2b82788d8dc3fb03cdb' into eclair-mr2-plus-aosp

* commit '1270e2e22b0b3f0705cee2b82788d8dc3fb03cdb':
  Migration to TrafficStats.
2009-12-09 15:50:28 -08:00
Bjorn Bringert
c99f154b54 am dcd8bad3: Merge change Ia28d9547 into eclair-mr2
Merge commit 'dcd8bad3aad8e4af6654ecd1776ebe5a18de94e3' into eclair-mr2-plus-aosp

* commit 'dcd8bad3aad8e4af6654ecd1776ebe5a18de94e3':
  Expose SearchableInfo and getSearchablesInGlobalSearch()
2009-12-09 15:50:05 -08:00
Romain Guy
8f4bca2aca am 06ffc12a: Merge change I237c1cee into eclair-mr2
Merge commit '06ffc12a398bf16fb360d74b7511d946a73a741e' into eclair-mr2-plus-aosp

* commit '06ffc12a398bf16fb360d74b7511d946a73a741e':
  Improve exception message thrown when a View's state is of the wrong type.
2009-12-09 15:49:29 -08:00
Leon Scroggins
9f1ea0d47f am 6be3bf23: Some fixes for positioning the WebTextView.
Merge commit '6be3bf2393030549306b438b9b17085035729135' into eclair-mr2-plus-aosp

* commit '6be3bf2393030549306b438b9b17085035729135':
  Some fixes for positioning the WebTextView.
2009-12-09 15:48:39 -08:00
Ken Shirriff
0e933c853a am f7d0b013: Add TrafficStats class to SDK.
Merge commit 'f7d0b01387c10f93bf17981d45087810c80f0902' into eclair-mr2-plus-aosp

* commit 'f7d0b01387c10f93bf17981d45087810c80f0902':
  Add TrafficStats class to SDK.
2009-12-09 15:48:11 -08:00