Commit Graph

8810 Commits

Author SHA1 Message Date
Jean-Michel Trivi
10ec8aed0b am 6608bd0d: am 86ed86d2: Merge change I0f73439a into eclair
Merge commit '6608bd0d3af3f9c365b73f8b19d9ec0b7d5ee70b' into eclair-mr2-plus-aosp

* commit '6608bd0d3af3f9c365b73f8b19d9ec0b7d5ee70b':
  Partially fix bug 2111240 Detect docking / undocking event by reporting
2009-12-10 16:58:35 -08:00
Jason Sams
74ea040af0 am 8f31c230: am 57ce0888: Merge change Id22c0137 into eclair
Merge commit '8f31c23021a3f8164eee08cf904c3f083ddfc3d2' into eclair-mr2-plus-aosp

* commit '8f31c23021a3f8164eee08cf904c3f083ddfc3d2':
  Throttle low priority RS threads by sleeping once per frame to avoid starving other apps.
2009-12-10 16:58:28 -08:00
Mathias Agopian
661cb51a1a am ae5bd2b9: am d8c752ef: Merge change Ib548dbb2 into eclair
Merge commit 'ae5bd2b9cc36a21b890ded808d9374ab02364d1d' into eclair-mr2-plus-aosp

* commit 'ae5bd2b9cc36a21b890ded808d9374ab02364d1d':
  improve video performance to minimize the tearing effect seen in 720p movies
2009-12-10 16:58:18 -08:00
Jean-Michel Trivi
1aa171322a am 86ed86d2: Merge change I0f73439a into eclair
Merge commit '86ed86d2260932bdf2217b1d8431ac9e04d47534' into eclair-mr2

* commit '86ed86d2260932bdf2217b1d8431ac9e04d47534':
  Partially fix bug 2111240 Detect docking / undocking event by reporting
2009-12-10 16:46:13 -08:00
Jason Sams
1c3bb3f985 am 57ce0888: Merge change Id22c0137 into eclair
Merge commit '57ce0888fcb1376b385c3dab5e4262793acaaf16' into eclair-mr2

* commit '57ce0888fcb1376b385c3dab5e4262793acaaf16':
  Throttle low priority RS threads by sleeping once per frame to avoid starving other apps.
2009-12-10 16:45:22 -08:00
Mathias Agopian
495c1be363 am d8c752ef: Merge change Ib548dbb2 into eclair
Merge commit 'd8c752ef74bc6d8b412defe35caf1a19be15eb8b' into eclair-mr2

* commit 'd8c752ef74bc6d8b412defe35caf1a19be15eb8b':
  improve video performance to minimize the tearing effect seen in 720p movies
2009-12-10 16:43:09 -08:00
Adam Powell
83786300ea 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
Romain Guy
03f38be81d 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
Android (Google) Code Review
39dd163183 Merge change Ib3d582d7 into eclair-mr2
* changes:
  Fix crash with @UiThreadTest in InstrumentationTestCase.
2009-12-10 13:46:10 -08:00
Andreas Huber
fa8dceeeea am eec100b2: Merge change If0d04246 into eclair-mr2
Merge commit 'eec100b2f44caaea048d3abd898df3c7308865d5' into eclair-mr2-plus-aosp

* commit 'eec100b2f44caaea048d3abd898df3c7308865d5':
  Don't count empty buffers when computing the frame rate.
2009-12-10 13:14:33 -08:00
Android (Google) Code Review
6406aba945 Merge change If0d04246 into eclair-mr2
* changes:
  Don't count empty buffers when computing the frame rate.
2009-12-10 13:11:50 -08:00
Andreas Huber
3416c15e0d am 6ae24d93: Merge change I3c01bb62 into eclair-mr2
Merge commit '6ae24d9365e21ac2770f2354cc1631751bffe3e6' into eclair-mr2-plus-aosp

* commit '6ae24d9365e21ac2770f2354cc1631751bffe3e6':
  Adding copyright headers to recently introduced decoder source files.
2009-12-10 12:42:18 -08:00
Android (Google) Code Review
49890fdd68 Merge change I3c01bb62 into eclair-mr2
* changes:
  Adding copyright headers to recently introduced decoder source files.
2009-12-10 12:37:59 -08:00
Andreas Huber
785e0eaf75 am 987e7fb2: Merge change I9a275773 into eclair-mr2
Merge commit '987e7fb2d43130deb756353ca8f098b0a0a3beeb' into eclair-mr2-plus-aosp

* commit '987e7fb2d43130deb756353ca8f098b0a0a3beeb':
  Initial check in of AMR (NB and WB) decoders based on PV source code.
2009-12-10 12:32:31 -08:00
Android (Google) Code Review
4cf3d84549 Merge change I9a275773 into eclair-mr2
* changes:
  Initial check in of AMR (NB and WB) decoders based on PV source code.
2009-12-10 12:29:39 -08:00
Romain Guy
0634f06b97 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
9c2b636c7f 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
55f78f8ef6 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
Doug Zongker
8011c34fc4 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
0df13ef9cc 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
5bae9f5eb3 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
c94294fe69 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
07b4185c74 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
c2f49e67e9 Merge change I154386b1 into eclair-mr2
* changes:
  Use unbundled QSB for global search
2009-12-09 23:32:31 -08:00
Marco Nelissen
47890387b5 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
dbddc2f308 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
92ac82b492 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
e539e90e97 am 029074ff: fix build
Merge commit '029074ff0fca198676997c7453cfffa932361081' into eclair-mr2-plus-aosp

* commit '029074ff0fca198676997c7453cfffa932361081':
  fix build
2009-12-09 16:00:48 -08:00
Fred Quintana
6933d081df am 563bfade: fix a build breakage
Merge commit '563bfade6601f3410681b3cd8b069ed22af5b048' into eclair-mr2-plus-aosp

* commit '563bfade6601f3410681b3cd8b069ed22af5b048':
  fix a build breakage
2009-12-09 16:00:40 -08:00
Fred Quintana
e0ddb4da24 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
d6ff12d85f 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
3ba1818f59 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
36a0fa910e 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
ab30fae6af am aa396b96: Unhide the Android OpenGL ES 2.0 API
Merge commit 'aa396b9610f339cf280159144fbea47506f060e7' into eclair-mr2-plus-aosp

* commit 'aa396b9610f339cf280159144fbea47506f060e7':
  Unhide the Android OpenGL ES 2.0 API
2009-12-09 15:58:56 -08:00
Jack Palevich
3b28db5f11 am 0dce2dd2: Extend GLSurfaceView to make it easy to create an OpenGL ES 2.0 context
Merge commit '0dce2dd26699e4dbfba8b8c5ea01f7fd03369e02' into eclair-mr2-plus-aosp

* commit '0dce2dd26699e4dbfba8b8c5ea01f7fd03369e02':
  Extend GLSurfaceView to make it easy to create an OpenGL ES 2.0 context
2009-12-09 15:58:45 -08:00
Jack Palevich
ea994bdc8f 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
Dianne Hackborn
d9a5712168 am 9fbb534e: Merge change Iafbeb31b into eclair-mr2
Merge commit '9fbb534ebddb2ae43e862a3bc0ff5859358b194b' into eclair-mr2-plus-aosp

* commit '9fbb534ebddb2ae43e862a3bc0ff5859358b194b':
  Maybe really fix windows build.
2009-12-09 15:58:01 -08:00
Dianne Hackborn
8bee0b7b6e am 4c8454d8: am e851cdc6: Merge change Ifd95b9f5 into eclair
Merge commit '4c8454d8699cbedf473565bb92a80defaf95af09' into eclair-mr2-plus-aosp

* commit '4c8454d8699cbedf473565bb92a80defaf95af09':
  Fix #2313382: SECURITY: Live wallpapers get touch events through the lock screen.
2009-12-09 15:57:27 -08:00
Romain Guy
04ed6b1788 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
Dianne Hackborn
2a01f94344 am 484fe4d6: Merge change I06fb2c1c into eclair-mr2
Merge commit '484fe4d6f45d5dc42c378baaad3fdad7d6ae612f' into eclair-mr2-plus-aosp

* commit '484fe4d6f45d5dc42c378baaad3fdad7d6ae612f':
  Hopefully fix Windows build
2009-12-09 15:56:59 -08:00
Romain Guy
24c6066fda 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
Wink Saville
dd6eba055a am a41e0680: Merge change I36785a9d into eclair-mr2
Merge commit 'a41e068045dabe510aa36fa829acf693f6c9cae1' into eclair-mr2-plus-aosp

* commit 'a41e068045dabe510aa36fa829acf693f6c9cae1':
  Telephony: Make resetting radio on a radio technology change optional
2009-12-09 15:56:00 -08:00
Paul Westbrook
f2297043fe 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
089e8eea9a 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
Robert Greenwalt
ab5688a8a3 am 7614d3d8: am 68b15b68: Porting change I064698b3 from mr2 to eclair.
Merge commit '7614d3d819315b1ca15088e617f12d0f0ea41b06' into eclair-mr2-plus-aosp

* commit '7614d3d819315b1ca15088e617f12d0f0ea41b06':
  Porting change I064698b3 from mr2 to eclair.
2009-12-09 15:55:15 -08:00
Romain Guy
f1f7350f7b 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
e60a51f117 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
ba8eddcf6a 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
Joe Onorato
df814d24eb am b43b5def: am 0d8055e5: Paper over 2275704 by not having LotsOfApps installed on the monkeys builds.
Merge commit 'b43b5deff30d0ba77ea5b93d3e74507bfe2528be' into eclair-mr2-plus-aosp

* commit 'b43b5deff30d0ba77ea5b93d3e74507bfe2528be':
  Paper over 2275704 by not having LotsOfApps installed on the monkeys builds.
2009-12-09 15:52:28 -08:00
Grace Kloba
6cfc2b6224 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