Commit Graph

3385 Commits

Author SHA1 Message Date
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
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
Android (Google) Code Review
8374f09971 Merge change 20073
* changes:
  fix CDMA SMS ASCII decode and mapping
2009-08-04 20:24:14 -07:00
Android (Google) Code Review
e8ce92bbe0 Merge change 20046
* changes:
  Seperate Light and Sampler from RenderScript.java
2009-08-04 18:00:01 -07:00
Android (Google) Code Review
f326789552 Merge change 20032
* changes:
  Split ProgramFragment and ProgramStore from RenderScript.java.  Update Element and Type to new cached builder for easier app developement.
2009-08-04 17:08:15 -07:00
Android (Google) Code Review
63ceb185f8 Merge change 9597
* changes:
  ListView.setItemChecked(p, false) always clears all items.
2009-08-04 17:05:56 -07:00
Android (Google) Code Review
e3a18f12af Merge change 20030
* changes:
  Use the new ScriptC.Builder API.
2009-08-04 16:45:01 -07:00
Android (Google) Code Review
74b80b140b Merge change 9684
* changes:
  Add a DISCONNECTING call state.
2009-08-04 16:28:13 -07:00
Jean-Baptiste Queru
a8f935efd4 merge from open-source master 2009-08-04 16:20:52 -07:00
Android (Google) Code Review
794aac5839 Merge change 20013
* changes:
  Update the comment for setBackgroundResource that 0 removes the background.
2009-08-04 15:48:09 -07:00
Android (Google) Code Review
e31e5f1cc1 am 7a07f179: Merge change 20006 into donut
Merge commit '7a07f1797684597a3b932aa0b365049d3e7d6ff3'

* commit '7a07f1797684597a3b932aa0b365049d3e7d6ff3':
  After each test, the WebView cache should be cleared, otherwise the cache data will pile up.
2009-08-04 14:31:12 -07:00
Android (Google) Code Review
a13c3330fa Merge change 20006 into donut
* changes:
  After each test, the WebView cache should be cleared, otherwise the cache data will pile up.
2009-08-04 14:27:07 -07:00
Android (Google) Code Review
6f0f8460a3 am cd540294: Merge change 9704 into donut
Merge commit 'cd540294db39d6dd2b2c228ac190684c3970fe0a'

* commit 'cd540294db39d6dd2b2c228ac190684c3970fe0a':
  Close the search dialog before starting voice search in all cases, i.e.,
2009-08-04 14:26:55 -07:00
Karl Rosaen
59b486fe53 am 0e74f5a5: Guard against index out of bounds exception in lock pattern widget.
Merge commit '0e74f5a50b3b08c4519a040dafa895ab1f5b4d2e'

* commit '0e74f5a50b3b08c4519a040dafa895ab1f5b4d2e':
  Guard against index out of bounds exception in lock pattern widget.
2009-08-04 14:26:43 -07:00
Android (Google) Code Review
9b17991ac3 Merge change 9704 into donut
* changes:
  Close the search dialog before starting voice search in all cases, i.e., also when launching web search, not just when it's using the intent API.
2009-08-04 14:24:06 -07:00
Android (Google) Code Review
e507340763 Merge change 9693
* changes:
  add missing types
2009-08-04 14:14:07 -07:00
Android (Google) Code Review
75133cba6a Merge change 20005
* changes:
  Use USB notification instead of battery notification for USB debugging warning.
2009-08-04 14:07:52 -07:00
Android (Google) Code Review
3a8ab27c72 Merge change 9672
* changes:
  Adaptive heartbeat protocol implementation: server configured settings.
2009-08-04 14:04:02 -07:00
Android (Google) Code Review
154ff38816 Merge change 9619
* changes:
  Split ScriptC from RenderScript.java.  Implement state caching in the Builder objects.
2009-08-04 13:23:31 -07:00
Ken Shirriff
7a8d84d659 am 8a98f580: (-s ours) Fix broken calendar tests. DO NOT MERGE
Merge commit '8a98f5803994ca1538d53973ebc72e1c5dfdba5a'

* commit '8a98f5803994ca1538d53973ebc72e1c5dfdba5a':
  Fix broken calendar tests. DO NOT MERGE
2009-08-04 13:21:01 -07:00
Android (Google) Code Review
305e18b64f Merge change 9631
* changes:
  Make test_backup and test_restore usable again
2009-08-04 13:20:45 -07:00
Android (Google) Code Review
fb71f40b6a Merge change 9692
* changes:
  Bootstrap the ever-backed-up bookkeeping properly
2009-08-04 12:37:44 -07:00
Android (Google) Code Review
5effef93f0 am b0508476: Merge change 9676 into donut
Merge commit 'b0508476e3f936f145574142f4e7cb2f45dcbd47'

* commit 'b0508476e3f936f145574142f4e7cb2f45dcbd47':
  Merge abbreviated Russian month name fix over from cupcake.
2009-08-04 11:36:10 -07:00
Android (Google) Code Review
fa25d0a7b0 Merge change 9676 into donut
* changes:
  Merge abbreviated Russian month name fix over from cupcake.
2009-08-04 11:32:44 -07:00
Android (Google) Code Review
2e8fc04e0c Merge change 9607
* changes:
  Adding "service" columns: SYNC1, SYNC2, SYNC3, SYNC4 and SYNC5.
2009-08-04 11:27:28 -07:00
Android (Google) Code Review
1dbc4a5209 am 747cb3b5: Merge change 9670 into donut
Merge commit '747cb3b515e1b01f6b61ec911b693d88d480eaaf'

* commit '747cb3b515e1b01f6b61ec911b693d88d480eaaf':
  Make aidl annotate onTransact with @Override
2009-08-04 11:23:04 -07:00
Android (Google) Code Review
decfdbe405 Merge change 9670 into donut
* changes:
  Make aidl annotate onTransact with @Override
2009-08-04 11:20:12 -07:00
Jean-Michel Trivi
536c23cbb0 am fbe89ec6: Revert "Fix bug 2025765."
Merge commit 'fbe89ec6404978da7899b944d989dd9f50a468b5'

* commit 'fbe89ec6404978da7899b944d989dd9f50a468b5':
  Revert "Fix bug 2025765."
2009-08-04 10:54:07 -07:00
Android (Google) Code Review
6d6323f27f Merge change 9602
* changes:
  Add incoming connections to the cache and change authorization check.
2009-08-04 10:09:47 -07:00
Android (Google) Code Review
1c84117fad Merge change 9479
* changes:
  Enable workers for v8
2009-08-04 10:03:39 -07:00
Android (Google) Code Review
028c6bcad4 Merge change 9661
* changes:
  wifi: Strip trailing spaces before parsing RSSI results.
2009-08-04 09:33:44 -07:00
Jean-Baptiste Queru
b7f0a29521 merge from open-source master 2009-08-04 09:05:18 -07:00
Android (Google) Code Review
b95364dd82 Merge change 9612
* changes:
  Fix #2031300. Set only accept unique objects. So we have to assign different value for each cookie when we add them to the SortedSet.
2009-08-04 09:00:44 -07:00
Android (Google) Code Review
8652a49e94 Merge change 9606
* changes:
  Add anti-aliasing to Grass RS.
2009-08-03 17:29:51 -07:00
Android (Google) Code Review
d4e2706a59 Merge change 9601
* changes:
  Make ZoomButtonsController public.
2009-08-03 17:27:19 -07:00