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

121426 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Trevor Johns
7643785aa8 Docs: Clean up HCE dev guide 
Fixed various typos and minor errors in the HCE dev guide. Also added a
note to clarify when CATEGORY_PAYMENT should be used vs CATEGORY_OTHER.

Issue: 11991294

Change-Id: Ifa3f30fe5f35715a4cea3f3565b6f3771f44814a
Signed-off-by: Trevor Johns <trevorjohns@google.com>
 2013-12-16 14:37:26 -08:00
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
Alan Viverette
f242659afc Refactor display adjustments into their own utils class 
Change-Id: Iddc413d7841d44b00e06ed1c5a02d54eb60858df
 2013-12-16 13:45:39 -08:00
Igor Murashkin
d83adf00ae Merge "camera2: Add support for embedding images into javadoc" 2013-12-16 21:41:02 +00:00
Scott Main
6b4cc77248 am 201c7874: am 9a1d3d50: am 31647391: am c53b7aad: fix typo bug: 12174614 
* commit '201c78745d093e0a13420a96647965ee1ccaf68f':
  fix typo bug: 12174614
 2013-12-16 21:38:11 +00:00
Scott Main
201c78745d am 9a1d3d50: am 31647391: am c53b7aad: fix typo bug: 12174614 
* commit '9a1d3d50cf42db2778dd0e7833608d3293353395':
  fix typo bug: 12174614
 2013-12-16 21:34:58 +00:00
Scott Main
9a1d3d50cf am 31647391: am c53b7aad: fix typo bug: 12174614 
* commit '316473915d6f41523c21d7077093c4071ebb4283':
  fix typo bug: 12174614
 2013-12-16 13:31:45 -08:00
Scott Main
316473915d am c53b7aad: fix typo bug: 12174614 
* commit 'c53b7aad505b9d3130ad56fe72989704015858a3':
  fix typo bug: 12174614
 2013-12-16 21:29:18 +00:00
Scott Main
c53b7aad50 fix typo 
bug: 12174614

Change-Id: I9a37c3b86c89254ad2a994531cf0bd1a3d31c85f
 2013-12-16 13:22:08 -08:00
Scott Main
8142898da2 add new training course for Interaction and Engagement 
Change-Id: If0880399c495aa9233cd30aa119b2d48fccd3dd8
 2013-12-16 13:18:24 -08:00
Elliott Hughes
3bfc6e76e6 am c0d6028f: am a012fee3: am 5d6332e3: Merge "AArch64: Use long for pointers in MediaDrm and MediaMuxer" 
* commit 'c0d6028f58b0a55e4956b1bc34ac7e4a98b0f894':
  AArch64: Use long for pointers in MediaDrm and MediaMuxer
 2013-12-16 21:07:24 +00:00
Elliott Hughes
c0d6028f58 am a012fee3: am 5d6332e3: Merge "AArch64: Use long for pointers in MediaDrm and MediaMuxer" 
* commit 'a012fee3c31803799176f3efb75cf2f929eeb062':
  AArch64: Use long for pointers in MediaDrm and MediaMuxer
 2013-12-16 21:04:50 +00:00
Elliott Hughes
a012fee3c3 am 5d6332e3: Merge "AArch64: Use long for pointers in MediaDrm and MediaMuxer" 
* commit '5d6332e3744e37ced079e5360f1fa3e0e5681d57':
  AArch64: Use long for pointers in MediaDrm and MediaMuxer
 2013-12-16 13:01:19 -08:00
Christopher Tate
409b7c98b4 am 4275cae4: am e998b607: am 6040bd47: Merge "Fix ResTable_config::CONFIG_* typo (MCC vs MNC)" 
* commit '4275cae4084cff0e267d9e0d63b968aa0788909a':
  Fix ResTable_config::CONFIG_* typo (MCC vs MNC)
 2013-12-16 20:58:11 +00:00
Elliott Hughes
5d6332e374 Merge "AArch64: Use long for pointers in MediaDrm and MediaMuxer" 2013-12-16 20:58:02 +00:00
Christopher Tate
4275cae408 am e998b607: am 6040bd47: Merge "Fix ResTable_config::CONFIG_* typo (MCC vs MNC)" 
* commit 'e998b6076532daaa9c2c621a09a04d67a75a5ad0':
  Fix ResTable_config::CONFIG_* typo (MCC vs MNC)
 2013-12-16 20:52:13 +00:00
Christopher Tate
e998b60765 am 6040bd47: Merge "Fix ResTable_config::CONFIG_* typo (MCC vs MNC)" 
* commit '6040bd47f41fd56ee608f6a80a0babe942ea1df3':
  Fix ResTable_config::CONFIG_* typo (MCC vs MNC)
 2013-12-16 12:49:55 -08:00
Christopher Tate
6040bd47f4 Merge "Fix ResTable_config::CONFIG_* typo (MCC vs MNC)" 2013-12-16 20:44:33 +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
Baligh Uddin
dd05f47fbe Import translations. DO NOT MERGE 
Change-Id: I592a031d629ff17b22100ca6a26c19b97c9cbb5e
Auto-generated-cl: translation import
 2013-12-16 10:40:38 -08: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
Baligh Uddin
0c6754df6a Import translations. DO NOT MERGE 
Change-Id: Ic32f2159f154aa071ff855f9ea8b9c9e5c69e2f8
Auto-generated-cl: translation import
 2013-12-16 10:34:17 -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
Baligh Uddin
4cdfdc50b8 Import translations. DO NOT MERGE 
Change-Id: I1dbccd0aee68a031d7259302a3bdf2526b066449
Auto-generated-cl: translation import
 2013-12-16 10:08:38 -08: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
Mårten Kongstad
4482e7cb67 Fix ResTable_config::CONFIG_* typo (MCC vs MNC) 
In commit 08d5b8f, the ResTable_config::CONFIG_* enum was incorrectly
changed to assign the same value to both CONFIG_MCC and CONFIG_MNC:
    - CONFIG_MCC = 0x0001,
    - CONFIG_MNC = 0x0002,
    + CONFIG_MCC = ACONFIGURATION_MCC,
    + CONFIG_MNC = ACONFIGURATION_MCC,

This commit assigns CONFIG_MNC the value ACONFIGURATION_MNC, as
intended.

Change-Id: I3b8799914a55debdb3ff30a82ada7ad990c49970
 2013-12-16 12:42:36 +01: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