ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 9 Pull Requests Releases Wiki Activity
19,269 Commits 2 Branches 0 Tags 54 MiB
e1dbabef5b
Commit Graph

19269 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
John Huang
e1dbabef5b am edfe20c4: am c636b846: Merge "Enhance WspTypeDecoder to decode Content Type Parameters" 
Merge commit 'edfe20c4bd04716420a47516959d7c0e3e0064f6'

* commit 'edfe20c4bd04716420a47516959d7c0e3e0064f6':
  Enhance WspTypeDecoder to decode Content Type Parameters
 2010-08-12 10:32:39 -07:00
John Huang
a8fd9374ed 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
7730855429 am 8aa244ea: am 45cb3cfa: Merge "Handle large audio lost" into gingerbread 
Merge commit '8aa244eab7ba834439cc919fd1f83d1e4ef49aff'

* commit '8aa244eab7ba834439cc919fd1f83d1e4ef49aff':
  Handle large audio lost
 2010-08-12 10:22:58 -07:00
James Dong
6ae743089f am f4e26da1: am b6541f0a: Merge "Fix a crash due to unnecessary check on the codec config data for H263 video track" into gingerbread 
Merge commit 'f4e26da1af90145564f6065d62cf8efcef0c6f04'

* commit 'f4e26da1af90145564f6065d62cf8efcef0c6f04':
  Fix a crash due to unnecessary check on the codec config data for H263 video track
 2010-08-12 10:22:48 -07:00
James Dong
53bcc7833b 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
5e866868e1 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
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
John Huang
812a5686df Merge "Enhance WspTypeDecoder to decode Content Type Parameters" 2010-08-12 10:07:06 -07:00
James Dong
e5b37981cf am 0386d04b: am 581581fe: Merge "Fix all fd leaks in authoring engine" into gingerbread 
Merge commit '0386d04b19619b03b6bce830010e11d31d3f8a5c'

* commit '0386d04b19619b03b6bce830010e11d31d3f8a5c':
  Fix all fd leaks in authoring engine
 2010-08-12 09:32:18 -07:00
James Dong
6ad3d3891d 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
28988defd2 Merge "Fix all fd leaks in authoring engine" into gingerbread 2010-08-12 09:13:14 -07:00
Maksymilian Osowski
47aca3e1ab Merge "Added more info to the Summarizer." 2010-08-12 08:57:57 -07:00
Irfan Sheriff
df5f0d3677 Merge "Asynchronous API" 2010-08-12 07:58:46 -07:00
Shih-wei Liao
1bec861125 Merge "Fix anonymous struct." 2010-08-12 06:33:02 -07:00
Steve Block
5024310068 Merge "Update DeviceOrientationManager to be specific to a WebViewCore" 2010-08-12 06:30:31 -07:00
Daniel Sandler
f3bda2e870 Merge "System bar settings panel: first pass." 2010-08-12 04:58:40 -07:00
Dianne Hackborn
4ac3d56e78 Merge "Fix back popping the back stack too much." 2010-08-11 22:40:53 -07:00
Dianne Hackborn
2acf248049 am 9185e26a: am fb86ce93: Add watermark support. 
Merge commit '9185e26a8f06dd7013a528ffa2fe6b3f4aa58b7e'

* commit '9185e26a8f06dd7013a528ffa2fe6b3f4aa58b7e':
  Add watermark support.
 2010-08-11 22:10:07 -07:00
Dianne Hackborn
6c80c2b64b 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
Adam Powell
7bf432b8e4 Merge "Fix bug 2911311 and bug 2911700" 2010-08-11 21:59:54 -07:00
Romain Guy
436ce1e44d Merge "Bunch of fixes." 2010-08-11 19:38:40 -07:00
Adam Powell
622acae072 Merge "Fix bug 2911529" 2010-08-11 18:24:47 -07:00
Mathias Agopian
a0819fc7e4 am 70a7c92e: am 65f2490e: Merge "should fix sim build, hopefully" into gingerbread 
Merge commit '70a7c92e161225f587af453e01d2b124dbf6303f'

* commit '70a7c92e161225f587af453e01d2b124dbf6303f':
  should fix sim build, hopefully
 2010-08-11 18:07:42 -07:00
Jeff Brown
bd947ddd5e Merge "resolved conflicts for merge of 4e14159a to master" 2010-08-11 18:05:04 -07:00
Jeff Brown
a28db8319c resolved conflicts for merge of 4e14159a to master 
Change-Id: I42dc1efc2218af326a826aeb16daded71722b363
 2010-08-11 18:00:34 -07:00
Mathias Agopian
ea6dbaf302 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
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
c39f50a827 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
Adam Powell
d13428f2d3 Merge "ActionBar overlay mode, height fetching, show/hide" 2010-08-11 17:26:10 -07:00
Jeff Brown
f2a67c067d Merge "Fix ViewRoot bug attempting to finish synthetic KeyEvents." into gingerbread 2010-08-11 17:22:17 -07:00
Romain Guy
02b281160f Merge "Delete shaders after a compile error. Also disable extra logging." 2010-08-11 16:40:28 -07:00
Mathias Agopian
52271ad016 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
f44baa2e36 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
fdc848831b 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
8ea0bbd9b0 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
a9cedd1d18 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
127fbb7943 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
c1ee0bea39 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
e9ba52c9c3 Merge "call into hwcomposer HAL when present" into gingerbread 2010-08-11 16:24:46 -07:00
Mathias Agopian
820863e774 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
fff3f4af49 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
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
bdd025a9d4 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
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