136739 Commits

Author SHA1 Message Date
Scott Main
1f1bb9d068 Merge "add style to community page to adapt to the new sticky nav styles. basically override the new style to use the previous style because this page does not use sticky nav." into klp-docs 2014-05-23 21:45:33 +00:00
Jae Seo
b609419073 am 41db0959: (-s ours) Merge "DO NOT MERGE. Add more columns to TV metadata to enable newly requested use cases" into lmp-preview-dev
* commit '41db09593f96303dfed57c5e87b581a74950d055':
  DO NOT MERGE. Add more columns to TV metadata to enable newly requested use cases
2014-05-23 21:43:56 +00:00
Eric Laurent
5231cb4bfb am b928b7c2: am ba64d298: Merge "AudioService: fix cross deadlock in VolumeStreamState"
* commit 'b928b7c2bf12a5dbd31b08d244b0ff8d2a9851c1':
  AudioService: fix cross deadlock in VolumeStreamState
2014-05-23 21:41:47 +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
Eric Laurent
b928b7c2bf am ba64d298: Merge "AudioService: fix cross deadlock in VolumeStreamState"
* commit 'ba64d298bee228b8e27ea17fb31fbff4b4188304':
  AudioService: fix cross deadlock in VolumeStreamState
2014-05-23 21:37:54 +00:00
Eric Laurent
ba64d298be Merge "AudioService: fix cross deadlock in VolumeStreamState" 2014-05-23 21:34:25 +00:00
Eric Laurent
fdbee869be AudioService: fix cross deadlock in VolumeStreamState
Synchronize modifications of volume index by VolumeStreamState
class mutex instead of using synchronized methods.
This avoids possible cross deadlock when modifying volume on
two stream types simultaneously and one is slave to the other.

Bug: 13730145.

Change-Id: I13406c71010ce0c2e2f08f660b6101f310396c98
2014-05-23 21:32:06 +00:00
Alan Viverette
0ff33fba40 am a8b23365: Merge "Add support for setColorFilter in VectorDrawable" into lmp-preview-dev
* commit 'a8b2336554daef1cf299ef0cbb6c51981a1e719f':
  Add support for setColorFilter in VectorDrawable
2014-05-23 21:22:50 +00:00
Alan Viverette
d6405c1c75 Merge "Add support for setColorFilter in VectorDrawable" into lmp-preview-dev 2014-05-23 21:20:45 +00:00
John Reck
d04d303e5d resolved conflicts for merge of 1f6c973b to master
Change-Id: I0d0a72f1d737fa80ac4c258c1f9fc52ef85724bd
2014-05-23 13:56:35 -07: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
justinzhang
c137a2d6c1 Merge "Hide status bars in lock task" 2014-05-23 20:46:28 +00:00
justinzhang
5286d3ff47 Hide status bars in lock task
Call StatusBarManager to show/hide status bars for lock task.
(Same CL as https://googleplex-android-review.git.corp.google.com/#/c/461068/,
sorry for the confusion.)

Bug: 13669575
Change-Id: I5c90bdb1d868aa02d3679e854b5ccbe434d996d6
2014-05-23 16:44:25 -04:00
John Reck
4967c18308 Merge "Bag of scheduling tweaks" into lmp-preview-dev 2014-05-23 20:43:36 +00:00
Craig Mautner
b20f796dab Check for null
Fixes bug 15129354.

Change-Id: I88865c021a024ab94e44dc71f09f8325a79e0775
2014-05-23 13:28:40 -07:00
Alan Viverette
6ff38eea0b Fix selection handle offsets
BUG: 14313604
Change-Id: If8a1c60a90b89a94716c25abb3511c8612cbb973
2014-05-23 20:25:20 +00:00
Ruben Brunk
3df29eb31f am f029447f: (-s ours) Merge "DO NOT MERGE: Javadoc fix." into lmp-preview-dev
* commit 'f029447fa014c9d3728c16860d00a713edad5c1e':
  DO NOT MERGE: Javadoc fix.
2014-05-23 20:13:44 +00:00
Igor Murashkin
e48fb064ac am 31771fd6: Merge "camera2: Refactor CameraMetadata.Key out into 3 key classes" into lmp-preview-dev
* commit '31771fd63b8d08207012c4877a08679fa9b9d539':
  camera2: Refactor CameraMetadata.Key out into 3 key classes
2014-05-23 20:13:38 +00:00
Victoria Lease
e5bf17eaf8 resolved conflicts for merge of 25208987 to master
Change-Id: If900fc2d9892f3ff743d94cb209780047da0110f
2014-05-23 13:10:33 -07: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
Victoria Lease
01b67a2a1a Merge "Roboto v2" into lmp-preview-dev 2014-05-23 19:53:25 +00:00
Griff Hazen
f9e22aaaff Merge commit '1e5746c6' into mergemaster
Conflicts:
	CleanSpec.mk

Change-Id: I8b278405eeab3ffd23eef9ae04bedb8e8803d739
2014-05-23 12:40:46 -07:00
Dmitriy Ivanov
9b7135645e am 190ed5db: am 2137d6a8: am d5ee4144: Merge "Increase start timeout for wrapped process"
* commit '190ed5db4ac90612c1f6420f87ea462076fbe1a0':
  Increase start timeout for wrapped process
2014-05-23 19:34:53 +00:00
Christopher Tate
60d9d1f19f am 8c0660c2: am d6d7587a: am a0166b58: Merge "Activity chooser "Always" button is not working"
* commit '8c0660c257d4cab61c37a03a64b7081f3095b9b5':
  Activity chooser "Always" button is not working
2014-05-23 19:34:47 +00:00
Andrew Solovay
4daf2779f4 am 59f61cc2: am 768a899f: am b5960898: am 9562863c: doc: Updated branding guidelines per request from @deniseamling.
* commit '59f61cc23d47f7ad714cf99be32fd70a66dba84e':
  doc: Updated branding guidelines per request from @deniseamling.
  Noted that OnSharedPreferenceChangeListener does not store a strong reference to the listener.
2014-05-23 19:33:57 +00: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
Victoria Lease
42460150cb Roboto v2
Fresh new revisions of our Roboto family of fonts, including family
aliases for sans-serif-medium and sans-serif-black. Enjoy!

Change-Id: I2337ccbd1767a7769deea885e0900f1ca4329779
Bug: 15170360
2014-05-23 11:25:47 -07:00
Alan Viverette
8c1244b98c Merge "Fix build." 2014-05-23 18:10:36 +00:00
Alan Viverette
d30241541c DO NOT MERGE Fix build.
Change-Id: I2e9f7f27c94b9f9240a5ca76952024055ff79878
2014-05-23 11:10:12 -07:00
Alan Viverette
7bf1eb63ec Fix build.
Change-Id: I2e9f7f27c94b9f9240a5ca76952024055ff79878
2014-05-23 11:09:51 -07:00
Vinod Krishnan
5e1c9914c5 am eae1e094: am 810ed89c: Merge "Adding activity enter/exit animations for wearables" into klp-modular-dev
* commit 'eae1e09459d27b03ca3aed26291fe5c590a57365':
  Adding activity enter/exit animations for wearables
2014-05-23 18:04:24 +00:00
Aravind Akella
b5e3f4ea13 am c7153377: am 73da981f: Merge "Remove getRequiredPermission from NDK." into klp-modular-dev
* commit 'c7153377cf03303e97185397544a13971a089961':
  Remove getRequiredPermission from NDK.
2014-05-23 18:04:18 +00:00
Nick Vaccaro
c9c88429a6 am 1af1371e: (-s ours) am 117df282: Don\'t grab wakelock if Wifi feature not supported on device
* commit '1af1371e1b3256b9405f6ef7d828297d152637ca':
  Don't grab wakelock if Wifi feature not supported on device
2014-05-23 18:04:13 +00:00
John Spurlock
244252af8b Merge "QuickSettings: Use connectivity manager for airplane mode." into lmp-preview-dev 2014-05-23 18:04:03 +00:00
Selim Cinek
67faeb30bf am 6547afc4: Merge changes I884b6830,Iee71e4eb into lmp-preview-dev
* commit '6547afc42bd74bb25d6f5a129e10bd225e3e61e9':
  The layertype was incorrectly restored with overlapping alpha animations.
  Decreased shadows between notifications slightly.
2014-05-23 17:36:28 +00:00
Alan Viverette
de220369c6 am e11794a2: Merge "Update switch, checkbox, radio button, button, and toggle button" into lmp-preview-dev
* commit 'e11794a2c1af70a265b6476ce3f3587814e9f0b3':
  Update switch, checkbox, radio button, button, and toggle button
2014-05-23 17:36:23 +00:00
Selim Cinek
b72b09cb5e Merge changes I884b6830,Iee71e4eb into lmp-preview-dev
* changes:
  The layertype was incorrectly restored with overlapping alpha animations.
  Decreased shadows between notifications slightly.
2014-05-23 17:33:23 +00: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
Alan Viverette
fd6e411767 Add support for setColorFilter in VectorDrawable
Also cleans up inflation so that we can apply themes more easily.

Change-Id: I56decb29fe987286a38fc0aa96f95952cf67c120
2014-05-23 10:29:37 -07:00
John Spurlock
6627ff6d9d QuickSettings: Use connectivity manager for airplane mode.
Bug:15187219
Change-Id: I8455d062a9d974a464abff3c656ca18d6da3fe9d
2014-05-23 12:59:27 -04:00
Jaewan Kim
450cd7ff3e am 70246e34: Merge "Fix Ethernet documentation." into lmp-preview-dev
* commit '70246e348a81b8e0e3944ba5d67f4e2b138d6814':
  Fix Ethernet documentation.
2014-05-23 16:53:39 +00:00
Jaewan Kim
a06d76b139 Merge "Fix Ethernet documentation." into lmp-preview-dev 2014-05-23 16:48:16 +00:00
Yuhao Zheng
b97070903d Merge "Update Hotspot 2.0 SDK APIs" 2014-05-23 16:44:07 +00:00
Kenny Guy
759c9b9688 Merge "Fix bug with removeUser assuming it is called from system uid." 2014-05-23 16:27:35 +00:00
Yuhao Zheng
bd9af35597 Update Hotspot 2.0 SDK APIs
Change-Id: I0528b378219e03f896497127b5c4b191bf014141
2014-05-23 09:25:45 -07:00
Derek Sollenberger
c33fb2b5c0 Merge "Pass the radius as a float deeper into HWUI allowing RS to generate more accurate blurs." 2014-05-23 15:51:20 +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