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