drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
13,604 Commits 1 Branch 0 Tags
Commit Graph

13604 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Eric Fischer
71988369e3 am 4d272fe9: am 282a7423: (-s ours) Merge change I3c299167 into eclair 
Merge commit '4d272fe9e0e6f606535ef4a297337e6272c708b4' into eclair-mr2-plus-aosp

* commit '4d272fe9e0e6f606535ef4a297337e6272c708b4':
  Import revised translations.  DO NOT MERGE
 2009-12-10 17:53:20 -08:00
Trevor Johns
8a00170ad0 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
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
Mathias Agopian
abcb37038a 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
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
Eric Fischer
4d272fe9e0 am 282a7423: (-s ours) Merge change I3c299167 into eclair 
Merge commit '282a742347bcb673f278c56b4dfede328a655296' into eclair-mr2

* commit '282a742347bcb673f278c56b4dfede328a655296':
  Import revised translations.  DO NOT MERGE
 2009-12-10 17:42:43 -08:00
Trevor Johns
1d3a94a8b4 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
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
Mathias Agopian
75ca58d6f8 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
899858a396 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
b62954b665 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
d1b8019a69 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
6608bd0d3a 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
8f31c23021 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
ae5bd2b9cc 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
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
Android (Google) Code Review
f2f68760eb Merge change Ib3d582d7 into eclair-mr2 
* changes:
  Fix crash with @UiThreadTest in InstrumentationTestCase.
 2009-12-10 13:46:10 -08:00
Romain Guy
b3d582d79d Fix crash with @UiThreadTest in InstrumentationTestCase. 2009-12-10 13:45:31 -08:00
Andreas Huber
23915ddde9 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
eec100b2f4 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
b95ea9ecb2 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
6ae24d9365 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
5c5c85a505 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
987e7fb2d4 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
Andreas Huber
3c01bb627a Adding copyright headers to recently introduced decoder source files. 2009-12-10 12:28:22 -08:00
Andreas Huber
a30d400838 Initial check in of AMR (NB and WB) decoders based on PV source code. 2009-12-10 12:23:55 -08:00
Andreas Huber
f0d04246f4 Don't count empty buffers when computing the frame rate. 2009-12-10 12:21: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
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
Android (Google) Code Review
abd6c2782d Merge change I54400322 into eclair 
* changes:
  Adding screenshots for development/samples/ContactManager documentation.
 2009-12-09 17:51:34 -08:00
Eric Fischer
3c299167a4 Import revised translations. DO NOT MERGE 2009-12-09 17:06:04 -08:00
Android (Google) Code Review
f6e32e72a9 Merge change Icced7a09 into eclair 
* changes:
  Maintain a list of all Bluetooth docks.
 2009-12-09 17:00:09 -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