6292 Commits

Author SHA1 Message Date
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
Bjorn Bringert
acdef59d66 Fix TabHost NPE when there are no tabs
Fixes http://b/issue?id=2318588

Change-Id: If90ee7e2b777e4c77fdd0ae768d1ececa792ee1b
2009-12-11 15:48:31 +00: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
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
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
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
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
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
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
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
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
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
Scott Main
ed2a70d649 docs: add the Bluetooth developer guide,
and make some revisions to the BT javadocs
2009-12-09 17:59:38 -08:00
Android (Google) Code Review
282a742347 Merge change I3c299167 into eclair
* changes:
  Import revised translations.  DO NOT MERGE
2009-12-09 17:59:07 -08:00
Eric Fischer
3c299167a4 Import revised translations. DO NOT MERGE 2009-12-09 17:06:04 -08:00
Jaikumar Ganesh
6e9c443460 Maintain a list of all Bluetooth docks.
With this change, isBluetoothDock API can be used anytime and is not in tied
to dock state. The Dock State is a sticky intent so users
can query for the dock state.

Dr No: Eastham
Bug: 2133530
2009-12-09 16:10:38 -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
Jack Palevich
74befcc7fd am 981ccfbb: Implement Matrix Palette extension.
Merge commit '981ccfbbfd737e2bdf0cedec0089975f91fd4e0a' into eclair-mr2-plus-aosp

* commit '981ccfbbfd737e2bdf0cedec0089975f91fd4e0a':
  Implement Matrix Palette extension.
2009-12-09 15:59:08 -08:00
Jack Palevich
00666295a0 am 3608891b: Add a Java API for OpenGL ES 2.0.
Merge commit '3608891b83af9fbd1af9b9a411f2a90e52353ff8' into eclair-mr2-plus-aosp

* commit '3608891b83af9fbd1af9b9a411f2a90e52353ff8':
  Add a Java API for OpenGL ES 2.0.
2009-12-09 15:58:35 -08:00
Romain Guy
cfccf5a1d3 am 11480065: Add new white style for ExpandableListView.
Merge commit '114800653ca4575ec485a04c64889d98b40237e4' into eclair-mr2-plus-aosp

* commit '114800653ca4575ec485a04c64889d98b40237e4':
  Add new white style for ExpandableListView.
2009-12-09 15:57:15 -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