summaryrefslogtreecommitdiffstats
path: root/graphics
Commit message (Collapse)AuthorAgeFilesLines
* Allow ripple bounds to change during enter animationAlan Viverette2014-06-012-134/+135
| | | | | BUG: 15315168 Change-Id: I7588be96648318473998cfd5deba678224f1db51
* Merge "Fix padding for GradientDrawable" into lmp-preview-devAlan Viverette2014-06-011-3/+6
|\
| * Fix padding for GradientDrawableAlan Viverette2014-06-011-3/+6
| | | | | | | | | | BUG: 15197745 Change-Id: Ibd1c20dd8ba8c7ffbf65031be4ca9813304d4d0f
* | Fixes hotspot list transitions, update to use a single hotspotAlan Viverette2014-06-013-275/+353
|/ | | | | | | | | | | | | | | Also updates background and button colors to match spec, removes dependency on bouncycastle Arrays. Vastly simplifies ripple drawing. Adds APIs for maximum ripple radius. Makes selectableItemBackground bounded by default and adds an unbounded version and theme attribute. BUG: 15315168 BUG: 15314684 BUG: 15314830 BUG: 15316768 BUG: 15333033 BUG: 15344050 Change-Id: Ib0619587ce78e43056b66571bae185e0f1613185
* Language and variant selection for MinikinRaph Levien2014-05-293-6/+31
| | | | | | | | | | | This is the frameworks/base side of what's needed to support language selection (especially Han unification, but also compact/elegant selection for scripts that require more vertical space). This is part of the fix for bug 15179652 "Japanese font isn't shown on LMP". Change-Id: I8f0f3aa9a1915659f8d0b590cf1c56529356049a
* Layoutlib fixes for L [DO NOT MERGE]Deepanshu Gupta2014-05-272-4/+20
| | | | | | | | | | | This adds the new delegates that were missing. This starts the work on changes related to Minikin Fonts. There are some changes related to TypedArray that still need to be fixed. Change-Id: Ic2397b64aa3f1f48926e849b14689c47d9ee7f8c (cherry picked from commit 7ca3612094270183243938e79337c84effea7ad0)
* Merge "DO NOT MERGE: Hide the VectorDrawable" into lmp-preview-devztenghui2014-05-271-0/+1
|\
| * DO NOT MERGE: Hide the VectorDrawableztenghui2014-05-231-0/+1
| | | | | | | | Change-Id: Ie65194c8ec54063f48a541ee0cc82bccc41f5353
* | Merge "DO NOT MERGE Inspect SkShader to determine hw shader." into ↵Chris Craik2014-05-236-49/+4
|\ \ | | | | | | | | | lmp-preview-dev
| * | DO NOT MERGE Inspect SkShader to determine hw shader.Leon Scroggins III2014-05-236-49/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Merge "Add support for setColorFilter in VectorDrawable" into lmp-preview-devAlan Viverette2014-05-231-15/+41
|\ \ \ | |_|/ |/| |
| * | Add support for setColorFilter in VectorDrawableAlan Viverette2014-05-231-15/+41
| |/ | | | | | | | | | | Also cleans up inflation so that we can apply themes more easily. Change-Id: I56decb29fe987286a38fc0aa96f95952cf67c120
* | DO NOT MERGE Fix build.Alan Viverette2014-05-231-0/+3
| | | | | | | | Change-Id: I2e9f7f27c94b9f9240a5ca76952024055ff79878
* | Update switch, checkbox, radio button, button, and toggle buttonAlan Viverette2014-05-223-6/+51
|/ | | | | | | | | | | | | | | | 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
* Move setTint into Drawable, unhide getDirtyBounds on DrawableAlan Viverette2014-05-214-107/+58
| | | | | BUG: 15089957 Change-Id: Ib622ba24b3f4bcf430e1d524895ac5cb104a232e
* Merge "Style and asset cleanup"Alan Viverette2014-05-221-1/+2
|\
| * Style and asset cleanupAlan Viverette2014-05-211-1/+2
| | | | | | | | | | | | | | | | | | Updates button drawable and colors, cleans up Quantum styles, updates highlight attribute name and color, fixes popup backgrounds. Also fixes GradientDrawable opacity check. Change-Id: I75dd35e815a8a33ec9f0b16e881e774edfb8c092
* | Merge "Define light position (using new lighting spec) in Java"Chris Craik2014-05-221-2/+6
|\ \ | |/ |/|
| * Define light position (using new lighting spec) in JavaChris Craik2014-05-211-2/+6
| | | | | | | | | | | | Also updates the relative shadow strengths. Change-Id: I6cac7275d38df98aea9f0dda463cd7207102986a
* | Merge "Clean up hotspot bounds API"Alan Viverette2014-05-215-4/+22
|\ \
| * | Clean up hotspot bounds APIAlan Viverette2014-05-215-4/+22
| | | | | | | | | | | | Change-Id: I7daf7e2d360d761f673aa69a0f925b8076ab19c6
* | | Merge "Clean up Gradient drawable theming & whitespace"Alan Viverette2014-05-211-237/+187
|\ \ \ | |/ /
| * | Clean up Gradient drawable theming & whitespaceAlan Viverette2014-05-211-237/+187
| | | | | | | | | | | | Change-Id: I66c857a71e5b4beaee6a7e6c04959fbacee3cbe1
* | | Addressing APIs council feedbackSvetoslav2014-05-211-37/+42
|/ / | | | | | | | | | | bug:15089461 Change-Id: Ifcb003b114e2e50333bb0ef386d99482f7bfaa6e
* | Merge "Clean up Outline API, method on drawable"Chris Craik2014-05-202-15/+28
|\ \
| * | Clean up Outline API, method on drawableChris Craik2014-05-202-15/+28
| |/ | | | | | | | | | | bug:15025466 bug:15089680 Change-Id: I8d3b64a0d9dbdbaf679042c8b384d2050323a8e6
* | Various API review fixes to resources and drawablesAlan Viverette2014-05-201-6/+5
| | | | | | | | | | BUG: 15025565 Change-Id: If00c85816f8288338967f7a85453d21f858f5ca7
* | Merge "Various API council fixes to drawables"Alan Viverette2014-05-203-53/+77
|\ \ | |/ |/|
| * Various API council fixes to drawablesAlan Viverette2014-05-203-53/+77
| | | | | | | | | | BUG: 15089957 Change-Id: Ieaf468bbff092e68f6313d8a5ecccda8b753806d
* | TouchFeedbackDrawable is now RippleDrawableAlan Viverette2014-05-196-457/+66
| | | | | | | | Change-Id: I59f5f04b73089215c6320560556ac21beb03db06
* | Merge "Remove the versionCode"ztenghui2014-05-191-16/+1
|\ \ | |/ |/|
| * Remove the versionCodeztenghui2014-05-191-16/+1
| | | | | | | | Change-Id: I2a77fefd7b14fd3bef0b0c7a142fe88e69883c75
* | Update ripple behavior, use render thread animationAlan Viverette2014-05-162-360/+547
| | | | | | | | Change-Id: Ib6bc1e08b05d29606f452961963d58b8fc866746
* | Merge "Round rect outline clipping"Chris Craik2014-05-161-20/+30
|\ \
| * | Round rect outline clippingChris Craik2014-05-151-20/+30
| | | | | | | | | | | | Change-Id: Iee9cf4f719f6f1917507b69189ad114fa365917b
* | | Merge "Simplify attribute extraction for themed Drawables"Alan Viverette2014-05-157-401/+194
|\ \ \
| * | | Simplify attribute extraction for themed DrawablesAlan Viverette2014-05-147-401/+194
| | |/ | |/| | | | | | | | | | | | | Also fixes a bug in GlowPadView that randomly popped up. Change-Id: Id20508a44ea02b4a14c8f794de36e13a2c06587c
* | | Merge "document and deprecated Rasterizer"Mike Reed2014-05-153-3/+11
|\ \ \
| * | | document and deprecated RasterizerMike Reed2014-05-093-3/+11
| | | | | | | | | | | | | | | | Change-Id: I02f6a47aeb96b27c3fb9f6d003648f794e3d7cf4
* | | | Merge "Adding APIs to render PDF documents."Svetoslav2014-05-153-2/+404
|\ \ \ \
| * | | | Adding APIs to render PDF documents.Svetoslav2014-05-133-2/+404
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need to render PDF documents for two main use cases. First, for print preview. Second, for resterizing the PDF document by a print service before passing it to a printer which does not natively support PDF (most consumer ones). Adding PDF rendering APIs improves guarantees for print quality as the same library is used for preview and rasterization. Also print vendors do not have to license third-party rendering engines. Last but not least as the platform uses PDF as its main print format it should also be able to natively render it. Change-Id: I57004a435db147663cafea40cf3296465aba7f99
* | | | Merge "camera2: Use StreamConfigurationMap for format/size/duration lookup"Igor Murashkin2014-05-151-0/+1
|\ \ \ \
| * | | | camera2: Use StreamConfigurationMap for format/size/duration lookupIgor Murashkin2014-05-141-0/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Also @hide/@deprecate a bunch of other keys * Move some classes into android.hardware.camera2.params Bug: 14628001 Change-Id: I2db490a0849680a133a901403477a147b004fb28
* | | | Merge "Add fallback fonts to system fonts (Minikin)"Raph Levien2014-05-151-14/+43
|\ \ \ \
| * | | | Add fallback fonts to system fonts (Minikin)Raph Levien2014-05-121-14/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch explicitly keeps the list of fallback fonts, and creates all system fonts including the fallback list as well. At present, fonts created from assets or directly from files do not have the fallback list present, so that remains to be done. This patch affects only builds with USE_MINIKIN defined; otherwise the fallback font processing in Skia will apply. Change-Id: I6148e06a45a11f53a6bb2f04c8813df4968ea8c8
* | | | | Merge "Proper refcounting for Minikin objects"Raph Levien2014-05-151-2/+10
|\ \ \ \ \ | |/ / / /
| * | | | Proper refcounting for Minikin objectsRaph Levien2014-05-121-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch introduces proper lifecycle maintenance (based on reference counting) for Minkin objects, particularly FontFamily and FontCollection. The patch depends on the corresponding Ref and Unref methods being available in Minikin. Change-Id: I91935e953d5a522e1adc496f2ce3a598be35de2b
* | | | | Merge "Parsing of XML font configuration files for Minikin"Raph Levien2014-05-153-6/+206
|\ \ \ \ \ | |/ / / /
| * | | | Parsing of XML font configuration files for MinikinRaph Levien2014-05-123-6/+206
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch improves Minikin-based font handling, to deal with error conditions (missing fonts and so on), and also moves the parsing of fallback_fonts.xml and system_fonts.xml into Java code. Change-Id: Ib0debdbd56ad3b0196be6d2a35668d711c98f1e5
* | | | | Merge "Start of Minikin integration"Raph Levien2014-05-153-12/+70
|\ \ \ \ \ | |/ / / / | | | | / | |_|_|/ |/| | |