Commit Graph

11107 Commits

Author SHA1 Message Date
Trevor Johns
8920dcacbc am 8a00170a: am 1d3a94a8: am abd6c278: Merge change I54400322 into eclair
Merge commit '8a00170ad077e73fee4b379d15015b880ba39fde'

* commit '8a00170ad077e73fee4b379d15015b880ba39fde':
  Adding screenshots for development/samples/ContactManager documentation.
2009-12-10 23:42:44 -08:00
Jaikumar Ganesh
a563def03c 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
Mathias Agopian
b478159bb3 am abcb3703: am 75ca58d6: am 76169da0: fix [2315900] Monochrome camera preview screen after launching camera
Merge commit 'abcb37038a4981e935e516dd4d56cecd1f6fcb39'

* commit 'abcb37038a4981e935e516dd4d56cecd1f6fcb39':
  fix [2315900] Monochrome camera preview screen after launching camera
2009-12-10 23:42:13 -08:00
Trevor Johns
92fbba5574 am 1d3a94a8: am abd6c278: Merge change I54400322 into eclair
Merge commit '1d3a94a8b4972f28c75c2d01ed4cf686a47ca6d8' into eclair-mr2-plus-aosp

* commit '1d3a94a8b4972f28c75c2d01ed4cf686a47ca6d8':
  Adding screenshots for development/samples/ContactManager documentation.
2009-12-10 17:53:12 -08:00
Jaikumar Ganesh
d6b2b0b333 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
Mathias Agopian
f9ad794100 am 75ca58d6: am 76169da0: fix [2315900] Monochrome camera preview screen after launching camera
Merge commit '75ca58d6f877541516f4f2710b4bed39fa7c4266' into eclair-mr2-plus-aosp

* commit '75ca58d6f877541516f4f2710b4bed39fa7c4266':
  fix [2315900] Monochrome camera preview screen after launching camera
2009-12-10 17:52:55 -08:00
Trevor Johns
aa663206b9 am abd6c278: Merge change I54400322 into eclair
Merge commit 'abd6c2782d1fe9816068003bc1d143dedd42de81' into eclair-mr2

* commit 'abd6c2782d1fe9816068003bc1d143dedd42de81':
  Adding screenshots for development/samples/ContactManager documentation.
2009-12-10 17:41:45 -08:00
Jaikumar Ganesh
137940b87c 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
Mathias Agopian
b2bf11e389 am 76169da0: fix [2315900] Monochrome camera preview screen after launching camera
Merge commit '76169da0e84b0fcf621aeac6141af3ee85bc7c1e' into eclair-mr2

* commit '76169da0e84b0fcf621aeac6141af3ee85bc7c1e':
  fix [2315900] Monochrome camera preview screen after launching camera
2009-12-10 17:40:41 -08:00
Jean-Michel Trivi
2841ac53cc am 899858a3: am 6608bd0d: am 86ed86d2: Merge change I0f73439a into eclair
Merge commit '899858a39647803c0cb506d2320fdaf2e4d3b8b9'

* commit '899858a39647803c0cb506d2320fdaf2e4d3b8b9':
  Partially fix bug 2111240 Detect docking / undocking event by reporting
2009-12-10 17:15:22 -08:00
Jason Sams
dd78738966 am b62954b6: am 8f31c230: am 57ce0888: Merge change Id22c0137 into eclair
Merge commit 'b62954b66542e3e2654d97a81123c51805bceca7'

* commit 'b62954b66542e3e2654d97a81123c51805bceca7':
  Throttle low priority RS threads by sleeping once per frame to avoid starving other apps.
2009-12-10 17:15:13 -08:00
Mathias Agopian
2de0b02720 am d1b8019a: am ae5bd2b9: am d8c752ef: Merge change Ib548dbb2 into eclair
Merge commit 'd1b8019a69d186df74f072cc51b413e34c3016f4'

* commit 'd1b8019a69d186df74f072cc51b413e34c3016f4':
  improve video performance to minimize the tearing effect seen in 720p movies
2009-12-10 17:15:02 -08:00
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
Jean-Baptiste Queru
f1d0d955f8 resolved conflicts for merge of da9691e9 to master 2009-12-10 15:46:33 -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
Android (Google) Code Review
2de58fdd8f 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
Romain Guy
567acc429d 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
Andreas Huber
f74e5f997a am 23915ddd: am eec100b2: Merge change If0d04246 into eclair-mr2
Merge commit '23915ddde9ce3ed9f1ce50ea321c8fdce612faf0'

* commit '23915ddde9ce3ed9f1ce50ea321c8fdce612faf0':
  Don't count empty buffers when computing the frame rate.
2009-12-10 14:42:47 -08:00
Andreas Huber
1409d583f2 am b95ea9ec: am 6ae24d93: Merge change I3c01bb62 into eclair-mr2
Merge commit 'b95ea9ecb2a7b0028c02e096589397e00fdef67a'

* commit 'b95ea9ecb2a7b0028c02e096589397e00fdef67a':
  Adding copyright headers to recently introduced decoder source files.
2009-12-10 14:42:38 -08:00
Andreas Huber
e142eb55e3 am 5c5c85a5: am 987e7fb2: Merge change I9a275773 into eclair-mr2
Merge commit '5c5c85a5050d5512e437be65ec00d3f31b8bf004'

* commit '5c5c85a5050d5512e437be65ec00d3f31b8bf004':
  Initial check in of AMR (NB and WB) decoders based on PV source code.
2009-12-10 14:42:28 -08:00
Romain Guy
6acb7dd06d 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
310ef29711 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
e1751b8b48 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
bc34a5365a 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
11cc4f52ae 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
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
Marco Nelissen
46c4fc2266 am 92993a62: am 7cd40294: Merge change I2cb78a66 into eclair-mr2
Merge commit '92993a620b04008a764c52982b9981c1758d9e9e'

* commit '92993a620b04008a764c52982b9981c1758d9e9e':
  Add convenience function to MediaStore to move a playlist item
2009-12-10 13:32:01 -08:00
Patrick Scott
350401f6d1 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
8f3dface92 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
Fred Quintana
c532509283 am aa02bae8: am 029074ff: fix build
Merge commit 'aa02bae8309797d22d28c7f6a2aaa23ebcee6be3'

* commit 'aa02bae8309797d22d28c7f6a2aaa23ebcee6be3':
  fix build
2009-12-10 13:31:22 -08:00
Fred Quintana
80f10677fa am c5ab618e: am 563bfade: fix a build breakage
Merge commit 'c5ab618e543a5d05e9f9660d0e9f1937c7d74fa0'

* commit 'c5ab618e543a5d05e9f9660d0e9f1937c7d74fa0':
  fix a build breakage
2009-12-10 13:31:09 -08:00
Jean-Baptiste Queru
d9c4c6aacf resolved conflicts for merge of 3d2560ad to master 2009-12-10 13:29:19 -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
Patrick Scott
d16c9b79b0 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
0e5f195e7c 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
Jack Palevich
510e30040f am 74befcc7: am 981ccfbb: Implement Matrix Palette extension.
Merge commit '74befcc7fd721ca34f60bf75e18ce6faaab37aef'

* commit '74befcc7fd721ca34f60bf75e18ce6faaab37aef':
  Implement Matrix Palette extension.
2009-12-10 12:16:37 -08:00
Jack Palevich
34ca404728 resolved conflicts for merge of fac57636 to master 2009-12-10 12:13:54 -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
Jack Palevich
95e736849c resolved conflicts for merge of 44a95cc0 to master 2009-12-10 11:57:09 -08:00