Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | | | | | | | am 9185e26a: am fb86ce93: Add watermark support. | Dianne Hackborn | 2010-08-11 | 1 | -6/+110 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | am fb86ce93: Add watermark support. | Dianne Hackborn | 2010-08-11 | 1 | -6/+110 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / / / / / | | |/| | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | Add watermark support. | Dianne Hackborn | 2010-08-11 | 1 | -6/+110 | |
* | | | | | | | | | | | | | | | Fix bug 2911396 - documentation fix | Adam Powell | 2010-08-11 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | | Merge "Fix bug 2911311 and bug 2911700" | Adam Powell | 2010-08-11 | 6 | -25/+97 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | Fix bug 2911311 and bug 2911700 | Adam Powell | 2010-08-11 | 6 | -25/+97 | |
* | | | | | | | | | | | | | | | | Merge "Bunch of fixes." | Romain Guy | 2010-08-11 | 3 | -7/+36 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | Bunch of fixes. | Romain Guy | 2010-08-11 | 3 | -7/+36 | |
* | | | | | | | | | | | | | | | | Fix the build from two breaking changes (update to current.xml and ViewRoot i... | Chet Haase | 2010-08-11 | 2 | -4/+5 | |
* | | | | | | | | | | | | | | | | Merge "Fix bug 2911529" | Adam Powell | 2010-08-11 | 1 | -1/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | Fix bug 2911529 | Adam Powell | 2010-08-11 | 1 | -1/+3 | |
| |/ / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | am 70a7c92e: am 65f2490e: Merge "should fix sim build, hopefully" into ginger... | Mathias Agopian | 2010-08-11 | 1 | -0/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | am 65f2490e: Merge "should fix sim build, hopefully" into gingerbread | Mathias Agopian | 2010-08-11 | 1 | -0/+3 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | Merge "should fix sim build, hopefully" into gingerbread | Mathias Agopian | 2010-08-11 | 1 | -0/+3 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | should fix sim build, hopefully | Mathias Agopian | 2010-08-11 | 1 | -0/+3 | |
* | | | | | | | | | | | | | | | | Merge "resolved conflicts for merge of 4e14159a to master" | Jeff Brown | 2010-08-11 | 1 | -11/+20 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | resolved conflicts for merge of 4e14159a to master | Jeff Brown | 2010-08-11 | 1 | -11/+20 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / | | | | | / / / / / / / / / / / / | | |_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | am bb65ae02: Merge "Fix ViewRoot bug attempting to finish synthetic KeyEvents... | Jeff Brown | 2010-08-11 | 1 | -12/+20 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / | ||||||
| | | * | | | | | | | | | | | | | Merge "Fix ViewRoot bug attempting to finish synthetic KeyEvents." into ginge... | Jeff Brown | 2010-08-11 | 1 | -12/+20 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | * | | | | | | | | | | | | | Fix ViewRoot bug attempting to finish synthetic KeyEvents. | Jeff Brown | 2010-08-11 | 1 | -12/+20 | |
* | | | | | | | | | | | | | | | | | Make Fragments use the new animation APIs | Chet Haase | 2010-08-11 | 14 | -306/+419 | |
|/ / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | Merge "ActionBar overlay mode, height fetching, show/hide" | Adam Powell | 2010-08-11 | 12 | -9/+262 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | ActionBar overlay mode, height fetching, show/hide | Adam Powell | 2010-08-11 | 12 | -9/+262 | |
* | | | | | | | | | | | | | | | | | Merge "Delete shaders after a compile error. Also disable extra logging." | Romain Guy | 2010-08-11 | 2 | -1/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | Delete shaders after a compile error. Also disable extra logging. | Romain Guy | 2010-08-11 | 2 | -1/+3 | |
* | | | | | | | | | | | | | | | | | | am 5744cd6a: am 90dc48b1: Merge "call into hwcomposer HAL when present" into ... | Mathias Agopian | 2010-08-11 | 11 | -7/+340 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | am 90dc48b1: Merge "call into hwcomposer HAL when present" into gingerbread | Mathias Agopian | 2010-08-11 | 11 | -7/+340 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | Merge "call into hwcomposer HAL when present" into gingerbread | Mathias Agopian | 2010-08-11 | 11 | -7/+340 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | | | call into hwcomposer HAL when present | Mathias Agopian | 2010-08-11 | 11 | -7/+340 | |
* | | | | | | | | | | | | | | | | | | am 308e6989: am 24d7050c: Merge "don\'t handle the transparent region of a la... | Mathias Agopian | 2010-08-11 | 1 | -15/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | am 24d7050c: Merge "don\'t handle the transparent region of a layer in draw()... | Mathias Agopian | 2010-08-11 | 1 | -15/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | | | | | Merge "don't handle the transparent region of a layer in draw()" into gingerb... | Mathias Agopian | 2010-08-11 | 1 | -15/+1 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / | ||||||
| | | * | | | | | | | | | | | | | | | don't handle the transparent region of a layer in draw() | Mathias Agopian | 2010-08-11 | 1 | -15/+1 | |
* | | | | | | | | | | | | | | | | | | am f7db3e21: am 8e7515d9: Merge "get rid of our LayerVector implementation" i... | Mathias Agopian | 2010-08-11 | 4 | -113/+22 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | am 8e7515d9: Merge "get rid of our LayerVector implementation" into gingerbread | Mathias Agopian | 2010-08-11 | 4 | -113/+22 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | | | | | Merge "get rid of our LayerVector implementation" into gingerbread | Mathias Agopian | 2010-08-11 | 4 | -113/+22 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / | ||||||
| | | * | | | | | | | | | | | | | | | get rid of our LayerVector implementation | Mathias Agopian | 2010-08-11 | 4 | -113/+22 | |
* | | | | | | | | | | | | | | | | | | am 801d0b33: am 025822a0: Merge "keep a list of visible sorted surfaces" into... | Mathias Agopian | 2010-08-11 | 2 | -15/+30 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | am 025822a0: Merge "keep a list of visible sorted surfaces" into gingerbread | Mathias Agopian | 2010-08-11 | 2 | -15/+30 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | | | | | Merge "keep a list of visible sorted surfaces" into gingerbread | Mathias Agopian | 2010-08-11 | 2 | -15/+30 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / | | | | | | / / / / / / / / / / / / | | | |_|_|/ / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | | keep a list of visible sorted surfaces | Mathias Agopian | 2010-08-11 | 2 | -15/+30 | |
* | | | | | | | | | | | | | | | | | am f66f8a58: am 95af0c14: Merge "Add support for the PointerLocation overlay.... | Jeff Brown | 2010-08-11 | 8 | -31/+150 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / | | | | | / / / / / / / / / / / / | |_|_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | am 95af0c14: Merge "Add support for the PointerLocation overlay." into ginger... | Jeff Brown | 2010-08-11 | 8 | -31/+150 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | | | Merge "Add support for the PointerLocation overlay." into gingerbread | Jeff Brown | 2010-08-11 | 8 | -31/+150 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | | | | Add support for the PointerLocation overlay. | Jeff Brown | 2010-08-11 | 8 | -31/+150 | |
* | | | | | | | | | | | | | | | | | Merge "add a Skip option" | Freeman Ng | 2010-08-11 | 3 | -18/+47 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | add a Skip option | Freeman Ng | 2010-08-11 | 3 | -18/+47 | |
* | | | | | | | | | | | | | | | | | | am 2d8b9fe0: am bd1c082c: Merge "New system property "sys.boot_completed" set... | Dianne Hackborn | 2010-08-11 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / | |/| | | | | / / / / / / / / / / / | |_|_|_|_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | am bd1c082c: Merge "New system property "sys.boot_completed" set to 1 when bo... | Dianne Hackborn | 2010-08-11 | 1 | -0/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | Merge "New system property "sys.boot_completed" set to 1 when boot completed.... | Dianne Hackborn | 2010-08-11 | 1 | -0/+1 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |