Commit Graph

3520 Commits

Author SHA1 Message Date
Android (Google) Code Review
a874f33048 Merge change 20290
* changes:
  gps: Add GpsStatus.NmeaListener interface for receiving NMEA sentences.
2009-08-06 12:48:08 -07:00
Android (Google) Code Review
b045861d2f am 3efbdf6f: (-s ours) Merge change 20267 into donut
Merge commit '3efbdf6f253f905c8672108a6329886105edec7c'

* commit '3efbdf6f253f905c8672108a6329886105edec7c':
  Do not merge
2009-08-06 10:19:51 -07:00
Android (Google) Code Review
0215f0f111 Merge change 20267 into donut
* changes:
  Do not merge
2009-08-06 10:17:15 -07:00
Android (Google) Code Review
b6f64041d1 Merge change 20273
* changes:
  adding ability to fix the size of a surface view when created.
2009-08-06 08:45:15 -07:00
Jean-Baptiste Queru
d4bfc72ce9 merge from open-source master 2009-08-06 08:15:26 -07:00
Android (Google) Code Review
44a9d066c0 Merge change 20262
* changes:
  libdrm1: Use libcrypto instead of libaes.
2009-08-06 04:07:11 -07:00
Scott Main
8b7864ed5f am d2102a3f: fix broken links
Merge commit 'd2102a3f13fa03337ce7493b785e7f817f7d2bb6'

* commit 'd2102a3f13fa03337ce7493b785e7f817f7d2bb6':
  fix broken links
2009-08-06 03:14:09 -07:00
Scott Main
1dc64ef140 am c7279e9c: edits to the API Level doc
Merge commit 'c7279e9cbd2689c6686e152bb030d796d741ffce'

* commit 'c7279e9cbd2689c6686e152bb030d796d741ffce':
  edits to the API Level doc
2009-08-06 03:00:45 -07:00
Scott Main
d110769156 am 17cffb5a: fix image reference for offline docs
Merge commit '17cffb5a23d6b669db75298521e23e77b27a9ad0'

* commit '17cffb5a23d6b669db75298521e23e77b27a9ad0':
  fix image reference for offline docs
2009-08-06 02:45:20 -07:00
Scott Main
06d7e72255 am fb485733: add preview flags to terms doc so the early look title appears in nav
Merge commit 'fb48573370e16f0d4f0285b485f243a8484af028'

* commit 'fb48573370e16f0d4f0285b485f243a8484af028':
  add preview flags to terms doc so the early look title appears in nav
2009-08-06 02:14:54 -07:00
Scott Main
b3a5a1f651 am 02a803f2: final changes to make the sdk sidenav work for the offline preview docs
Merge commit '02a803f201df2c267ab3a10cf6547c69d72ba6db'

* commit '02a803f201df2c267ab3a10cf6547c69d72ba6db':
  final changes to make the sdk sidenav work for the offline preview docs
2009-08-06 02:07:10 -07:00
Dirk Dougherty
4dfc143561 resolved conflicts for merge of f11d7d55 to master 2009-08-06 01:14:04 -07:00
Android (Google) Code Review
227fa1524b am 2dce6988: Merge change 20230 into donut
Merge commit '2dce6988c26332b4733a06851eee9631151b0bda'

* commit '2dce6988c26332b4733a06851eee9631151b0bda':
  Cleanup - Specify the version and rel id.
2009-08-05 22:17:21 -07:00
Android (Google) Code Review
ac26474dec Merge change 20230 into donut
* changes:
  Cleanup - Specify the version and rel id.
2009-08-05 22:14:47 -07:00
Android (Google) Code Review
15079537ee am 701f8b86: Merge change 20229 into donut
Merge commit '701f8b86a404504045c459be0384d155fc02728a'

* commit '701f8b86a404504045c459be0384d155fc02728a':
  Add 3->donut diff report to SDK docs.
2009-08-05 22:12:58 -07:00
Android (Google) Code Review
f128c77dbb Merge change 20229 into donut
* changes:
  Add 3->donut diff report to SDK docs.
2009-08-05 22:10:10 -07:00
Android (Google) Code Review
5703947b1e am be9d08d0: Merge change 20228 into donut
Merge commit 'be9d08d04ee313d56578934b4f062f95170140fc'

* commit 'be9d08d04ee313d56578934b4f062f95170140fc':
  add installing/upgrading docs for donut preview sdk
2009-08-05 22:08:14 -07:00
Android (Google) Code Review
8643999543 Merge change 20228 into donut
* changes:
  add installing/upgrading docs for donut preview sdk and update eclipse ide doc to include new AVD Manager
2009-08-05 22:06:40 -07:00
Android (Google) Code Review
eaff412352 Merge change 20240
* changes:
  First bit of wallpaper work.
2009-08-05 21:39:14 -07:00
Android (Google) Code Review
33b255bd61 Merge change 20217
* changes:
  Draw untextured water mesh
2009-08-05 19:27:58 -07:00
Android (Google) Code Review
8303104c6a Merge change 20218
* changes:
  Correct the backup manager's identity around wakelock use
2009-08-05 18:41:38 -07:00
Android (Google) Code Review
c58c2c9e30 am ae18ca5c: Merge change 20140 into donut
Merge commit 'ae18ca5ceb7ebe376288c8c7653d2c3875f1d18e'

* commit 'ae18ca5ceb7ebe376288c8c7653d2c3875f1d18e':
  Work on issue #2030135: Device sluggish
2009-08-05 18:39:48 -07:00
Android (Google) Code Review
3284d510fe Merge change 20140 into donut
* changes:
  Work on issue #2030135: Device sluggish
2009-08-05 18:34:55 -07:00
Android (Google) Code Review
37c3c81573 am ff6585cb: Merge change 20144 into donut
Merge commit 'ff6585cbb0e5e42adf056b4a074b9f3683b853c1'

* commit 'ff6585cbb0e5e42adf056b4a074b9f3683b853c1':
  Remove flaky MonitorTest#testInterrupt from continuous, and attempt to make
2009-08-05 17:52:10 -07:00
Android (Google) Code Review
341b502c5c Merge change 20144 into donut
* changes:
  Remove flaky MonitorTest#testInterrupt from continuous, and attempt to make AutoCompletePopup tests more reliable.
2009-08-05 17:49:41 -07:00
Android (Google) Code Review
1738a78c97 Merge change 20208
* changes:
  added a gl swapinterval test
2009-08-05 17:40:07 -07:00
Mathias Agopian
1c3561e8d8 added a gl swapinterval test 2009-08-05 17:38:49 -07:00
Android (Google) Code Review
7921f02784 Merge change 20207
* changes:
  Implement basic snapping.
2009-08-05 17:36:07 -07:00
Android (Google) Code Review
f78580ab46 am 8b2cdcd1: Merge change 20037 into donut
Merge commit '8b2cdcd184acfebfb245b15a71f5f1c32e53b050'

* commit '8b2cdcd184acfebfb245b15a71f5f1c32e53b050':
  fix issue with gids not being added for packages with shared user id
2009-08-05 15:45:34 -07:00
Android (Google) Code Review
f58d816e43 Merge change 20037 into donut
* changes:
  fix issue with gids not being added for packages with shared user id
2009-08-05 15:42:54 -07:00
Android (Google) Code Review
69685fb5ba Merge change 20157
* changes:
  Fix the issue of datacall not being reinitiated after exiting Emergency Callback Mode.
2009-08-05 14:39:10 -07:00
Android (Google) Code Review
57fb665733 Merge change 20126
* changes:
  Removing SyncColumns from Contact - they were put there by accident.
2009-08-05 14:22:41 -07:00
Android (Google) Code Review
ba70d7b9be Merge change 20146
* changes:
  Calendar attendee support: add columns.
2009-08-05 14:22:05 -07:00
Android (Google) Code Review
80ffa08422 Merge change 20124
* changes:
  Remove useless slot from ProgramVertex.  Optimize GL state setup.
2009-08-05 14:00:02 -07:00
Android (Google) Code Review
46078d9978 Merge change 20133
* changes:
  don't crash when SurfaceBuffer::writeToParcel is given a null argument
2009-08-05 12:52:51 -07:00
Android (Google) Code Review
d285c41e5d Merge change 20132
* changes:
  opengl tests
2009-08-05 12:52:39 -07:00
Android (Google) Code Review
1af2c6e512 Merge change 20051
* changes:
  Fix error in settings.db upgrader.  See bug 1999477 for details.
2009-08-05 12:49:42 -07:00
Android (Google) Code Review
423f9fc7df Merge change 9649
* changes:
  Finish implementation of multiple pointer support for MotionEvent.
2009-08-05 12:36:11 -07:00
Android (Google) Code Review
40d4df24d5 am 89888b2d: Merge change 20038 into donut
Merge commit '89888b2d9dc2d1994a8236ffbce5aaefd6782bf3'

* commit '89888b2d9dc2d1994a8236ffbce5aaefd6782bf3':
  Remove debug code which reads the max_events_per_sec property on every touch event
2009-08-05 12:35:18 -07:00
Android (Google) Code Review
7bd04d06d7 Merge change 20038 into donut
* changes:
  Remove debug code which reads the max_events_per_sec property on every touch event
2009-08-05 12:32:40 -07:00
Mathias Agopian
3eded94924 don't crash when SurfaceBuffer::writeToParcel is given a null argument 2009-08-05 12:22:30 -07:00
Mathias Agopian
591018aaf9 opengl tests 2009-08-05 12:22:29 -07:00
Yu Shan Emily Lau
50ade7549c am bd014e07: Remove the memory capture in the first run and make it the same as the cupcake test case.
Merge commit 'bd014e07e2e95d4ac706c6863e2587bd96daa51e'

* commit 'bd014e07e2e95d4ac706c6863e2587bd96daa51e':
  Remove the memory capture in the first run and make it the same as the cupcake test case.
2009-08-05 12:16:18 -07:00
Android (Google) Code Review
aa6fa1949a am d4543c51: Merge change 20108 into donut
Merge commit 'd4543c519b7724841eb77bb57ff360e6c40cd69a'

* commit 'd4543c519b7724841eb77bb57ff360e6c40cd69a':
  Guard against remote process dying when retrieving column from cursor.
2009-08-05 10:43:47 -07:00
Karl Rosaen
7029f2fb92 am 69423302: Remove the menu from the search dialog since there are a couple of issues with it we don\'t have time to fix for donut.
Merge commit '6942330251cd778f85169c6265c584648b42428d'

* commit '6942330251cd778f85169c6265c584648b42428d':
  Remove the menu from the search dialog since there are a couple of issues with it we don't have time to fix for donut.
2009-08-05 10:41:25 -07:00
Android (Google) Code Review
c841629ba7 Merge change 20108 into donut
* changes:
  Guard against remote process dying when retrieving column from cursor.
2009-08-05 10:41:09 -07:00
Marco Nelissen
e0c54121b0 Add a virtual destructor to the TtsEngine class. 2009-08-05 10:37:09 -07:00
Android (Google) Code Review
899d6f8d84 Merge change 9682
* changes:
  Add a callback for the url of an apple-touch-icon.
2009-08-05 09:50:29 -07:00
Tadashi G. Takaoka
c1f2b9cd6f am 94e114c9: Moved Market related Checkin Stats enum to Events enum and merged
Merge commit '94e114c951008c831d1a31a2e6773fb40e4e9392'

* commit '94e114c951008c831d1a31a2e6773fb40e4e9392':
  Moved Market related Checkin Stats enum to Events enum and merged
2009-08-04 22:20:23 -07:00
Dianne Hackborn
c591736c66 Finish implementation of multiple pointer support for MotionEvent.
The major things going on here:

- The MotionEvent API is now extended to included "pointer ID" information, for
  applications to keep track of individual fingers as they move up and down.
  PointerLocation has been updated to take advantage of this.

- The input system now has logic to generate MotionEvents with the new ID
  information, synthesizing an identifier as new points are down and trying to
  keep pointer ids consistent across events by looking at the distance between
  the last and next set of pointers.

- We now support the new multitouch driver protocol, and will use that instead
  of the old one if it is available.  We do NOT use any finger id information
  coming from the driver, but always synthesize pointer ids in user space.
  (This is simply because we don't yet have a driver reporting this information
  from which to base an implementation on.)

- Increase maximum number of fingers to 10.  This code has only been used
  with a driver that reports up to 2, so no idea how more will actually work.

- Oh and the input system can now detect and report physical DPAD devices.
2009-08-04 20:53:52 -07:00