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

33442 Commits

Author SHA1 Message Date
Zhijun He
2db56026bf Camera2: fix onClosed callback issue 
The camera isClosed status shouldn't be checked to fire onClosed callback,
otherwise, onClosed callback is almost never fired when camera close is called
because the camera device is already closed.

Change-Id: I987242d53a12082828a992404ed55ee8a378f93f
 2014-01-02 15:12:00 -08:00
Zhijun He
d842fcd3af Camera2: remove waitUntilIdle from Camera2 API 
Change-Id: Id034573d8b50aa0bc93bf7f0e776eb55316746ed
 2013-12-26 14:14:04 -08:00
Zhijun He
5a9ff37923 Camera2: Update availableThumbnailSizes java doc 
Bug: 12135317
Change-Id: I4012ed3e7cd6394c5e964aaeb3381b4932c44b11
 2013-12-26 11:49:09 -08:00
Alan Viverette
ca7a257628 Merge "Add APIs and implementation for additional caption edge types" 2013-12-20 00:40:36 +00:00
Amith Yamasani
49782e46c0 am 9158825f: Move some system services to separate directories 
* commit '9158825f9c41869689d6b1786d7c7aa8bdd524ce':
  Move some system services to separate directories
 2013-12-19 23:30:35 +00:00
Amith Yamasani
9158825f9c Move some system services to separate directories 
Refactored the directory structure so that services can be optionally
excluded. This is step 1. Will be followed by another change that makes
it possible to remove services from the build.

Change-Id: Ideacedfd34b5e213217ad3ff4ebb21c4a8e73f85
 2013-12-19 15:25:37 -08:00
Dianne Hackborn
4dace6f66d Merge "Improvements to battery stats." 2013-12-19 22:51:35 +00:00
Alan Viverette
ce32ea7345 Add APIs and implementation for additional caption edge types 
Change-Id: I62d97a0b3e3b751d698a889eec80dc79fb908d7a
 2013-12-19 13:42:28 -08:00
Dianne Hackborn
57ed6a6440 Improvements to battery stats. 
Now collect per-network packet usage data.

Big reworking of history to be able to start adding more events to it.
Also rework how the checking dump is done to make it more compact, so
maybe we can start uploading it.

Change-Id: I2b29e049ebe073671d0dbe38324223cc2ec0d043
 2013-12-19 13:09:51 -08:00
Craig Mautner
ff288f7f57 resolved conflicts for merge of b7bba718 to master 
Change-Id: Ibbac3f6e3eda0149ae9446d6baed1d1bee5138ac
 2013-12-19 10:55:17 -08:00
Craig Mautner
ed6649f89f DO NOT MERGE: Eliminate StackBox. 
StackBox is too constraining. Adding size and position to TaskStacks
directly makes stack positioning and management more flexible and
prepares for ActivityView.

Change-Id: I33c6b4e1c23a5a8069fd507c160bcb34e4d287b2
 2013-12-19 10:51:23 -08:00
Craig Mautner
4a1cb22056 Pair ActivityStacks with Displays 
- Introduce concept of ActivityStacks residing on Displays and able
to be decoupled and moved around.
- Add a new interface, IActivityContainer for clients to handle
ActivityStacks.
- Abandon ordering of stacks based on mStackState and instead use
ActivityDisplayInfo.stacks<ActivityStack> ordering.

Progress towards closing bug 12078972.

Change-Id: I7785b61c26dc17f432a4803eebee07c7415fcc1f
 2013-12-18 15:08:15 -08:00
Tor Norbye
0c34ee698e Merge "Hide NonNull and Nullable." 2013-12-18 22:22:14 +00:00
Alan Viverette
217694199f Merge "Correctly report isOpaque() from ImageView" 2013-12-18 02:53:20 +00:00
Alan Viverette
92f33b0754 Merge "Peek the fast scroll thumb when it transitions to enabled state" 2013-12-18 02:44:32 +00:00
Alan Viverette
63567e3829 Merge "Ensure transient state views are consistently temporarily detached" 2013-12-18 02:31:40 +00:00
Scott Main
418312f44c am 991ba3b7: am 74e9e698: am 7d1f8e65: am efe10233: am 5dcb75e6: Merge "fix typos bug: 11693951 bug: 12118617" into klp-docs 
* commit '991ba3b7f2d7164fab956b54c711d5ea523b2ba5':
  fix typos bug: 11693951 bug: 12118617
 2013-12-18 00:53:57 +00:00
Scott Main
991ba3b7f2 am 74e9e698: am 7d1f8e65: am efe10233: am 5dcb75e6: Merge "fix typos bug: 11693951 bug: 12118617" into klp-docs 
* commit '74e9e698260c16c41dab38de302db6e3e807ddd5':
  fix typos bug: 11693951 bug: 12118617
 2013-12-18 00:50:59 +00:00
Scott Main
7d1f8e6570 am efe10233: am 5dcb75e6: Merge "fix typos bug: 11693951 bug: 12118617" into klp-docs 
* commit 'efe102332861bd05f0cba60e729661607546de34':
  fix typos bug: 11693951 bug: 12118617
 2013-12-17 16:44:31 -08:00
Scott Main
efe1023328 am 5dcb75e6: Merge "fix typos bug: 11693951 bug: 12118617" into klp-docs 
* commit '5dcb75e67b7a3401aa501126bc8401f78c181a68':
  fix typos bug: 11693951 bug: 12118617
 2013-12-18 00:41:23 +00:00
Scott Main
688342f98c fix typos 
bug: 11693951
bug: 12118617

Change-Id: I7a3ab4c6d7bc124ff9ed8779700e77c87409569d
 2013-12-17 13:55:02 -08:00
Alan Viverette
223622a50d Add reveal drawable, APIs for forwarding Drawable focus and touch 
Hotspot APIs are hidden pending finalization of how we handle IDs.

BUG: 11416827
Change-Id: Iecacb4b8e3690930d2d805ae65a50cf33482a218
 2013-12-17 21:33:38 +00:00
Zhijun He
bd6877f968 Merge "Camera2: Update metadata java docs" 2013-12-17 18:38:54 +00:00
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
Tor Norbye
bbc75f34e6 Hide NonNull and Nullable. 
These should not be used in app code; instead, we will add
class-file retention versions of these to the support
library.

Change-Id: I13275bd28529f5da04d923688655be35c77dbb1c
 2013-12-17 08:44:38 -08:00
Alan Viverette
0dadf4d030 Merge "Replace auto-create in findViewById() with explicit create() API" 2013-12-17 01:20:22 +00: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
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
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
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
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 eb565dc527)

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
Alan Viverette
e10dd53894 Correctly report isOpaque() from ImageView 
Includes special handling for attributes that can affect the image's
drawing opacity and bounds, e.g. xfermode, alpha, and matrix transform.

BUG: 12120109
Change-Id: Ieeec11ff35af899c4e6fcf6364633c15ec94241e
 2013-12-12 19:19:51 -08:00