7309 Commits

Author SHA1 Message Date
Mike Reed
d287a968bb am be35a4fd: am 6cb69c7d: Merge change I8b302097 into eclair-mr2
Merge commit 'be35a4fd8c26749aba27731270f75273dc1590fe'

* commit 'be35a4fd8c26749aba27731270f75273dc1590fe':
  Update the zoom buttons after moving to a new page.
2009-12-11 08:50:35 -08:00
Mike Reed
be35a4fd8c am 6cb69c7d: Merge change I8b302097 into eclair-mr2
Merge commit '6cb69c7d7496943cec7913a3a7ffab7f6d75e584' into eclair-mr2-plus-aosp

* commit '6cb69c7d7496943cec7913a3a7ffab7f6d75e584':
  Update the zoom buttons after moving to a new page.
2009-12-11 08:44:40 -08:00
Android (Google) Code Review
6cb69c7d74 Merge change I8b302097 into eclair-mr2
* changes:
  Update the zoom buttons after moving to a new page.
2009-12-11 08:42:13 -08:00
Maryam Garrett
13c6f6887a am fe9b503e: am 946bfa49: Merge change Ida4d6ab0 into eclair-mr2
Merge commit 'fe9b503e57e3efc1909121db65dd470d908cc938'

* commit 'fe9b503e57e3efc1909121db65dd470d908cc938':
  Allows users to scroll while in select mode.
2009-12-11 06:31:02 -08:00
Maryam Garrett
fe9b503e57 am 946bfa49: Merge change Ida4d6ab0 into eclair-mr2
Merge commit '946bfa490a4df62bfb48e8017c329b052e3e905e' into eclair-mr2-plus-aosp

* commit '946bfa490a4df62bfb48e8017c329b052e3e905e':
  Allows users to scroll while in select mode.
2009-12-11 06:27:21 -08:00
Android (Google) Code Review
946bfa490a Merge change Ida4d6ab0 into eclair-mr2
* changes:
  Allows users to scroll while in select mode.
2009-12-11 06:22:12 -08:00
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
Mike Reed
8b30209727 Update the zoom buttons after moving to a new page.
Move set VISIBLE out of updateZoomButtonsEnabled.
And add it to a place it needs it.

Fix http://b/issue?id=2257742
2009-12-10 17:52:10 -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
Maryam Garrett
ab9289320f Allows users to scroll while in select mode.
This change allows the user to select-n-scroll. While a user
is in select mode, and they try to scroll, the textbox will
scroll in the direction of the selection, and expand the selection.
2009-12-10 16:00:32 -05: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
Jean-Baptiste Queru
513b7234a6 use a fixed value for public ID 2009-12-10 11:14:41 -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
Jean-Baptiste Queru
a74df10ac2 resolved conflicts for merge of cfccf5a1 to master 2009-12-10 09:19:02 -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