drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
121,195 Commits 1 Branch 0 Tags
Commit Graph

121195 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Shih
8a7af570ac Merge "MediaController does not check for cancelled motions in onTouchEvent, causing nested invocations of WindowManagerGlobal.addView. Sample stack trace below." 2013-12-16 22:35:28 +00:00
Igor Murashkin
d83adf00ae Merge "camera2: Add support for embedding images into javadoc" 2013-12-16 21:41:02 +00:00
Igor Murashkin
7a9b30e9e3 camera2: Add support for embedding images into javadoc 
- Also finishes specifying CaptureResult#LENS_SHADING_MAP family

Bug: 12135317
Change-Id: I95ffd61872fefcf2c79cb4f5aa0740162ccc16ad
 2013-12-16 11:43:49 -08:00
John Reck
0a11eb10ff Merge "Add drawGlFunctor support to RenderThread" 2013-12-16 18:55:22 +00:00
Andres Morales
2ab25f1525 Merge "Adding accessor for integer tech codes to Tag" 2013-12-16 18:50:23 +00:00
Nick Kralevich
9d7d4da6b7 am fc800d40: am fbd6d5a8: am 09fdc159: am 3ddee4de: Merge "[bootanimation] Drop user loadable bootanimation.zip abiltiy." 
* commit 'fc800d407d695926ba07299c4e27d1e06284098f':
  [bootanimation] Drop user loadable bootanimation.zip abiltiy.
 2013-12-16 18:47:03 +00:00
Andres Morales
3e4b665bc6 Adding accessor for integer tech codes to Tag 
Change-Id: I02c272acc9744756677afa8a9d1dca7f1e63ca50
 2013-12-16 10:46:36 -08:00
Nick Kralevich
fc800d407d am fbd6d5a8: am 09fdc159: am 3ddee4de: Merge "[bootanimation] Drop user loadable bootanimation.zip abiltiy." 
* commit 'fbd6d5a8f8f242ab5a079cc6ed12e2ebaa8bb226':
  [bootanimation] Drop user loadable bootanimation.zip abiltiy.
 2013-12-16 18:44:04 +00:00
Nick Kralevich
fbd6d5a8f8 am 09fdc159: am 3ddee4de: Merge "[bootanimation] Drop user loadable bootanimation.zip abiltiy." 
* commit '09fdc159552c85032ce9860fc0d63b6eebeca82a':
  [bootanimation] Drop user loadable bootanimation.zip abiltiy.
 2013-12-16 18:41:03 +00:00
Katie McCormick
d9a32847e5 am 0f3390f8: am c4927389: am 1e609ac4: am 4e6c5408: am c8b93fd9: Merge "Doc update: clarify version of flags." into klp-docs 
* commit '0f3390f846ed5ee63e3926b78878c7b75ee2f0c0':
  Doc update: clarify version of flags.
 2013-12-16 18:39:25 +00:00
Katie McCormick
0f3390f846 am c4927389: am 1e609ac4: am 4e6c5408: am c8b93fd9: Merge "Doc update: clarify version of flags." into klp-docs 
* commit 'c49273895ea96da5d88c806fb6acd4a92b963f84':
  Doc update: clarify version of flags.
 2013-12-16 18:36:41 +00:00
Nick Kralevich
09fdc15955 am 3ddee4de: Merge "[bootanimation] Drop user loadable bootanimation.zip abiltiy." 
* commit '3ddee4dec9b7ae2265c356f5809eae73e1ef8796':
  [bootanimation] Drop user loadable bootanimation.zip abiltiy.
 2013-12-16 10:36:39 -08:00
Katie McCormick
c49273895e am 1e609ac4: am 4e6c5408: am c8b93fd9: Merge "Doc update: clarify version of flags." into klp-docs 
* commit '1e609ac45df13fed93df81e805ea6d6485da3aa0':
  Doc update: clarify version of flags.
 2013-12-16 18:33:42 +00:00
Katie McCormick
1e609ac45d am 4e6c5408: am c8b93fd9: Merge "Doc update: clarify version of flags." into klp-docs 
* commit '4e6c5408273882fc297142456c0ad5bbcb5f2f6a':
  Doc update: clarify version of flags.
 2013-12-16 10:29:57 -08:00
Nick Kralevich
3ddee4dec9 Merge "[bootanimation] Drop user loadable bootanimation.zip abiltiy." 2013-12-16 18:28:42 +00:00
Katie McCormick
4e6c540827 am c8b93fd9: Merge "Doc update: clarify version of flags." into klp-docs 
* commit 'c8b93fd9727d5ac408f492b22364c1d50c5bc97a':
  Doc update: clarify version of flags.
 2013-12-16 18:28:00 +00:00
Katie McCormick
c8b93fd972 Merge "Doc update: clarify version of flags." into klp-docs 2013-12-16 18:25:12 +00:00
ztenghui
27e391014a Merge "Calculate and show Ambient shadow." 2013-12-16 17:18:12 +00:00
Narayan Kamath
95de161efd am 1dfe7990: am 8f90e476: am 28635ca3: am 44291d9c: Merge "Use StrictJarFile instead of JarFile for cert collection." 
* commit '1dfe799027383bb0f2c2f38facca631d4968de8e':
  Use StrictJarFile instead of JarFile for cert collection.
 2013-12-16 15:29:39 +00:00
Narayan Kamath
1dfe799027 am 8f90e476: am 28635ca3: am 44291d9c: Merge "Use StrictJarFile instead of JarFile for cert collection." 
* commit '8f90e47694b441941fdf5f17fcb9927ec23fb50b':
  Use StrictJarFile instead of JarFile for cert collection.
 2013-12-16 15:26:41 +00:00
Narayan Kamath
8f90e47694 am 28635ca3: am 44291d9c: Merge "Use StrictJarFile instead of JarFile for cert collection." 
* commit '28635ca3e3815ca01417ef03dd9debd938e34307':
  Use StrictJarFile instead of JarFile for cert collection.
 2013-12-16 15:23:50 +00:00
Narayan Kamath
28635ca3e3 am 44291d9c: Merge "Use StrictJarFile instead of JarFile for cert collection." 
* commit '44291d9c2722e0d22dc6f909585f4302abdce205':
  Use StrictJarFile instead of JarFile for cert collection.
 2013-12-16 07:20:26 -08:00
Robert Craig
cee6a096b1 [bootanimation] Drop user loadable bootanimation.zip abiltiy. 
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>
 2013-12-16 09:42:51 -05:00
Narayan Kamath
44291d9c27 Merge "Use StrictJarFile instead of JarFile for cert collection." 2013-12-16 11:29:46 +00:00
Jesse Hall
d44e20c11e am 1add7894: am 97b3e43f: am e2e15d6d: am a0ab49bb: Merge "Fix incorrect name in eglSwapBuffers log wrapper" 
* commit '1add78943fa4ce3e74103ce9ef60a18f86483fc2':
  Fix incorrect name in eglSwapBuffers log wrapper
 2013-12-15 00:25:52 +00:00
Jesse Hall
1add78943f am 97b3e43f: am e2e15d6d: am a0ab49bb: Merge "Fix incorrect name in eglSwapBuffers log wrapper" 
* commit '97b3e43ff108cb4761450732fc02e4b69502b8a0':
  Fix incorrect name in eglSwapBuffers log wrapper
 2013-12-15 00:22:37 +00:00
Jesse Hall
97b3e43ff1 am e2e15d6d: am a0ab49bb: Merge "Fix incorrect name in eglSwapBuffers log wrapper" 
* commit 'e2e15d6da1936890117ad21fb6b18cce321c7d2b':
  Fix incorrect name in eglSwapBuffers log wrapper
 2013-12-15 00:20:11 +00:00
Jesse Hall
e2e15d6da1 am a0ab49bb: Merge "Fix incorrect name in eglSwapBuffers log wrapper" 
* commit 'a0ab49bb52f44eac97f81117d6864edd6a2e0487':
  Fix incorrect name in eglSwapBuffers log wrapper
 2013-12-14 16:16:24 -08:00
Jesse Hall
a0ab49bb52 Merge "Fix incorrect name in eglSwapBuffers log wrapper" 2013-12-15 00:11:21 +00:00
ztenghui
55bfb4e728 Calculate and show Ambient shadow. 
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
 2013-12-13 17:25:47 -08:00
John Reck
3dfe19f72c Add drawGlFunctor support to RenderThread 
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
 2013-12-13 17:07:36 -08:00
Kenny Root
6a0db59901 resolved conflicts for merge of e0b14ea7 to master 
Change-Id: Ie018d3e2eba1eb2d655c153880e1951b68c2bd51
 2013-12-13 15:59:51 -08:00
Amith Yamasani
d08eadd287 am aab51473: Merge "Fix bad xml generation due to mismatched start/end tags" into klp-modular-dev 
* commit 'aab514738e346aae410a5a8339e2610a3b393bc6':
  Fix bad xml generation due to mismatched start/end tags
 2013-12-13 22:57:39 +00:00
Adam Lesinski
235ca6ec98 Merge commit 'e89a9a3f' into manualmerge 2013-12-13 14:44:06 -08:00
Tim Murray
a038bb402b Merge "Handle user-defined cache path for RS." 2013-12-13 22:39:36 +00:00
Kenny Root
e0b14ea70b am 31b9ec01: am 62d509d2: am 37c69fdd: Merge "Use java.util.Objects instead on internal API" 
* commit '31b9ec01ff6087773cb35af6824a6422a0181afb':
  Use java.util.Objects instead on internal API
 2013-12-13 22:23:33 +00:00
Kenny Root
31b9ec01ff am 62d509d2: am 37c69fdd: Merge "Use java.util.Objects instead on internal API" 
* commit '62d509d24f91959b75219edd0ab1a6f22b82c600':
  Use java.util.Objects instead on internal API
 2013-12-13 22:20:37 +00:00
Kenny Root
62d509d24f am 37c69fdd: Merge "Use java.util.Objects instead on internal API" 
* commit '37c69fdd826f3973966430adc1abfbefc19bc16e':
  Use java.util.Objects instead on internal API
 2013-12-13 14:17:29 -08:00
Amith Yamasani
aab514738e Merge "Fix bad xml generation due to mismatched start/end tags" into klp-modular-dev 2013-12-13 22:16:58 +00:00
Kenny Root
37c69fdd82 Merge "Use java.util.Objects instead on internal API" 2013-12-13 22:12:52 +00:00
Chris Craik
18809c063b Merge "3d view system!" 2013-12-13 21:55:50 +00:00
Kenny Root
e6585b32ea Use java.util.Objects instead on internal API 
Not needed since java.util.Objects implements all the needed
functionality.

Change-Id: Icd31d49a9801d1705427f028e9ac927d58e7d34c
 2013-12-13 13:40:30 -08:00
Tim Murray
abe55e9224 Handle user-defined cache path for RS. 
Change-Id: I92e3346dca331ae6a9dfbe4f95292bc604dfd196
 2013-12-13 12:58:07 -08:00
Svetoslav
f8bc964289 Fixing some accessibility bugs. 
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
 2013-12-13 10:45:03 -08:00
Adam Lesinski
e89a9a3f93 Merge "Introduce a Lifecycle for system services" into klp-modular-dev 2013-12-13 18:33:24 +00:00
Adam Lesinski
eb3a0fadfe Merge "Introduce a Lifecycle for system services" 2013-12-13 18:33:01 +00:00
Amith Yamasani
ef38a10353 Fix bad xml generation due to mismatched start/end tags 
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
 2013-12-13 09:05:26 -08:00
Narayan Kamath
1f0299a9cb Use StrictJarFile instead of JarFile for cert collection. 
This ensures that we use the same underlying zip
processing code as the runtimes.

bug: 10193060

(cherry picked from commit eb565dc527eda8c0a43df0d1f30132638ca4ba20)

Change-Id: Iaaa26b02678278394619d0a41613d9ceeae3203c
 2013-12-13 16:21:58 +00:00
Narayan Kamath
4448337b7e Merge "Use StrictJarFile instead of JarFile for cert collection." 2013-12-13 16:12:15 +00:00
Kristian Monsen
85948593e3 resolved conflicts for merge of 800d4d72 to master 
Change-Id: Ib1defc447745e5406d64c0d99c962832c79d15ef
 2013-12-12 23:59:37 -08:00