25704 Commits

Author SHA1 Message Date
James Dong
708ec39c21 Don't send late frames to software encoders for encoding
o Document on what frames will be rejected and what frames will be accepted

Change-Id: I5a5d489ad3d2b50dbb40a0f6e01529312ce81c54
2010-08-12 10:40:58 -07:00
John Huang
edfe20c4bd am c636b846: Merge "Enhance WspTypeDecoder to decode Content Type Parameters"
Merge commit 'c636b846160482fbebd9a3792d52b9ff864228f2' into gingerbread-plus-aosp

* commit 'c636b846160482fbebd9a3792d52b9ff864228f2':
  Enhance WspTypeDecoder to decode Content Type Parameters
2010-08-12 10:26:58 -07:00
James Dong
8aa244eab7 am 45cb3cfa: Merge "Handle large audio lost" into gingerbread
Merge commit '45cb3cfacf3b07ae3c5f15eba9bbbcd060cee261' into gingerbread-plus-aosp

* commit '45cb3cfacf3b07ae3c5f15eba9bbbcd060cee261':
  Handle large audio lost
2010-08-12 10:12:28 -07:00
James Dong
f4e26da1af am b6541f0a: Merge "Fix a crash due to unnecessary check on the codec config data for H263 video track" into gingerbread
Merge commit 'b6541f0af89b1fe85cb53e5dac461587eb040fb0' into gingerbread-plus-aosp

* commit 'b6541f0af89b1fe85cb53e5dac461587eb040fb0':
  Fix a crash due to unnecessary check on the codec config data for H263 video track
2010-08-12 10:12:21 -07:00
James Dong
45cb3cfacf Merge "Handle large audio lost" into gingerbread 2010-08-12 10:07:51 -07:00
James Dong
b6541f0af8 Merge "Fix a crash due to unnecessary check on the codec config data for H263 video track" into gingerbread 2010-08-12 10:07:38 -07:00
John Huang
c636b84616 Merge "Enhance WspTypeDecoder to decode Content Type Parameters" 2010-08-12 10:07:06 -07:00
James Dong
0386d04b19 am 581581fe: Merge "Fix all fd leaks in authoring engine" into gingerbread
Merge commit '581581fe1addfac8913c8d4d6c88eed6ded90de4' into gingerbread-plus-aosp

* commit '581581fe1addfac8913c8d4d6c88eed6ded90de4':
  Fix all fd leaks in authoring engine
2010-08-12 09:22:17 -07:00
James Dong
581581fe1a Merge "Fix all fd leaks in authoring engine" into gingerbread 2010-08-12 09:13:14 -07:00
Andreas Huber
3f55576e04 APacketSource is too verbose.
Change-Id: I48ca7b070d89e43405d05e5f41e650db587e12b4
2010-08-12 09:07:20 -07:00
Dianne Hackborn
9185e26a8f am fb86ce93: Add watermark support.
Merge commit 'fb86ce93079db4465a61489275c65bcf8ce4669e' into gingerbread-plus-aosp

* commit 'fb86ce93079db4465a61489275c65bcf8ce4669e':
  Add watermark support.
2010-08-11 22:04:27 -07:00
Dianne Hackborn
fb86ce9307 Add watermark support.
Use these system properties:

ro.watermark.text
ro.watermark.height
ro.watermark.x
ro.watermark.y
ro.watermark.color
ro.watermark.shadow.radius
ro.watermark.shadow.dx
ro.watermark.shadow.dy
ro.watermark.shadow.color

If ro.watermark.text is not set, no watermark will be shown.  All others
have reasonable defaults if they are not set.

Change-Id: Ibe4a01e6f1c576494ae2462e2688cdfaa8c62cb8
2010-08-11 18:15:29 -07:00
Mathias Agopian
70a7c92e16 am 65f2490e: Merge "should fix sim build, hopefully" into gingerbread
Merge commit '65f2490e1baa6eac5905cbc638e69581ebcd8dee' into gingerbread-plus-aosp

* commit '65f2490e1baa6eac5905cbc638e69581ebcd8dee':
  should fix sim build, hopefully
2010-08-11 17:35:58 -07:00
Mathias Agopian
65f2490e1b Merge "should fix sim build, hopefully" into gingerbread 2010-08-11 17:32:25 -07:00
Mathias Agopian
b59beb5ca6 should fix sim build, hopefully
Change-Id: I5390bd34dcca36fef43b5169386fff1b04cc842b
2010-08-11 17:31:33 -07:00
Jeff Brown
4e14159a04 am bb65ae02: Merge "Fix ViewRoot bug attempting to finish synthetic KeyEvents." into gingerbread
Merge commit 'bb65ae020f802bae3e80dd8e05845fee5d6bc2cb' into gingerbread-plus-aosp

* commit 'bb65ae020f802bae3e80dd8e05845fee5d6bc2cb':
  Fix ViewRoot bug attempting to finish synthetic KeyEvents.
2010-08-11 17:26:16 -07:00
Jeff Brown
bb65ae020f Merge "Fix ViewRoot bug attempting to finish synthetic KeyEvents." into gingerbread 2010-08-11 17:22:17 -07:00
James Dong
c6280bce51 Fix all fd leaks in authoring engine
Change-Id: I17798543f9dd41cc8bef6f6086e66932f9f97be8
2010-08-11 17:18:30 -07:00
Mathias Agopian
5744cd6ac8 am 90dc48b1: Merge "call into hwcomposer HAL when present" into gingerbread
Merge commit '90dc48b17f673b7e334e3254ea633450f994226c' into gingerbread-plus-aosp

* commit '90dc48b17f673b7e334e3254ea633450f994226c':
  call into hwcomposer HAL when present
2010-08-11 16:28:21 -07:00
Mathias Agopian
308e69896c am 24d7050c: Merge "don\'t handle the transparent region of a layer in draw()" into gingerbread
Merge commit '24d7050ca605804efd5fde03f0d0d8d1d052c247' into gingerbread-plus-aosp

* commit '24d7050ca605804efd5fde03f0d0d8d1d052c247':
  don't handle the transparent region of a layer in draw()
2010-08-11 16:26:05 -07:00
Mathias Agopian
f7db3e21ef am 8e7515d9: Merge "get rid of our LayerVector implementation" into gingerbread
Merge commit '8e7515d9c938f5addd08d97bccfccfa976e76c11' into gingerbread-plus-aosp

* commit '8e7515d9c938f5addd08d97bccfccfa976e76c11':
  get rid of our LayerVector implementation
2010-08-11 16:25:59 -07:00
Mathias Agopian
90dc48b17f Merge "call into hwcomposer HAL when present" into gingerbread 2010-08-11 16:24:46 -07:00
Mathias Agopian
801d0b33e8 am 025822a0: Merge "keep a list of visible sorted surfaces" into gingerbread
Merge commit '025822a03a09337ec382e708c5a798fe805109ed' into gingerbread-plus-aosp

* commit '025822a03a09337ec382e708c5a798fe805109ed':
  keep a list of visible sorted surfaces
2010-08-11 16:23:06 -07:00
Mathias Agopian
24d7050ca6 Merge "don't handle the transparent region of a layer in draw()" into gingerbread 2010-08-11 16:21:01 -07:00
Mathias Agopian
8e7515d9c9 Merge "get rid of our LayerVector implementation" into gingerbread 2010-08-11 16:20:38 -07:00
Mathias Agopian
025822a03a Merge "keep a list of visible sorted surfaces" into gingerbread 2010-08-11 16:19:16 -07:00
Jeff Brown
f66f8a58cc am 95af0c14: Merge "Add support for the PointerLocation overlay." into gingerbread
Merge commit '95af0c14a64ef264d2b362ded4ca2b5a169d1066' into gingerbread-plus-aosp

* commit '95af0c14a64ef264d2b362ded4ca2b5a169d1066':
  Add support for the PointerLocation overlay.
2010-08-11 16:18:36 -07:00
Jeff Brown
92ff1dd835 Fix ViewRoot bug attempting to finish synthetic KeyEvents.
Bug: 2834068
Change-Id: I34ee0c4479cee36b25a2c3e1cdf5d761b663ac1e
2010-08-11 16:18:13 -07:00
Jeff Brown
95af0c14a6 Merge "Add support for the PointerLocation overlay." into gingerbread 2010-08-11 16:15:48 -07:00
Mathias Agopian
e0d5f5bcf5 call into hwcomposer HAL when present
Change-Id: I70f31c69a9436a43860e78977442863ecba6d27b
2010-08-11 16:08:45 -07:00
Mathias Agopian
8514b92bc4 don't handle the transparent region of a layer in draw()
this is already taken into consideration in computeVisibleRegion
and therefore not needed at draw time.

Change-Id: I3fc7336d22f1147dfcd3a20fd71bf79b946d971f
2010-08-11 16:05:06 -07:00
Mathias Agopian
1efba9a617 get rid of our LayerVector implementation
we now use SortedVector<> with a special compare implementation.

Change-Id: I910459cf3b3c8993b55ad0786a8c348369262de5
2010-08-11 16:05:05 -07:00
Mathias Agopian
ff1d410288 keep a list of visible sorted surfaces
Change-Id: Ib815eeff894f8a3b1e79fbbf8186d5d91bb60285
2010-08-11 16:04:51 -07:00
James Dong
7ae08a6d79 Fix a crash due to unnecessary check on the codec config data for H263 video track
Change-Id: I00e8b65d25731153e4d9be6a443eeed91c8fb605
2010-08-11 15:58:59 -07:00
Dianne Hackborn
2d8b9fe0f9 am bd1c082c: Merge "New system property "sys.boot_completed" set to 1 when boot completed." into gingerbread
Merge commit 'bd1c082cf90d07e3ccb017b72e59b5ccad81dd07' into gingerbread-plus-aosp

* commit 'bd1c082cf90d07e3ccb017b72e59b5ccad81dd07':
  New system property "sys.boot_completed" set to 1 when boot completed.
2010-08-11 15:20:34 -07:00
Dianne Hackborn
bd1c082cf9 Merge "New system property "sys.boot_completed" set to 1 when boot completed." into gingerbread 2010-08-11 15:16:01 -07:00
Jeff Brown
a41ca77fab Add support for the PointerLocation overlay.
This change involves adding a new method to IWindowManager,
monitorInput() that returns an InputChannel to receive a copy of all
input that is dispatched to applications.  The caller must have
the READ_INPUT_STATE permission to make this request (similar to
other window manager methods such as getKeycodeState).

Change-Id: Icd14d810174a5b2928671ef16de73af88302aea0
2010-08-11 14:46:32 -07:00
Kenny Root
80328ba096 am 8ea71511: Merge "Initial tool for OBB manipulation" into gingerbread
Merge commit '8ea71511c64e61fe23004889ff7032f991a751c8' into gingerbread-plus-aosp

* commit '8ea71511c64e61fe23004889ff7032f991a751c8':
  Initial tool for OBB manipulation
2010-08-11 14:10:26 -07:00
Kenny Root
f5ee5358c1 am ac9717ab: Merge "Move OBB file reading to DefaultContainerService" into gingerbread
Merge commit 'ac9717ab73afe0123b6dbb63c4dd2fc88143e53e' into gingerbread-plus-aosp

* commit 'ac9717ab73afe0123b6dbb63c4dd2fc88143e53e':
  Move OBB file reading to DefaultContainerService
2010-08-11 14:10:18 -07:00
Kenny Root
8ea71511c6 Merge "Initial tool for OBB manipulation" into gingerbread 2010-08-11 14:06:51 -07:00
Kenny Root
ac9717ab73 Merge "Move OBB file reading to DefaultContainerService" into gingerbread 2010-08-11 14:06:39 -07:00
Andreas Huber
136d8336b6 am 90d1d104: Merge "This code in CameraSource really should hold the lock." into gingerbread
Merge commit '90d1d104272954042d5440f248980e4348e97686' into gingerbread-plus-aosp

* commit '90d1d104272954042d5440f248980e4348e97686':
  This code in CameraSource really should hold the lock.
2010-08-11 13:28:51 -07:00
Andreas Huber
90d1d10427 Merge "This code in CameraSource really should hold the lock." into gingerbread 2010-08-11 13:20:59 -07:00
Dianne Hackborn
f4c454bac9 New system property "sys.boot_completed" set to 1 when boot completed.
Change-Id: Ie3fc0b1efdfb637b0c780064a71e8c1575e15ca3
2010-08-11 12:47:41 -07:00
Andreas Huber
22bd242478 This code in CameraSource really should hold the lock.
Change-Id: I349520a14776bb83b7edb23fc62052b487246d9a
2010-08-11 12:34:32 -07:00
Vairavan Srinivasan
79cb9a5d2d am f2e67a57: InputMethodService: Fix ignore case in showInputMethodPickerFromClient
Merge commit 'f2e67a5779d404b4791c6ab5b0d30dfb2c463514' into gingerbread-plus-aosp

* commit 'f2e67a5779d404b4791c6ab5b0d30dfb2c463514':
  InputMethodService: Fix ignore case in showInputMethodPickerFromClient
2010-08-11 12:07:56 -07:00
Jean-Baptiste Queru
1ca94798cc Fix build: HistoryRecord is now ActivityRecord
Change-Id: I5f402e76fbff58ec59ea26b6765e7455801a6cd0
2010-08-11 11:56:21 -07:00
Jean-Baptiste Queru
44e43d1f65 resolved conflicts for merge of efcac2ff to gingerbread-plus-aosp
Change-Id: Id6bd5ab1d6eda0372f2fd8eecb8f1d204066c4d5
2010-08-11 11:51:31 -07:00
Vairavan Srinivasan
f2e67a5779 InputMethodService: Fix ignore case in showInputMethodPickerFromClient
Fix to avoid posting MSG_SHOW_IM_PICKER in
showInputMethodPickerFromClient when ignoring the request from the
client.

Change-Id: Iff8a0809aea892b4493d5cffbb91adba2d74414e
2010-08-11 11:24:45 -07:00
Kenny Root
6e7ac5f0bc Initial tool for OBB manipulation
Add "obbtool" host command for adding, removing, and querying Opaque
Binary Blob (OBB) information from a file.

Change-Id: Id2ac41e687ad2a500c362616d6738a8ae7e8f5c3
2010-08-11 11:24:41 -07:00