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
Romain Guy
73b77af861
Merge "Delete shaders after a compile error. Also disable extra logging."
2010-08-11 16:40:28 -07:00
Romain Guy
98173a277f
Delete shaders after a compile error. Also disable extra logging.
...
Change-Id: I9b1558b0feac3d9b2cca926feeaf73921664cc73
2010-08-11 16:40:25 -07:00
Mathias Agopian
a0e28da5ab
am 5744cd6a: am 90dc48b1: Merge "call into hwcomposer HAL when present" into gingerbread
...
Merge commit '5744cd6ac8308b18d32938ee19ad3c8bb8b0fad5'
* commit '5744cd6ac8308b18d32938ee19ad3c8bb8b0fad5':
call into hwcomposer HAL when present
2010-08-11 16:30:13 -07:00
Mathias Agopian
5c9cb3843f
am 308e6989: am 24d7050c: Merge "don\'t handle the transparent region of a layer in draw()" into gingerbread
...
Merge commit '308e69896c2812953d74ea63fe964bebaa68eef4'
* commit '308e69896c2812953d74ea63fe964bebaa68eef4':
don't handle the transparent region of a layer in draw()
2010-08-11 16:30:09 -07:00
Mathias Agopian
ebb7ae51c2
am f7db3e21: am 8e7515d9: Merge "get rid of our LayerVector implementation" into gingerbread
...
Merge commit 'f7db3e21ef713d4ff743f2a52837ea3d210bb84f'
* commit 'f7db3e21ef713d4ff743f2a52837ea3d210bb84f':
get rid of our LayerVector implementation
2010-08-11 16:30:05 -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
47a740b50f
am 801d0b33: am 025822a0: Merge "keep a list of visible sorted surfaces" into gingerbread
...
Merge commit '801d0b33e845648866472263263a7001b528c3f4'
* commit '801d0b33e845648866472263263a7001b528c3f4':
keep a list of visible sorted surfaces
2010-08-11 16:27:39 -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
Jeff Brown
b219a83ff6
am f66f8a58: am 95af0c14: Merge "Add support for the PointerLocation overlay." into gingerbread
...
Merge commit 'f66f8a58cc4412bd258e1d5b11cac17a617bdc58'
* commit 'f66f8a58cc4412bd258e1d5b11cac17a617bdc58':
Add support for the PointerLocation overlay.
2010-08-11 16:22:47 -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
Adam Powell
6b336f835d
ActionBar overlay mode, height fetching, show/hide
...
Change-Id: Ie931ed26ec885d891d6733132b517a53d95f8491
2010-08-11 16:17:57 -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
Freeman Ng
da4c35b951
Merge "add a Skip option"
2010-08-11 15:48:18 -07:00
Freeman Ng
09dbf18440
add a Skip option
...
Change-Id: I21dca8feb1dedc362350c41e95a12463e6e4bc61
2010-08-11 15:45:01 -07:00
Dianne Hackborn
ed6075943f
am 2d8b9fe0: am bd1c082c: Merge "New system property "sys.boot_completed" set to 1 when boot completed." into gingerbread
...
Merge commit '2d8b9fe0f9fe44c17ccc4d041f726df490548984'
* commit '2d8b9fe0f9fe44c17ccc4d041f726df490548984':
New system property "sys.boot_completed" set to 1 when boot completed.
2010-08-11 15:25:42 -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
Romain Guy
6416d5d792
Merge "Fix crash in Market."
2010-08-11 14:24:20 -07:00
Romain Guy
3f9b5a253f
Fix crash in Market.
...
Bug #2911272
Change-Id: I065e21b9d005ad693e1af1ad82755b5c2ae7b722
2010-08-11 14:23:43 -07:00
Nipun Kwatra
196fc9279d
Merge "Call startPreview after stopping for mUseStillCameraForTimeLapse=true case."
2010-08-11 14:17:19 -07:00
Kenny Root
1f5a8d96da
am 80328ba0: am 8ea71511: Merge "Initial tool for OBB manipulation" into gingerbread
...
Merge commit '80328ba09606bd0825d7d4c9a4f213d1de09e53a'
* commit '80328ba09606bd0825d7d4c9a4f213d1de09e53a':
Initial tool for OBB manipulation
2010-08-11 14:15:20 -07:00
Kenny Root
bf0cb26a1c
am f5ee5358: am ac9717ab: Merge "Move OBB file reading to DefaultContainerService" into gingerbread
...
Merge commit 'f5ee5358c187107b2e5a1e1fbcb5a648d793c798'
* commit 'f5ee5358c187107b2e5a1e1fbcb5a648d793c798':
Move OBB file reading to DefaultContainerService
2010-08-11 14:15:10 -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
6b63dce8c9
am 136d8336: am 90d1d104: Merge "This code in CameraSource really should hold the lock." into gingerbread
...
Merge commit '136d8336b6cb18067cd783185dacef34ae785519'
* commit '136d8336b6cb18067cd783185dacef34ae785519':
This code in CameraSource really should hold the lock.
2010-08-11 13:32:36 -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
Vairavan Srinivasan
5320b326a4
am 79cb9a5d: am f2e67a57: InputMethodService: Fix ignore case in showInputMethodPickerFromClient
...
Merge commit '79cb9a5d2d455af22c56b8cee045962c61668422'
* commit '79cb9a5d2d455af22c56b8cee045962c61668422':
InputMethodService: Fix ignore case in showInputMethodPickerFromClient
2010-08-11 12:39:24 -07:00
Jean-Baptiste Queru
ca542851b0
am 1ca94798: Fix build: HistoryRecord is now ActivityRecord
...
Merge commit '1ca94798ccd3a9b20f7824231cfb1f5fdf6bc719'
* commit '1ca94798ccd3a9b20f7824231cfb1f5fdf6bc719':
Fix build: HistoryRecord is now ActivityRecord
2010-08-11 12:35:55 -07:00
Jean-Baptiste Queru
dc15e5b903
am 44e43d1f: resolved conflicts for merge of efcac2ff to gingerbread-plus-aosp
...
Merge commit '44e43d1f6593ae912b3818692058196233cd4ac9'
* commit '44e43d1f6593ae912b3818692058196233cd4ac9':
InputMethodManagerService: Fix acore crash on boot up
2010-08-11 12:35:30 -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