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

121175 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Kristian Monsen
800d4d722f am b90d8591: am 13b648eb: am 584ace0d: Merge "Fix one and hide the other warnings from core/jni" 
* commit 'b90d8591343e1af176ff181e6bb343f739c037a6':
  Fix one and hide the other warnings from core/jni
 2013-12-13 07:31:40 +00:00
Kristian Monsen
b90d859134 am 13b648eb: am 584ace0d: Merge "Fix one and hide the other warnings from core/jni" 
* commit '13b648ebff99a3fb8c26152745d294a55f8c11b7':
  Fix one and hide the other warnings from core/jni
 2013-12-13 07:27:41 +00:00
Kristian Monsen
13b648ebff am 584ace0d: Merge "Fix one and hide the other warnings from core/jni" 
* commit '584ace0d3f79ff43db9298798065dd5beaa66a45':
  Fix one and hide the other warnings from core/jni
 2013-12-12 22:38:21 -08:00
Kristian Monsen
584ace0d3f Merge "Fix one and hide the other warnings from core/jni" 2013-12-13 06:32:03 +00:00
Adam Lesinski
ef2ea1faf6 Introduce a Lifecycle for system services 
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
 2013-12-12 18:49:49 -08:00
Yorke Lee
b62063316e Merge "Fix SDK build break due to link in hidden field in comment" 2013-12-13 01:30:32 +00:00
Yorke Lee
0a17393ee6 Fix SDK build break due to link in hidden field in comment 
Change-Id: I10bcfa01d1aea4fd95a99e4230f5c0217ec188ac
 2013-12-12 17:29:03 -08:00
Kenny Root
6210e332f1 am 87ec5091: am 2d7316d7: am 2a288bab: am fc2f459c: Merge "Add GCMParameterSpec to preloaded-classes" 
* commit '87ec50914cdd290ad5486adad01cfad4a0b9f59d':
  Add GCMParameterSpec to preloaded-classes
 2013-12-13 01:22:44 +00:00
Kenny Root
87ec50914c am 2d7316d7: am 2a288bab: am fc2f459c: Merge "Add GCMParameterSpec to preloaded-classes" 
* commit '2d7316d72d3aacf70b0ad2a51b3bdc53d1c025b3':
  Add GCMParameterSpec to preloaded-classes
 2013-12-13 01:19:59 +00:00
Kenny Root
2d7316d72d am 2a288bab: am fc2f459c: Merge "Add GCMParameterSpec to preloaded-classes" 
* commit '2a288babaef57308e042ed97caea6b49c8ae5033':
  Add GCMParameterSpec to preloaded-classes
 2013-12-13 01:16:45 +00:00
Kenny Root
2a288babae am fc2f459c: Merge "Add GCMParameterSpec to preloaded-classes" 
* commit 'fc2f459c522448331b79c388e9f7b19f72650586':
  Add GCMParameterSpec to preloaded-classes
 2013-12-12 17:13:38 -08:00
Kenny Root
fc2f459c52 Merge "Add GCMParameterSpec to preloaded-classes" 2013-12-13 01:08:26 +00:00
Katie McCormick
e217347556 am 9c514b8f: am 4561f199: am 08e0142f: am f85470e6: am fbbc1b79: Merge "Doc update: Update package summary for BT." into klp-docs 
* commit '9c514b8fe98603072e66cd44744cd1b42e28e678':
  Doc update: Update package summary for BT.
 2013-12-13 01:08:07 +00:00
Katie McCormick
9c514b8fe9 am 4561f199: am 08e0142f: am f85470e6: am fbbc1b79: Merge "Doc update: Update package summary for BT." into klp-docs 
* commit '4561f1990def36aef17dbb35511a1522195e7f95':
  Doc update: Update package summary for BT.
 2013-12-13 01:04:09 +00:00
Katie McCormick
4561f1990d am 08e0142f: am f85470e6: am fbbc1b79: Merge "Doc update: Update package summary for BT." into klp-docs 
* commit '08e0142fb72cf08a5784b20d42d18bf7a35370cf':
  Doc update: Update package summary for BT.
 2013-12-13 01:01:18 +00:00
Katie McCormick
08e0142fb7 am f85470e6: am fbbc1b79: Merge "Doc update: Update package summary for BT." into klp-docs 
* commit 'f85470e6861e012c145dc04d70656757be611280':
  Doc update: Update package summary for BT.
 2013-12-12 16:58:35 -08:00
Katie McCormick
f85470e686 am fbbc1b79: Merge "Doc update: Update package summary for BT." into klp-docs 
* commit 'fbbc1b791e0a26a56bc8d45622d06f06e020191a':
  Doc update: Update package summary for BT.
 2013-12-13 00:55:59 +00:00
Katie McCormick
fbbc1b791e Merge "Doc update: Update package summary for BT." into klp-docs 2013-12-13 00:52:33 +00:00