6051 Commits

Author SHA1 Message Date
Wink Saville
7a4fb7376b am 595c4092: am 8fb0faf3: Merge change I0a56959e into eclair-mr2
Merge commit '595c40920f31ba7b6674eb341548173e2aaf6ea7'

* commit '595c40920f31ba7b6674eb341548173e2aaf6ea7':
  Implement a HierarchicalStateMachine
2009-12-11 01:40:43 -08:00
Scott Main
f1ec19e0f3 am 4570dfa2: am 7b0463a9: am ed2a70d6: docs: add the Bluetooth developer guide, and make some revisions to the BT javadocs
Merge commit '4570dfa2016fa32b6f7b29aabadb9d708482b94d'

* commit '4570dfa2016fa32b6f7b29aabadb9d708482b94d':
  docs: add the Bluetooth developer guide,
2009-12-10 23:43:12 -08:00
Jaikumar Ganesh
0d04feb300 am a8ba9f20: am 368c332d: am f6e32e72: Merge change Icced7a09 into eclair
Merge commit 'a8ba9f20ea7b3eae0430baefe8681cba285565f4'

* commit 'a8ba9f20ea7b3eae0430baefe8681cba285565f4':
  Maintain a list of all Bluetooth docks.
2009-12-10 23:42:30 -08:00
Wink Saville
595c40920f am 8fb0faf3: Merge change I0a56959e into eclair-mr2
Merge commit '8fb0faf3cc2f792db8cf38fe5ab67c5eab7baa5c' into eclair-mr2-plus-aosp

* commit '8fb0faf3cc2f792db8cf38fe5ab67c5eab7baa5c':
  Implement a HierarchicalStateMachine
2009-12-10 21:24:59 -08:00
Android (Google) Code Review
8fb0faf3cc Merge change I0a56959e into eclair-mr2
* changes:
  Implement a HierarchicalStateMachine
2009-12-10 21:22:19 -08:00
Scott Main
4570dfa201 am 7b0463a9: am ed2a70d6: docs: add the Bluetooth developer guide, and make some revisions to the BT javadocs
Merge commit '7b0463a949b57620680b95e45c66a05f67426b74' into eclair-mr2-plus-aosp

* commit '7b0463a949b57620680b95e45c66a05f67426b74':
  docs: add the Bluetooth developer guide,
2009-12-10 17:53:27 -08:00
Jaikumar Ganesh
a8ba9f20ea am 368c332d: am f6e32e72: Merge change Icced7a09 into eclair
Merge commit '368c332ddc804d5fb0bb2362f658e7a3706fb003' into eclair-mr2-plus-aosp

* commit '368c332ddc804d5fb0bb2362f658e7a3706fb003':
  Maintain a list of all Bluetooth docks.
2009-12-10 17:53:04 -08:00
Scott Main
7b0463a949 am ed2a70d6: docs: add the Bluetooth developer guide, and make some revisions to the BT javadocs
Merge commit 'ed2a70d6495b3f1928e36ad2b00ee4d33b2c0379' into eclair-mr2

* commit 'ed2a70d6495b3f1928e36ad2b00ee4d33b2c0379':
  docs: add the Bluetooth developer guide,
2009-12-10 17:42:55 -08:00
Jaikumar Ganesh
368c332ddc am f6e32e72: Merge change Icced7a09 into eclair
Merge commit 'f6e32e72a902d9a309410bc5306a539ea850159f' into eclair-mr2

* commit 'f6e32e72a902d9a309410bc5306a539ea850159f':
  Maintain a list of all Bluetooth docks.
2009-12-10 17:40:53 -08:00
Jean-Baptiste Queru
80ffd8c5ae resolved conflicts for merge of da9691e9 to master 2009-12-10 15:46:33 -08:00
Adam Powell
da9691e9d6 am 326d808b: Added View#dispatchViewVisibilityChanged and View#onDispatchVisibilityChanged; updated api; tests
Merge commit '326d808b858359464b2ffeb84f2e0a8e0c79b600' into eclair-mr2-plus-aosp

* commit '326d808b858359464b2ffeb84f2e0a8e0c79b600':
  Added View#dispatchViewVisibilityChanged and View#onDispatchVisibilityChanged; updated api; tests
2009-12-10 15:18:43 -08:00
Android (Google) Code Review
d2169dde42 Merge change If3bafe4f
* changes:
  Encrypted File Systems. Recovery changes for framework. Modifications to allow for new call to recovery to toggle EFS settings.
2009-12-10 14:51:23 -08:00
Adam Powell
326d808b85 Added View#dispatchViewVisibilityChanged and View#onDispatchVisibilityChanged; updated api; tests
Reverted a change to InstrumentationTestCase that would have allowed @UiThreadTest on setUp() methods of tests.
2009-12-10 14:49:14 -08:00
Romain Guy
bf77a6e7a1 am a56a3528: am f2f68760: Merge change Ib3d582d7 into eclair-mr2
Merge commit 'a56a3528ae8e42cf01dd0d5c5a1585a90f117011'

* commit 'a56a3528ae8e42cf01dd0d5c5a1585a90f117011':
  Fix crash with @UiThreadTest in InstrumentationTestCase.
2009-12-10 14:43:03 -08:00
Romain Guy
4d0eaf0c7b am 7d26aca8: am f44ecff4: Merge change Id432656e into eclair-mr2
Merge commit '7d26aca8452ce01ea33c0b03ecec392c07bf867b'

* commit '7d26aca8452ce01ea33c0b03ecec392c07bf867b':
  Add support for @UiThreadTest on setUp() and tearDown() in InstrumentationTestCase.
2009-12-10 14:42:18 -08:00
Fred Quintana
34bb115367 am c7afd922: am 97ef7637: - move the EventLog stuff out of ATSA - move the google calendar sync adapter settings out of Settings.java
Merge commit 'c7afd9221babd89ca4acd859c608f41c29f3731b'

* commit 'c7afd9221babd89ca4acd859c608f41c29f3731b':
  - move the EventLog stuff out of ATSA
2009-12-10 14:42:07 -08:00
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
Romain Guy
a56a3528ae am f2f68760: Merge change Ib3d582d7 into eclair-mr2
Merge commit 'f2f68760eb10b52bd53d6a266f9b5e2b06037d9f' into eclair-mr2-plus-aosp

* commit 'f2f68760eb10b52bd53d6a266f9b5e2b06037d9f':
  Fix crash with @UiThreadTest in InstrumentationTestCase.
2009-12-10 13:50:11 -08:00
Romain Guy
b3d582d79d Fix crash with @UiThreadTest in InstrumentationTestCase. 2009-12-10 13:45:31 -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
Romain Guy
7d26aca845 am f44ecff4: Merge change Id432656e into eclair-mr2
Merge commit 'f44ecff46732f30977da91eb9614673bad8282f8' into eclair-mr2-plus-aosp

* commit 'f44ecff46732f30977da91eb9614673bad8282f8':
  Add support for @UiThreadTest on setUp() and tearDown() in InstrumentationTestCase.
2009-12-10 11:59:15 -08:00
Fred Quintana
c7afd9221b am 97ef7637: - move the EventLog stuff out of ATSA - move the google calendar sync adapter settings out of Settings.java
Merge commit '97ef7637c6799e72956db8e08192539f1b1942f6' into eclair-mr2-plus-aosp

* commit '97ef7637c6799e72956db8e08192539f1b1942f6':
  - move the EventLog stuff out of ATSA
2009-12-10 11:55:30 -08:00
Android (Google) Code Review
f44ecff467 Merge change Id432656e into eclair-mr2
* changes:
  Add support for @UiThreadTest on setUp() and tearDown() in InstrumentationTestCase.
2009-12-10 11:54:13 -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
Romain Guy
d432656e60 Add support for @UiThreadTest on setUp() and tearDown() in InstrumentationTestCase. 2009-12-10 11:16:43 -08:00
Fred Quintana
97ef7637c6 - move the EventLog stuff out of ATSA
- move the google calendar sync adapter settings out of Settings.java
2009-12-10 11:16:18 -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
Dianne Hackborn
314664d247 am 68a3b8b6: am 24eca800: Merge change I887f355f into eclair-mr2
Merge commit '68a3b8b66044d0a9fa901ad306fc6db6d13f94d3'

* commit '68a3b8b66044d0a9fa901ad306fc6db6d13f94d3':
  Propagate background scheduling class across processes.
2009-12-10 07:05:18 -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