summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Add drawGlFunctor support to RenderThread"John Reck2013-12-164-96/+1558
|\
| * Add drawGlFunctor support to RenderThreadJohn Reck2013-12-134-96/+1558
| | | | | | | | | | | | | | | | | | | | | | Add gl functor to the prototype support to allow webview team to begin playing with RT Also create RemoteGLRenderer to avoid needing to make breaking changes to GLRenderer. Currently the differences are mainly around mFunctorsRunnable and how it queues itself up Change-Id: I1ca39056189b68cd7b8dded4dd5889d331f6660a
* | Merge "Adding accessor for integer tech codes to Tag"Andres Morales2013-12-161-0/+8
|\ \
| * | Adding accessor for integer tech codes to TagAndres Morales2013-12-161-0/+8
| | | | | | | | | | | | Change-Id: I02c272acc9744756677afa8a9d1dca7f1e63ca50
* | | am fc800d40: am fbd6d5a8: am 09fdc159: am 3ddee4de: Merge "[bootanimation] ↵Nick Kralevich2013-12-161-4/+0
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Drop user loadable bootanimation.zip abiltiy." * commit 'fc800d407d695926ba07299c4e27d1e06284098f': [bootanimation] Drop user loadable bootanimation.zip abiltiy.
| * \ \ am fbd6d5a8: am 09fdc159: am 3ddee4de: Merge "[bootanimation] Drop user ↵Nick Kralevich2013-12-161-4/+0
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | loadable bootanimation.zip abiltiy." * commit 'fbd6d5a8f8f242ab5a079cc6ed12e2ebaa8bb226': [bootanimation] Drop user loadable bootanimation.zip abiltiy.
| | * \ \ am 09fdc159: am 3ddee4de: Merge "[bootanimation] Drop user loadable ↵Nick Kralevich2013-12-161-4/+0
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bootanimation.zip abiltiy." * commit '09fdc159552c85032ce9860fc0d63b6eebeca82a': [bootanimation] Drop user loadable bootanimation.zip abiltiy.
| | | * \ \ am 3ddee4de: Merge "[bootanimation] Drop user loadable bootanimation.zip ↵Nick Kralevich2013-12-161-4/+0
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | abiltiy." * commit '3ddee4dec9b7ae2265c356f5809eae73e1ef8796': [bootanimation] Drop user loadable bootanimation.zip abiltiy.
| | | | * \ \ Merge "[bootanimation] Drop user loadable bootanimation.zip abiltiy."Nick Kralevich2013-12-161-4/+0
| | | | |\ \ \
| | | | | * | | [bootanimation] Drop user loadable bootanimation.zip abiltiy.Robert Craig2013-12-161-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A prior change removed the ability of the shell to push to /data/local. Because of this, the bootanimation code no longer supports users loading custom bootanimation.zip files. This patch drops the access attempt from the code. Change-Id: Ie30dd73699c8296be00dc6fbf14691e08baa6410 Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>
* | | | | | | | am 0f3390f8: am c4927389: am 1e609ac4: am 4e6c5408: am c8b93fd9: Merge "Doc ↵Katie McCormick2013-12-161-0/+3
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | update: clarify version of flags." into klp-docs * commit '0f3390f846ed5ee63e3926b78878c7b75ee2f0c0': Doc update: clarify version of flags.
| * | | | | | | am c4927389: am 1e609ac4: am 4e6c5408: am c8b93fd9: Merge "Doc update: ↵Katie McCormick2013-12-161-0/+3
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | clarify version of flags." into klp-docs * commit 'c49273895ea96da5d88c806fb6acd4a92b963f84': Doc update: clarify version of flags.
| | * | | | | | am 1e609ac4: am 4e6c5408: am c8b93fd9: Merge "Doc update: clarify version of ↵Katie McCormick2013-12-161-0/+3
| | |\ \ \ \ \ \ | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | flags." into klp-docs * commit '1e609ac45df13fed93df81e805ea6d6485da3aa0': Doc update: clarify version of flags.
| | | * | | | | am 4e6c5408: am c8b93fd9: Merge "Doc update: clarify version of flags." into ↵Katie McCormick2013-12-161-0/+3
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | klp-docs * commit '4e6c5408273882fc297142456c0ad5bbcb5f2f6a': Doc update: clarify version of flags.
| | | | * \ \ \ \ am c8b93fd9: Merge "Doc update: clarify version of flags." into klp-docsKatie McCormick2013-12-161-0/+3
| | | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c8b93fd9727d5ac408f492b22364c1d50c5bc97a': Doc update: clarify version of flags.
| | | | | * \ \ \ \ Merge "Doc update: clarify version of flags." into klp-docsKatie McCormick2013-12-161-0/+3
| | | | | |\ \ \ \ \
| | | | | | * | | | | Doc update: clarify version of flags.Katie McCormick2013-12-121-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: b/11999080 Change-Id: I0eda86d5162caab6809ff780387091544530dc32
* | | | | | | | | | | Merge "Calculate and show Ambient shadow."ztenghui2013-12-1611-95/+595
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Calculate and show Ambient shadow.ztenghui2013-12-1311-95/+595
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Basically we compute the shadow as a strip of triangles, whose alpha value is the strength of the shadow. We use the normal to extend the geometry. And we use static function and try to avoid new/malloc in the computation. Change-Id: I382286f1cad351bd5ff983f76f446c075819dcaf
* | | | | | | | | | | | am 1dfe7990: am 8f90e476: am 28635ca3: am 44291d9c: Merge "Use StrictJarFile ↵Narayan Kamath2013-12-160-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | instead of JarFile for cert collection." * commit '1dfe799027383bb0f2c2f38facca631d4968de8e': Use StrictJarFile instead of JarFile for cert collection.
| * | | | | | | | | | | am 8f90e476: am 28635ca3: am 44291d9c: Merge "Use StrictJarFile instead of ↵Narayan Kamath2013-12-161-14/+16
| |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | JarFile for cert collection." * commit '8f90e47694b441941fdf5f17fcb9927ec23fb50b': Use StrictJarFile instead of JarFile for cert collection.
| | * | | | | | | | | | am 28635ca3: am 44291d9c: Merge "Use StrictJarFile instead of JarFile for ↵Narayan Kamath2013-12-161-14/+16
| | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cert collection." * commit '28635ca3e3815ca01417ef03dd9debd938e34307': Use StrictJarFile instead of JarFile for cert collection.
| | | * | | | | | | | | am 44291d9c: Merge "Use StrictJarFile instead of JarFile for cert collection."Narayan Kamath2013-12-161-14/+16
| | | |\ \ \ \ \ \ \ \ \ | | | | | |_|_|_|/ / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '44291d9c2722e0d22dc6f909585f4302abdce205': Use StrictJarFile instead of JarFile for cert collection.
| | | | * | | | | | | | Merge "Use StrictJarFile instead of JarFile for cert collection."Narayan Kamath2013-12-161-14/+16
| | | | |\ \ \ \ \ \ \ \ | | | | | |_|_|_|_|/ / / | | | | |/| | | | | | |
| | | | | * | | | | | | Use StrictJarFile instead of JarFile for cert collection.Narayan Kamath2013-12-131-14/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This ensures that we use the same underlying zip processing code as the runtimes. bug: 10193060 (cherry picked from commit eb565dc527eda8c0a43df0d1f30132638ca4ba20) Change-Id: Iaaa26b02678278394619d0a41613d9ceeae3203c
* | | | | | | | | | | | am 1add7894: am 97b3e43f: am e2e15d6d: am a0ab49bb: Merge "Fix incorrect ↵Jesse Hall2013-12-151-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | name in eglSwapBuffers log wrapper" * commit '1add78943fa4ce3e74103ce9ef60a18f86483fc2': Fix incorrect name in eglSwapBuffers log wrapper
| * | | | | | | | | | | am 97b3e43f: am e2e15d6d: am a0ab49bb: Merge "Fix incorrect name in ↵Jesse Hall2013-12-151-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | eglSwapBuffers log wrapper" * commit '97b3e43ff108cb4761450732fc02e4b69502b8a0': Fix incorrect name in eglSwapBuffers log wrapper
| | * | | | | | | | | | am e2e15d6d: am a0ab49bb: Merge "Fix incorrect name in eglSwapBuffers log ↵Jesse Hall2013-12-151-1/+1
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | wrapper" * commit 'e2e15d6da1936890117ad21fb6b18cce321c7d2b': Fix incorrect name in eglSwapBuffers log wrapper
| | | * | | | | | | | | am a0ab49bb: Merge "Fix incorrect name in eglSwapBuffers log wrapper"Jesse Hall2013-12-141-1/+1
| | | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a0ab49bb52f44eac97f81117d6864edd6a2e0487': Fix incorrect name in eglSwapBuffers log wrapper
| | | | * | | | | | | | Merge "Fix incorrect name in eglSwapBuffers log wrapper"Jesse Hall2013-12-151-1/+1
| | | | |\ \ \ \ \ \ \ \
| | | | | * | | | | | | | Fix incorrect name in eglSwapBuffers log wrapperBrian Harris2013-12-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Correctly identify eglSwapBuffers in EGLLogWrapper, which had been labeled as "eglInitialize". Change-Id: I67c61e100e2f84400ceebc28712f036e5a055017
* | | | | | | | | | | | | resolved conflicts for merge of e0b14ea7 to masterKenny Root2013-12-1317-114/+50
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | | | | | | / / / / / / | |_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | Change-Id: Ie018d3e2eba1eb2d655c153880e1951b68c2bd51
| * | | | | | | | | | | am 31b9ec01: am 62d509d2: am 37c69fdd: Merge "Use java.util.Objects instead ↵Kenny Root2013-12-1317-114/+50
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | on internal API" * commit '31b9ec01ff6087773cb35af6824a6422a0181afb': Use java.util.Objects instead on internal API
| | * | | | | | | | | | am 62d509d2: am 37c69fdd: Merge "Use java.util.Objects instead on internal API"Kenny Root2013-12-1317-114/+50
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '62d509d24f91959b75219edd0ab1a6f22b82c600': Use java.util.Objects instead on internal API
| | | * | | | | | | | | am 37c69fdd: Merge "Use java.util.Objects instead on internal API"Kenny Root2013-12-1317-114/+50
| | | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '37c69fdd826f3973966430adc1abfbefc19bc16e': Use java.util.Objects instead on internal API
| | | | * | | | | | | | Merge "Use java.util.Objects instead on internal API"Kenny Root2013-12-1317-114/+50
| | | | |\ \ \ \ \ \ \ \ | | | | | |_|/ / / / / / | | | | |/| | | | | | |
| | | | | * | | | | | | Use java.util.Objects instead on internal APIKenny Root2013-12-1317-114/+50
| | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Not needed since java.util.Objects implements all the needed functionality. Change-Id: Icd31d49a9801d1705427f028e9ac927d58e7d34c
* | | | | | | | | | | am aab51473: Merge "Fix bad xml generation due to mismatched start/end tags" ↵Amith Yamasani2013-12-131-151/+178
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into klp-modular-dev * commit 'aab514738e346aae410a5a8339e2610a3b393bc6': Fix bad xml generation due to mismatched start/end tags
| * | | | | | | | | | Merge "Fix bad xml generation due to mismatched start/end tags" into ↵Amith Yamasani2013-12-131-151/+178
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | klp-modular-dev
| | * | | | | | | | | | Fix bad xml generation due to mismatched start/end tagsAmith Yamasani2013-12-131-151/+178
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was causing a problem with lost policy permissions when global proxy was set for a user. Extract all xml literals into constants to avoid such errors in the future. Fix some minor line length issues. Bug: 12065908 Change-Id: I11d532b4aaa978a09ac562fd6b9ddce1f699a03e
* | | | | | | | | | | | Merge commit 'e89a9a3f' into manualmergeAdam Lesinski2013-12-130-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Merge "Introduce a Lifecycle for system services" into klp-modular-devAdam Lesinski2013-12-1331-1581/+2259
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Introduce a Lifecycle for system servicesAdam Lesinski2013-12-1231-1581/+2259
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Provide an abstract class for system services to extend from, similar to the android.app.Service. This will allow services to receive events in a uniform way, and will allow services to be created and started in the correct order regardless of whether or not a particular service exists. Similar to android.app.Service, services are meant to implement Binder interfaces as inner classes. This prevents services from having incestuous access to each other and makes them use the public API. Change-Id: Iaacfee8d5f080a28d7cc606761f4624673ed390f
* | | | | | | | | | | | | Merge "Handle user-defined cache path for RS."Tim Murray2013-12-131-1/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Handle user-defined cache path for RS.Tim Murray2013-12-131-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I92e3346dca331ae6a9dfbe4f95292bc604dfd196
* | | | | | | | | | | | | | Merge "3d view system!"Chris Craik2013-12-1318-142/+667
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | 3d view system!Chris Craik2013-12-1218-142/+667
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | True 3d transformations are now supported by DisplayLists and the renderer, initially with the translationZ property on view. Renderer operations used directly by DisplayList (formerly, clip/save/restore/saveLayer) are now more simply managed by allocating them temporarily on the handler's allocator, which exists for a single frame. This is much simpler than continuing to expand the pool of pre-allocated DisplayListOps now that more operations are called directly by DisplayList, especially with z ordered drawing. Still TODO: -APIs for camera positioning, shadows -Make Z apis public, and expose through XML -Make invalidation / input 3d aware Change-Id: I95fe6fa03f9b6ddd34a7e0c6ec8dd9fe47c6c6eb
* | | | | | | | | | | | | | Fixing some accessibility bugs.Svetoslav2013-12-132-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Views not important for accessibility should not send events. 2. The base View implementation should not add it self to the list of children for accessibility. 3. Null pointer exception in AccessibilityNodeInfoCache. Change-Id: Ie5b373362269200ead13ffe632679bd42ee40309
* | | | | | | | | | | | | | Merge "Introduce a Lifecycle for system services"Adam Lesinski2013-12-1331-1581/+2259
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Introduce a Lifecycle for system servicesAdam Lesinski2013-12-1231-1581/+2259
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cherry-picked from klp-modular-dev Provide an abstract class for system services to extend from, similar to the android.app.Service. This will allow services to receive events in a uniform way, and will allow services to be created and started in the correct order regardless of whether or not a particular service exists. Similar to android.app.Service, services are meant to implement Binder interfaces as inner classes. This prevents services from having incestuous access to each other and makes them use the public API. Change-Id: Iaacfee8d5f080a28d7cc606761f4624673ed390f
generated by cgit v1.1 at 2025-02-04 18:30:15 +0000