Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
121,232 Commits 3 Branches 0 Tags
2807936f5dfdeff25e9ace3482100511a69dcf13
Commit Graph

33409 Commits

Author SHA1 Message Date
Zhijun He
2807936f5d Camera2: Update metadata java docs 
Java docs for below keys are updated:
- android.edge.mode
- android.noiseReduction.mode

Bug: 12135317
Change-Id: I950d46b90ece2f519e33719427801fc78b36b39c
 2013-12-17 10:35:40 -08:00
Zhijun He
f353742124 camera2: update java docs for metadata tag spec update 
Below tag spec java docs are updated:
- android.control.mode
- android.control.aeMode
- android.control.afMode
- android.control.awbMode

Bug: 12135317
Change-Id: I83f24c1816dfba1cc042e120fba43c5beb1bd2ae
 2013-12-16 16:56:35 -08:00
Chris Craik
6d384403d7 Merge "Create private properties on GLCanvas for experimentation with 3d" 2013-12-17 00:11:28 +00:00
Alan Viverette
add12e56d0 Merge "Don't cast FastScroller adapter to BaseAdapter" 2013-12-16 23:36:49 +00:00
Chris Craik
ba9b613437 Create private properties on GLCanvas for experimentation with 3d 
Change-Id: I17772f61efce727cb4c1111f4d97f58c741786b8
 2013-12-16 14:57:00 -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
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
Andres Morales
3e4b665bc6 Adding accessor for integer tech codes to Tag 
Change-Id: I02c272acc9744756677afa8a9d1dca7f1e63ca50
 2013-12-16 10:46:36 -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
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
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
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
Alan Viverette
4f434c7fb4 Don't cast FastScroller adapter to BaseAdapter 
BUG: 12130253
Change-Id: I78864a4603599daf39829d33414202c43ca97aa9
 2013-12-13 11:01:21 -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
Narayan Kamath
4448337b7e Merge "Use StrictJarFile instead of JarFile for cert collection." 2013-12-13 16:12:15 +00: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
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
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
Yorke Lee
833a9e58ce Merge "ContactsContract api changes" 2013-12-13 00:11:53 +00:00
Yorke Lee
6b86518c57 Merge "Expose CallLog provider fields as public API" 2013-12-13 00:09:26 +00:00
Katie McCormick
f2041ac56e Doc update: Update package summary for BT. 
Fixes:

b/8584860

Change-Id: Ic85436f90b46508e6a182e3fc51365f5bfb8da14
 2013-12-12 15:42:00 -08:00
Chris Craik
f57776b2d1 3d view system! 
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
 2013-12-12 10:18:23 -08:00
Narayan Kamath
eb565dc527 Use StrictJarFile instead of JarFile for cert collection. 
This ensures that we use the same underlying zip
processing code as the runtimes.

bug: 10193060

Change-Id: I0f287dd6fa95207cd02f648528ef6c08dd360a72
 2013-12-12 17:53:48 +00:00
Andres Morales
ec31555d88 Merge "Adding INfcUnlockSettings and NfcUnlock interface class." 2013-12-12 17:36:40 +00:00
Alan Viverette
774e89f14d Merge "Verify drawables added to ViewOverlay so they can be scheduled" 2013-12-12 02:08:42 +00:00
Alan Viverette
9205407998 Merge "Add caption window color attribute" 2013-12-12 01:20:32 +00:00
Alan Viverette
55d70620d9 Add caption window color attribute 
The WebVTT rendering implementation interprets window color as region
color, since there is no window for non-region captions.

BUG: 12020757
Change-Id: Ie891e1343d718783fc32c712860f886de22558ec
 2013-12-11 15:22:14 -08:00
Marco Nelissen
09cee9d21f am 4f6a1394: am c680bab3: am 69b46707: am ce3bd309: Merge "Parse UUID string with Long.parseLong" 
* commit '4f6a139493e922f2db5e4ee7bb5364e4f8487322':
  Parse UUID string with Long.parseLong
 2013-12-11 22:42:02 +00:00
Scott Main
2515e6a42f am 5f41b262: am aec930b2: am f70d7b9a: am cf5ed42f: am df75bdcc: rewrite intent guide and add doc with intents supported by platform apps 
* commit '5f41b262a5edb9f2ffb44fff77dc75d5cabec2ba':
  rewrite intent guide and add doc with intents supported by platform apps
 2013-12-11 22:27:19 +00:00
Marco Nelissen
4f6a139493 am c680bab3: am 69b46707: am ce3bd309: Merge "Parse UUID string with Long.parseLong" 
* commit 'c680bab3315de2f6af14c1e9fcd3aaf63fa15848':
  Parse UUID string with Long.parseLong
 2013-12-11 22:02:36 +00:00
Scott Main
5f41b262a5 am aec930b2: am f70d7b9a: am cf5ed42f: am df75bdcc: rewrite intent guide and add doc with intents supported by platform apps 
* commit 'aec930b2c6c7e9ad2a7808a1636f7c0fae0164af':
  rewrite intent guide and add doc with intents supported by platform apps
 2013-12-11 22:02:15 +00:00
Igor Murashkin
f51021c32c Merge "CameraMetadata: updated generated code (with markdown support)" 2013-12-11 21:20:44 +00:00
Alan Viverette
39de9bfa7f Verify drawables added to ViewOverlay so they can be scheduled 
Change-Id: I73d0633966f84876e2093c874acd6813efdbc370
 2013-12-11 13:15:47 -08:00
Marco Nelissen
69b4670730 am ce3bd309: Merge "Parse UUID string with Long.parseLong" 
* commit 'ce3bd309b12e9552c05d5a59a06d7883618c5ca0':
  Parse UUID string with Long.parseLong
 2013-12-11 10:14:56 -08:00
William Luh
3554740951 Merge "Expose new API for querying whether a certificate was user added." 2013-12-11 18:09:45 +00:00
Marco Nelissen
ce3bd309b1 Merge "Parse UUID string with Long.parseLong" 2013-12-11 18:07:50 +00:00
Igor Murashkin
ace5bf0412 CameraMetadata: updated generated code (with markdown support) 
- also updates description of android.blackLevel.lock

Change-Id: I2d10c492bd6779bbb51672da9854252ba18d4327
 2013-12-10 17:36:40 -08:00
Scott Main
f70d7b9ace am cf5ed42f: am df75bdcc: rewrite intent guide and add doc with intents supported by platform apps 
* commit 'cf5ed42f0b5f2b3787da39d19e9716d6b244b9b5':
  rewrite intent guide and add doc with intents supported by platform apps
 2013-12-10 17:04:57 -08:00
Scott Main
cf5ed42f0b am df75bdcc: rewrite intent guide and add doc with intents supported by platform apps 
* commit 'df75bdcc5546112958a6a5834c1a7e060f88bc68':
  rewrite intent guide and add doc with intents supported by platform apps
 2013-12-11 01:00:46 +00:00
Scott Main
df75bdcc55 rewrite intent guide and add doc with intents supported by platform apps 
Change-Id: Ida7ccbc693e7635198fd368b9560b7843266c7cc
 2013-12-10 15:53:37 -08:00
John Reck
7d2edfc073 Merge "Unbreak display list debug dumping" 2013-12-10 23:33:21 +00:00
John Reck
6304919732 Unbreak display list debug dumping 
Change-Id: I1c6a79f047b29fa60907f6e128cb843a45b88bff
 2013-12-10 15:22:01 -08:00