Jake Hamby
9bdf2b0bc1
Merge "Fix typo and bug in CTS test class." into gingerbread
2010-08-13 14:51:09 -07:00
Ficus Kirkpatrick
6f931c1173
am 2abde6e0: Add --max-res-version flag to aapt.
...
Merge commit '2abde6e0ddaed3d2d60bad984a2adc3acbb8164c' into gingerbread
* commit '2abde6e0ddaed3d2d60bad984a2adc3acbb8164c':
Add --max-res-version flag to aapt.
2010-08-13 14:45:39 -07:00
Ficus Kirkpatrick
999a745146
Merge "Add --max-res-version flag to aapt." into gingerbread
2010-08-13 14:22:34 -07:00
Romain Guy
f285cb0975
Merge "fix [2912927] Can't get NV_draw_path extension to work" into gingerbread
2010-08-13 14:18:55 -07:00
Mathias Agopian
4a88b52235
fix [2912927] Can't get NV_draw_path extension to work
...
there was a problem with eglGetProcAddress() which would only work with
GLES 1.x contexts.
Change-Id: I4747671cbf7ed469bb471a377f1d6f36550d24df
2010-08-13 14:17:58 -07:00
Erik Gilling
ae95765868
surfaceflinger: don't check HWComposer numLayers unless one exists
...
Change-Id: I4b83f7bf7ba1318c70054117f14e759fe0ad105c
2010-08-13 10:10:48 -07:00
Eric Laurent
a54831c55e
Merge "Fix issue 2909189: System property ro.audio.silent no longer mutes system." into gingerbread
2010-08-13 08:00:14 -07:00
John Wang
dd978e3337
Merge "Update switch call and accept call." into gingerbread
2010-08-12 17:30:38 -07:00
Mike Dodd
d98ac85c79
Merge "Support getting codec, width, and height in URL for gtalk playback." into gingerbread
2010-08-12 16:45:19 -07:00
Mathias Agopian
72ca07d842
Merge "Fix a couple issues with the new hwcomposer HAL" into gingerbread
2010-08-12 15:07:29 -07:00
Mathias Agopian
45721773e1
Fix a couple issues with the new hwcomposer HAL
...
- we now clear the framebuffer upon request from the HAL
- the HAL list size could get out of sync with reality
- there was also an issue where sometime we could run past the list
Change-Id: Ic3a34314aed24181f2d8cc787096af83c046ef27
2010-08-12 15:03:26 -07:00
Trevor Johns
051a4e5fc9
am 4f3c5372: Merge "Fix subscribe links for Developer Forums doc." into froyo
...
Merge commit '4f3c5372a56ac47dac9c22c7f7ce97152128c795' into gingerbread
* commit '4f3c5372a56ac47dac9c22c7f7ce97152128c795':
Fix subscribe links for Developer Forums doc.
2010-08-12 14:30:11 -07:00
Trevor Johns
6d79df722b
Merge "Fix subscribe links for Developer Forums doc." into froyo
2010-08-12 14:27:33 -07:00
Wu-cheng Li
26105cad7c
Merge "Improve camera documentation." into gingerbread
2010-08-12 14:04:07 -07:00
Andreas Huber
240c79ec67
Merge "Fix the h.263 assembler to properly subset a buffer's range if it already has a range applied." into gingerbread
2010-08-12 11:02:17 -07:00
Andreas Huber
9f2c93d025
Merge "APacketSource is too verbose." into gingerbread
2010-08-12 11:02:06 -07:00
James Dong
ca901d984d
Merge "Handle large audio lost" into gingerbread
2010-08-12 10:07:51 -07:00
James Dong
ce49115a25
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
James Dong
28988defd2
Merge "Fix all fd leaks in authoring engine" into gingerbread
2010-08-12 09:13:14 -07:00
Mathias Agopian
ce6d43a32a
Merge "should fix sim build, hopefully" into gingerbread
2010-08-11 17:32:25 -07:00
Mathias Agopian
f1352df47f
should fix sim build, hopefully
...
Change-Id: I5390bd34dcca36fef43b5169386fff1b04cc842b
2010-08-11 17:31:33 -07:00
Jeff Brown
f2a67c067d
Merge "Fix ViewRoot bug attempting to finish synthetic KeyEvents." into gingerbread
2010-08-11 17:22:17 -07:00
Mathias Agopian
e9ba52c9c3
Merge "call into hwcomposer HAL when present" into gingerbread
2010-08-11 16:24:46 -07:00
Mathias Agopian
dca13144a3
Merge "don't handle the transparent region of a layer in draw()" into gingerbread
2010-08-11 16:21:01 -07:00
Mathias Agopian
b5983b03fd
Merge "get rid of our LayerVector implementation" into gingerbread
2010-08-11 16:20:38 -07:00
Mathias Agopian
c726179839
Merge "keep a list of visible sorted surfaces" into gingerbread
2010-08-11 16:19:16 -07:00
Jeff Brown
2f09a77659
Merge "Add support for the PointerLocation overlay." into gingerbread
2010-08-11 16:15:48 -07:00
Mathias Agopian
a350ff9869
call into hwcomposer HAL when present
...
Change-Id: I70f31c69a9436a43860e78977442863ecba6d27b
2010-08-11 16:08:45 -07:00
Mathias Agopian
bc7e31a84b
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
f6679fc6f7
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
4da7519993
keep a list of visible sorted surfaces
...
Change-Id: Ib815eeff894f8a3b1e79fbbf8186d5d91bb60285
2010-08-11 16:04:51 -07:00
Dianne Hackborn
0aa32b9dc9
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
3f9ff2076c
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
b6acda2f80
Merge "Initial tool for OBB manipulation" into gingerbread
2010-08-11 14:06:51 -07:00
Kenny Root
cc440b377b
Merge "Move OBB file reading to DefaultContainerService" into gingerbread
2010-08-11 14:06:39 -07:00
Andreas Huber
58f81d841b
Merge "This code in CameraSource really should hold the lock." into gingerbread
2010-08-11 13:20:59 -07:00
Kenny Root
1dfd9f8a97
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
Dianne Hackborn
76263ffc88
Merge "More native work." into gingerbread
2010-08-11 00:45:44 -07:00
Dianne Hackborn
c3ef3ae552
More native work.
...
Implement save/restore of state, and add native APIs for
configuration information.
Change-Id: I2a3ddc2ba605db58d7c8b2b31b9215fb323f90b5
2010-08-11 00:29:59 -07:00
Hung-ying Tyan
5736292a1a
Merge "SipAudioCall: perform local ops before network op in endCall()" into gingerbread
2010-08-10 20:48:18 -07:00
Yu Shan Emily Lau
44582306d2
Merge "Add the a power test case which simply do the audio playback. The actual power measurement will be done by another application." into gingerbread
2010-08-10 20:06:39 -07:00
Adam Powell
b351b3d6ac
Merge "Fix public bug http://code.google.com/p/android/issues/detail?id=10067 " into gingerbread
2010-08-10 17:52:15 -07:00
Konstantin Lopyrev
336b9815ce
Merge "Categorizing exported view properties." into gingerbread
2010-08-10 17:48:27 -07:00
Jeff Brown
8d4dfd25f7
Fix safe mode and KeyEvent.getMaxKeyCode().
...
Bug: 2901731
Change-Id: I78617c1b9dee3790fc590e5af4b5083368873184
2010-08-10 16:28:03 -07:00
Jeff Brown
81a5c091ca
Merge "Optimize VelocityTracker to run in linear time." into gingerbread
2010-08-10 16:26:56 -07:00
Andreas Huber
d74731ce8d
Merge "Remove some obsolete code." into gingerbread
2010-08-10 14:09:39 -07:00
Mathias Agopian
4b149a598f
Merge "improve a bit the implementation of eglGetProcAddress" into gingerbread
2010-08-10 13:50:22 -07:00
James Dong
166638b737
Merge "Add input buffer size check for software video encoders" into gingerbread
2010-08-10 13:27:09 -07:00
Andreas Huber
dd05839d2d
Merge "We're now going to ignore timestamps completely in gtalk video conferencing, playing video as soon as it comes in. We also make up fake timestamps in the rtp code, ignoring rtcp SR information to enable early startup." into gingerbread
2010-08-10 12:59:27 -07:00
Eric Fischer
ca71562968
Merge "Import revised translations. DO NOT MERGE" into gingerbread
2010-08-10 11:54:24 -07:00
