Commit Graph

39926 Commits

Author SHA1 Message Date
Sungsoo Lim
d3ee3ca90c Merge "Fix a typo" into lmp-preview-dev 2014-05-28 09:37:29 +00:00
Sungsoo Lim
a2c901d430 Fix a typo
Change-Id: I93e7e38a2e3502883b64c38567eaf5957c4197d2
2014-05-28 16:34:21 +09:00
Griff Hazen
14f5799ba9 DO NOT MERGE Cherry-pick: Doc fixes for Notification.WearableExtender
Change-Id: I22947e30d329e667079555ac4ac5f9b25d6bd3fa
2014-05-27 17:34:27 -07:00
Griff Hazen
e6fff6e088 Merge "DO NOT MERGE Cherry-pick: Api updates for wearable extensions to notifications" into lmp-preview-dev 2014-05-28 00:31:46 +00:00
Chris Craik
ddce68996b Merge "Update docs around empty/null outline behavior" into lmp-preview-dev 2014-05-28 00:08:58 +00:00
Igor Murashkin
79458826c6 Merge "camera2: Add partial results to the capture listener (API change)" into lmp-preview-dev 2014-05-27 23:54:21 +00:00
Dave Langemak
dab839e047 Merge "Move dis/enable of mobile data to Telephony" into lmp-preview-dev 2014-05-27 21:26:52 +00:00
Chris Craik
67c360f3d5 Update docs around empty/null outline behavior
bug:15257846
Change-Id: Ie4d1b0aaeb900eaaa7e54097f3e0d795beb8f445
2014-05-27 14:10:17 -07:00
Robert Greenwalt
afa05c0b43 Move dis/enable of mobile data to Telephony
ConnectivityService doesn't do this anymore.

bug:15077247
Change-Id: I3208c91b2c0369b594987f39ca29da7478435513
(cherry picked from commit 53013c87496980b534e447e717a32698fbd4bca0)
2014-05-27 20:28:50 +00:00
Ashish Sharma
6020071df9 Include START event (reboots) in partial history.
Change-Id: Ia1e5fba6c2c7bdb3f09eb5958d7134564d60e8b0
2014-05-27 20:27:59 +00:00
Igor Murashkin
db075afc85 camera2: Add partial results to the capture listener (API change)
* Also adds capture sequence aborted callback

Bug: 12492876
Change-Id: I56ec8edbcda8b64c2262ff7472961ac78042c7f4
2014-05-27 11:25:24 -07:00
Winson Chung
5859fc1096 Merge "DO NOT MERGE" into lmp-preview-dev 2014-05-27 18:04:36 +00:00
John Spurlock
150c07993f Merge "frameworks/base: Performance tweaks for SeekBarVolumizer." into lmp-preview-dev 2014-05-27 17:58:48 +00:00
John Spurlock
95caba1270 frameworks/base: Performance tweaks for SeekBarVolumizer.
Move ringtone init to the worker thread.  Allow the volumizer
instance to be reused by making the seekbar settable.

Bug:15091992
Change-Id: Ib616ae0fbb9a45c63391f8335e48ec2754dbdcd5
2014-05-27 13:10:38 -04:00
Winson Chung
2eb4f9c377 DO NOT MERGE
Removing unnecessary public values. (Bug 14995844)
(cherry picked from commit aa327fc2ce428f939885e1172578ff1dc975214c)

Change-Id: I98672d0ed3120c15bf31ce7a21ab604cfe66273d
2014-05-27 17:07:52 +00:00
John Spurlock
fc9e1e0592 Merge "DO NOT MERGE Hide vibrator streamHint overloads for preview." into lmp-preview-dev 2014-05-27 15:13:34 +00:00
Craig Mautner
b45a730efb Merge changes I88865c02,I34cc1310 into lmp-preview-dev
* changes:
  Check for null DO NOT MERGE
  Improve DocCentric documentation. DO NOT MERGE
2014-05-27 14:24:04 +00:00
Wonsik Kim
c22dbb6919 Revert "Revert "Add physical TV input handling to TvInputManagerService""
This reverts commit 1940e197a8de186df5edf0b78e0907ae539bd215.

Bug: 14118245, Bug: 15197740
Change-Id: Ia308f16d2ed8ec55112a4d21c180ccb97e8d7c6a
2014-05-27 01:33:50 +00:00
Griff Hazen
61a9e8635f DO NOT MERGE Cherry-pick: Api updates for wearable extensions to notifications
Change-Id: I40012fd0458ec103eabf75ed4c91f636e02f4c8f
2014-05-25 19:37:32 -07:00
Craig Mautner
49a6e1b321 Merge "Modify task navigation to return to recent tasks. DO NOT MERGE" into lmp-preview-dev 2014-05-25 19:40:03 +00:00
Craig Mautner
0833d2bc87 Merge "Add code for persisting tasks and activities to disk DO NOT MERGE" into lmp-preview-dev 2014-05-25 19:39:47 +00:00
Craig Mautner
026596b938 Improve DocCentric documentation. DO NOT MERGE
Fixes bug 15025461.

Change-Id: I34cc13105072cf054f125a7963294165258fec0e
2014-05-24 09:53:10 -07:00
Craig Mautner
e67a784eb2 Modify task navigation to return to recent tasks. DO NOT MERGE
Tasks launched from the recent task list will now return to the list
when they are finished. Also tasks that are launched from the
notification panel and services will now return to the list,
provided that the launcher is not front and center when they are
launched.

Fixes bug 14464114.

Change-Id: Ic0d3731fc7248d1eaa80e5ee399753d80e80c979
2014-05-24 09:50:37 -07:00
John Spurlock
098c0b8ca0 DO NOT MERGE Hide vibrator streamHint overloads for preview.
Bug:15192966
Change-Id: I25f57053b6f62fb627ae4f451d5f64ee77b8eba0
2014-05-24 09:09:06 -04:00
Craig Mautner
21d24a21ea Add code for persisting tasks and activities to disk DO NOT MERGE
Recent tasks that have the persistable flag set are
saved to /data/system/recent_tasks/ on shutdown and in the
background. Their thumbnails are saved to
/data/system/recent_images/.

Change-Id: Ifb820a01c412fe1f8c0f6e41aa655fafd89eaa8d
2014-05-23 18:42:33 -07:00
Dianne Hackborn
a82c9be2f7 Merge "Fix issue #15195464: battery history says wakelock held when it's not" into lmp-preview-dev 2014-05-24 00:35:55 +00:00
Ruben Brunk
0bfa56e766 Merge "camera2: Move DngCreator to hardware/camera2." into lmp-preview-dev 2014-05-24 00:25:59 +00:00
Dianne Hackborn
536456f2d4 Fix issue #15195464: battery history says wakelock held when it's not
Simplify full wake lock logging, so wake_lock_in is a completely
separate event from wake_lock and provides the full real raw log
of wake lock events.

Also attempt to address issue #15018750 (Incorrect wakelock reporting)
by no longer being complicated and rolling up previous state in to a
new history slice.

Bug: 15195464
Bug: 15018750
Change-Id: I32154bdfc2f07113be969f9db5503b2f2807a427
2014-05-23 17:16:26 -07:00
Chris Craik
cd3a824548 Merge "DO NOT MERGE Inspect SkShader to determine hw shader." into lmp-preview-dev 2014-05-23 23:21:49 +00:00
Zhijun He
c1631fd890 Merge "Camera2: Mark the under-specified tags for FUTURE" into lmp-preview-dev 2014-05-23 22:44:33 +00:00
Alan Viverette
0b723fdbaa Merge "Handle hybrid themes correctly in Drawable cache" into lmp-preview-dev 2014-05-23 22:30:42 +00:00
Jae Seo
cd39dc783e Merge "DO NOT MERGE. Add more columns to TV metadata to enable newly requested use cases" into lmp-preview-dev 2014-05-23 21:40:59 +00:00
Zhijun He
8949225294 Camera2: Mark the under-specified tags for FUTURE
Also clean up the tag ids.

Bug: 15168075
Change-Id: I57fb6fb37e512c224370c72d806a4b702360f29f
2014-05-23 13:49:59 -07:00
John Reck
4967c18308 Merge "Bag of scheduling tweaks" into lmp-preview-dev 2014-05-23 20:43:36 +00:00
Ruben Brunk
db67ffd62b Merge "DO NOT MERGE: Javadoc fix." into lmp-preview-dev 2014-05-23 20:02:01 +00:00
Igor Murashkin
db9c3aee75 Merge "camera2: Refactor CameraMetadata.Key out into 3 key classes" into lmp-preview-dev 2014-05-23 20:00:58 +00:00
John Reck
a5dda645da Bag of scheduling tweaks
Bug: 15118640

 * Prevent over-stuffing the queue by dropping frames
 * Prevent double-drawing in one pulse by RT by deferring
   vsync registration until post-draw so that it catches
   the next vsync pulse instead of the current one
 * Bias vsync race condition towards the UI thread
 * Fix queueDelay to actually work

Change-Id: Ibf584258bd93ebcbba058bd976dc8b307f1c6155
2014-05-23 12:56:38 -07:00
Ruben Brunk
5e3c3aa44d DO NOT MERGE: Javadoc fix.
Bug: 15189630

Change-Id: I4644ec782e636104fc06a27716f2fd224003e8d2
(cherry picked from commit 0a03a2ab50b665d382f92a1219177c3bd6fc568b)
2014-05-23 19:04:47 +00:00
Igor Murashkin
d6d65154e5 camera2: Refactor CameraMetadata.Key out into 3 key classes
Before:
* CameraMetadata.Key<T>

After:
* CameraCharacteristics.Key<T>
* CaptureResult.Key<T>
* CaptureRequest.Key<T>

CameraMetadata#get has been removed (each metadata subclass has
its own #get now) due to java generic limitations (in particular
a type bound <T1<T2> extends Key<T2>> is an illegal bound).

CameraMetadataNative gets a new #dumpToLog function to dump the native
metadata to logcat.

Bug: 15091017
Change-Id: Ic56c54c0d184e209e20de374dc8a6d79527c209f
2014-05-23 11:55:29 -07:00
Alan Viverette
048aad39ba Merge "Update switch, checkbox, radio button, button, and toggle button" into lmp-preview-dev 2014-05-23 17:31:03 +00:00
Jaewan Kim
a06d76b139 Merge "Fix Ethernet documentation." into lmp-preview-dev 2014-05-23 16:48:16 +00:00
Leon Scroggins III
0fa2bd699a DO NOT MERGE Inspect SkShader to determine hw shader.
cherry-pick of Iaa7189178bda1c55f96da044d2a9fa602ba36034

Instead of duplicating internal info about SkShader, inspect the
SkShader installed on the SkPaint.

core/java/android/view/GLES20Canvas.java:
Remove setupModifiers, nResetModifiers, and nSetupShader.

core/jni/android/graphics/Shader.cpp:
Remove calls to create/destroy the (previously) attached SkiaShader.

core/jni/android_view_GLES20Canvas.cpp:
Remove native code for setupShader and resetModifiers.

graphics/java/android/graphics/BitmapShader.java:
graphics/java/android/graphics/ComposeShader.java:
graphics/java/android/graphics/LinearGradient.java:
graphics/java/android/graphics/RadialGradient.java:
graphics/java/android/graphics/Shader.java:
graphics/java/android/graphics/SweepGradient.java:
Remove code keeping track of native SkiaShader.

libs/hwui/Caches.h:
Include Extensions.h.

libs/hwui/DeferredDisplayList.cpp:
Compare shaders on the paint, instead of on DrawModifiers.

libs/hwui/DisplayList.cpp:
libs/hwui/DisplayList.h:
Remove vector of SkiaShaders.

libs/hwui/DisplayListOp.h:
Access the SkShader on mPaint.
Remove SetupShaderOp and ResetShaderOp.

libs/hwui/DisplayListRenderer.cpp:
libs/hwui/DisplayListRenderer.h:
Remove resetShader, setupShader, refShader, and mShaderMap.

libs/hwui/FontRenderer.cpp:
Pass SkShader to setupDrawShader and setupDrawShaderUniforms.

libs/hwui/OpenGLRenderer.cpp:
libs/hwui/OpenGLRenderer.h:
Add LayerShader, a class inheriting from SkShader, to mimic the
behavior of SkiaLayerShader. Unlike SkiaLayerShader, it can be set on
the SkPaint so it can be inspected later.
Set a LayerShader instead of a SkiaLayerShader.
setupDrawShader and setupDrawShaderUniforms now inspect an SkShader
passed in.
Inspect SkShader instead of mDrawModifiers.mShader.
Remove resetShader and setupShader.
setupDrawColorUniforms now takes a boolean indicating whether there is
a shader.
Add an inline function for accessing the SkShader on an SkPaint.
In setupDrawBlending(Layer*, bool), do not check the shader (which will
never be set), but do check whether the color filter may change the
alpha (newly fixed behavior).
In setupDrawBlending(SkPaint, ...), check the SkShader and whether the
color filter affects alpha (the latter is new behavior).

libs/hwui/Renderer.h:
Remove pure virtual functions setupShader and resetShader.

libs/hwui/ResourceCache.cpp:
libs/hwui/ResourceCache.h:
Remove functions for refing/unrefing shaders.

libs/hwui/SkiaShader.cpp:
libs/hwui/SkiaShader.h:
Much of this code was redundant and has been removed.
Convert structs into class with nothing but static functions for
calling describe/setupProgram.

libs/hwui/TextureCache.cpp:
libs/hwui/TextureCache.h:
Use the SkPixelRef as the key to the bitmap Lru cache, since shader
inspection will provide a different SkBitmap pointer (though it will
hold the correct SkPixelRef with the correct generation ID).

tests/CanvasCompare/src/com/android/test/hwuicompare/DisplayModifier.java:
tests/CanvasCompare/src/com/android/test/hwuicompare/ResourceModifiers.java:
Update manual test to have more shaders: radial, sweep, compose,
invalid compose.

BUG:10650594
Change-Id: I2e7182b3fc28268e7ca82fac6780540b6b45365c
2014-05-23 11:50:38 -04:00
Julia Reynolds
0e1dc0f5aa Merge "Create deviceowner gated APIs for creating and removing users in devicepolicymanager." into lmp-preview-dev 2014-05-23 13:08:09 +00:00
Adrian Roos
98157e8dbb Merge "Add a cache to LockPatternUtils" into lmp-preview-dev 2014-05-23 12:58:19 +00:00
Adrian Roos
4f7884542c Add a cache to LockPatternUtils
Caches responses from LockSettingsService in the client process.

Bug: 15088101
Change-Id: If77c5ec45f52a02c800d50cb8550bfcb180f301d
2014-05-23 14:38:33 +02:00
Julia Reynolds
6cbbe9ec99 Create deviceowner gated APIs for creating and removing users in devicepolicymanager.
This will allow DMAgent to manage users for EDU's cart model user case.
Bug: 15015887

Change-Id: I1eadf1701cb75fc4b50eb1a0df1525eff818286e
(cherry picked from commit be9f43b9618ec25121b151d247eb0285fb6554b3)
2014-05-23 11:14:34 +00:00
Christoph Studer
0cc609606a Merge "SysUI: Use SBN keys instead of IBinder keys DO NOT MERGE" into lmp-preview-dev 2014-05-23 09:21:13 +00:00
Lorenzo Colitti
bd8a374016 Fix Ethernet documentation.
1. Remove incorrect @return tag for void function.
2. Fix build breakage by removing the reference to
   #ETHERNET_SERVICE, which is hidden.

Change-Id: Ia893464bafc8257e48e0bd710d27954b535fcece
(cherry picked from commit ff7e406df8a46256e47fff70abc9116ad3f94c23)
2014-05-23 06:30:24 +00:00
Alan Viverette
2356c5e69b Update switch, checkbox, radio button, button, and toggle button
Add optical inset support to BitmapDrawable with gravity. Fix optical
inset support in DrawableContainer. Fix visibility change support in
AnimatedStateListDrawable. Adds a whole bunch of missing drawable
support to CheckedTextView.

BUG: 15127013
BUG: 15126976
BUG: 15125529
BUG: 15025806
BUG: 14597955
BUG: 14594498
BUG: 15152746
Change-Id: Id2d99e10838d25b6f927ca1e49996c8da8e78ab1
2014-05-22 22:43:59 -07:00
Zhijun He
1498615d56 Camera2: Add croppingType tag
This is to indicate if the camera supports arbitrary cropping.

Bug: 15168075
Change-Id: Ib75f7af629be816229cc686c89980fec101301c0
2014-05-22 21:58:48 -07:00