summaryrefslogtreecommitdiffstats
path: root/graphics/java
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Propagate original Resources to DrawableContainer if no override set"Alan Viverette2015-02-262-2/+2
|\
| * Propagate original Resources to DrawableContainer if no override setAlan Viverette2015-02-262-2/+2
| | | | | | | | | | | | | | Also fixes a double-add in ASLD. Bug: 19498949 Change-Id: I9e7e0a0fb22a23518c80c1b099f8da0e0c1f53d8
* | Set AnimationDrawable running to false unless animation is scheduledAlan Viverette2015-02-261-36/+47
|/ | | | | | | Also cleans up java docs and clarifies functionality of nextFrame(). Bug: 19500067 Change-Id: I8c274c6f4df7ee17d28ae151009f07a420c9ab1a
* Merge "Remove obsolete code from AnimatedRotateDrawable state"Alan Viverette2015-02-262-58/+46
|\
| * Remove obsolete code from AnimatedRotateDrawable stateAlan Viverette2015-02-252-58/+46
| | | | | | | | | | | | | | | | DrawableWrappers shouldn't have drawables inside their state, nor should they manage their own drawables. Also cleans up documentation. Bug: 19518051 Change-Id: I2aea011afe80e94aadec702e1680c3765528b112
* | Merge "Create blank state in no-arg RotateDrawable constructor"Alan Viverette2015-02-252-7/+3
|\ \
| * | Create blank state in no-arg RotateDrawable constructorAlan Viverette2015-02-252-7/+3
| |/ | | | | | | | | | | | | | | Also removes unnecessary constructor in InsetState so that it matches the other DrawableWrapper classes. Bug: 19489698 Change-Id: Ib2e510c6ae90858774970d928e541a9b08cb714a
* | Merge "Always apply color filter passed to DrawableContainer.setColorFilter"Alan Viverette2015-02-241-1/+1
|\ \
| * | Always apply color filter passed to DrawableContainer.setColorFilterAlan Viverette2015-02-231-1/+1
| |/ | | | | | | | | Bug: 19461256 Change-Id: Id44d276739b868e504139cdf767992039f3e4336
* | Update progress bar and seek bar backgrounds, fix seek bar thumbAlan Viverette2015-02-231-5/+142
|/ | | | | | | | | | Ensures LayerDrawable copies out the correct layer properties during "tileification". This really needs to be deprecated or replaced in a future CL, though, because it is potentially lossy (e.g. for RippleDrawable, which is an instanceof LayerDrawable). Bug: 19448441 Change-Id: I483e9c34fd781e280c13eb5951f96bc71a252819
* Merge "Unify wrapper-type drawables"Alan Viverette2015-02-2312-1430/+866
|\
| * Unify wrapper-type drawablesAlan Viverette2015-02-2012-1430/+866
| | | | | | | | | | | | | | | | Fixes several issues with constant state and propagation of drawable property changes to wrapped drawables. Also un-hides the layout direction accessors and hotspot getter. Change-Id: Iff19db6a95059cbcfcbde7af0ac33871ccd41615
* | am 031a9b13: am 92c4f175: am d002e027: Merge "Fix \'fuchsia\' typo."Elliott Hughes2015-02-211-2/+3
|\ \ | | | | | | | | | | | | * commit '031a9b13197f6ab1ff83ccdafd890351b70bb63c': Fix 'fuchsia' typo.
| * \ am d002e027: Merge "Fix \'fuchsia\' typo."Elliott Hughes2015-02-211-2/+3
| |\ \ | | | | | | | | | | | | | | | | * commit 'd002e02750b51fed3da41a2b4b222824df8d1a10': Fix 'fuchsia' typo.
| | * | Fix 'fuchsia' typo.Elliott Hughes2015-02-211-2/+3
| | | | | | | | | | | | | | | | | | | | Bug: https://code.google.com/p/android/issues/detail?id=152142 Change-Id: Ib45f2d19d52fe9d95d560d37296d50cba190cb83
| | * | am 877ce2c4: Merge "Make sure the bitmap from VD\'s cache is drawn using ↵ztenghui2014-10-201-0/+1
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bi-linear filter." into lmp-dev * commit '877ce2c42b5d423719246f5458cd66fa9fddb317': Make sure the bitmap from VD's cache is drawn using bi-linear filter.
| | * \ \ am 89b19695: Merge "Put in real "code" (aka marketing) name." into lmp-devDianne Hackborn2014-10-083-4/+4
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit '89b196958fee07475765bd3c458098464ba16f2e': Put in real "code" (aka marketing) name.
| | * \ \ \ am 9f64867d: Merge "Fix theme propagation to contained android:drawable ↵Alan Viverette2014-10-029-10/+14
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | elements" into lmp-dev * commit '9f64867da107b772b867876ddf979d1a3ec19192': Fix theme propagation to contained android:drawable elements
| | * \ \ \ \ resolved conflicts for merge of ee665151 to lmp-dev-plus-aospNeil Fuller2014-10-023-10/+6
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I97671e62de26919e391dbb2686511584c59ab990
| | * \ \ \ \ \ am ffa16f94: Merge "Correct the documentation for VectorDrawable" into lmp-devztenghui2014-09-301-0/+6
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ffa16f944882f2e27109af8fe4b7272322f9cb84': Correct the documentation for VectorDrawable
| | * \ \ \ \ \ \ am b805da9b: Merge "Fix drawable container tinting" into lmp-devAlan Viverette2014-09-301-13/+18
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b805da9b592e67cb777b78db3a96d47c60e31ca7': Fix drawable container tinting
| | * \ \ \ \ \ \ \ am e910cc88: Merge "Implement alpha as documented for drawables" into lmp-devChris Craik2014-09-302-1/+8
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e910cc88387f49b119bb2f8e579849864970ac87': Implement alpha as documented for drawables
| | * \ \ \ \ \ \ \ \ am 63756956: Merge "Add callback to track and thumb drawables, propagate ↵Alan Viverette2014-09-261-2/+7
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | state in ASLD" into lmp-dev * commit '637569566d2234b06e08d94acf4db1b0d3be6501': Add callback to track and thumb drawables, propagate state in ASLD
| | * \ \ \ \ \ \ \ \ \ am 81e2f789: Merge "Fixed mutate() for RippleDrawable, ASLD, AVD, fix ↵Alan Viverette2014-09-264-17/+47
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | applyTheme in VD" into lmp-dev * commit '81e2f789029701b569d3c0deee8bc74fbebab5db': Fixed mutate() for RippleDrawable, ASLD, AVD, fix applyTheme in VD
| | * \ \ \ \ \ \ \ \ \ \ am 21662c96: Merge "Cut ripple background alpha in half" into lmp-devAlan Viverette2014-09-251-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '21662c96fa9d107a60f4ce98f7179264c972b142': Cut ripple background alpha in half
| | * \ \ \ \ \ \ \ \ \ \ \ am c793e67c: Merge "Fix AVD for CTS failure." into lmp-devztenghui2014-09-241-2/+9
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c793e67ca93a1550fa68c887ef00d207ac1e1d84': Fix AVD for CTS failure.
| | * \ \ \ \ \ \ \ \ \ \ \ \ am aa60232b: am 8518c090: Merge "Fix animation on the some properties" into ↵ztenghui2014-09-231-8/+8
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-dev * commit 'aa60232b96ace3ab176611c170e950a7b6db5481': Fix animation on the some properties
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ am 53dc022a: am e99510a4: Merge "Hide other color filter mutability" into ↵Chris Craik2014-09-193-3/+18
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-dev * commit '53dc022a6c12c1b916583dc8aee92cb63c7f73f5': Hide other color filter mutability
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ am a96b8ea7: am 6a750aa9: Merge "Reduce overdraw after clearing ripples in ↵Alan Viverette2014-09-163-5/+30
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RippleDrawable" into lmp-dev * commit 'a96b8ea7fe489965b7381b59169dd20fd46d334c': Reduce overdraw after clearing ripples in RippleDrawable
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 64672ef1: am 3137b288: Merge "Set cache dirty when re-create the cache ↵ztenghui2014-09-161-0/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bitmap" into lmp-dev * commit '64672ef149fa48afcf7f5f4b2ed0f96386b6d368': Set cache dirty when re-create the cache bitmap
* | | | | | | | | | | | | | | | | | | Use ObjectAnimator for fading scrollbars, set initial duration to 1500Alan Viverette2015-02-201-0/+16
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fairly intensive refactoring of ScrollabilityCache. Change-Id: I88669c0b9b79ca12a237606d5ff8be0e7e8b37ba
* | | | | | | | | | | | | | | | | | Add attribute for controlling ripple radiusAlan Viverette2015-02-133-46/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sets up the action bar item and control styles to use a 20dp radius ripple to match latest Material spec. Bug: 19370157 Change-Id: I87cba01076ee83937a6bfd36fc7dc188e1eb4672
* | | | | | | | | | | | | | | | | | API for adding layers to LayerDrawableAlan Viverette2015-02-121-44/+127
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I859c956a47d95fa1ce65b9eea9bc7be4659486bf
* | | | | | | | | | | | | | | | | | Prevent temp rect reuse across methods in LayerDrawableAlan Viverette2015-02-101-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Drawable invalidation may call back into methods that are relying on the same temp rect objects, which mangles the values. Bug: 19321598 Change-Id: If8aa434cf85c81d22b5d580e258926087248cd93
* | | | | | | | | | | | | | | | | | Add layer width, height, gravity, and RTL insets for LayerDrawableAlan Viverette2015-02-031-7/+217
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18473819 Change-Id: Iae8e3dbd3fcc7f4c2f08b266c69d40036e75dfb6
* | | | | | | | | | | | | | | | | | Merge "Ensure InsetDrawable propagates state and callback on set drawable"Alan Viverette2015-02-021-6/+24
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Ensure InsetDrawable propagates state and callback on set drawableAlan Viverette2015-02-021-6/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19230432 Change-Id: I161e377c5a50fd68718a36cef0038ab06e74c90d
* | | | | | | | | | | | | | | | | | | Synchronize mutated constant state's drawable constant stateAlan Viverette2015-01-301-0/+1
|/ / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mutating InsetDrawable's locally-held drawable alters its constant state, so we need to update the InsetDrawable's reference to match. This ensures that any drawables created using getConstantState().newDrawable() will match the mutated versions. Bug: 19213175 Change-Id: If9063bcc0942691a8940443e607f2dc722fc6e13
* | | | | | | | | | | | | | | | | | Create proxy between Skia's SkCanvas and the framework Canvas.Derek Sollenberger2015-01-301-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This enables Picture.java to be replayed into HWUI in addition to extending the Skia testing suite to HWUI. Bug: 19011232 Change-Id: Id27ac03eec817b0784763e62ab8413a07b3b8cb2
* | | | | | | | | | | | | | | | | | Merge "Move SkAvoidXferMode into frameworks/base."Leon Scroggins III2015-01-301-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Move SkAvoidXferMode into frameworks/base.Leon Scroggins III2015-01-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We are removing it from Skia, so we need it here to support Android. Add some small cleanups (remove comment that doesn't apply, convert SK_OVERRIDE to override, remove 'virtual' keyword from methods with 'override' on them). BUG:skbug.com/3329 Change-Id: I1f883082d6fb9d49b9c9ba9e1f50bd713eabf915
* | | | | | | | | | | | | | | | | | | Move drawable out of inset state, only store constant stateAlan Viverette2015-01-271-83/+105
|/ / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This ensures that InsetDrawable's constant state only references other constant states rather than holding an entire Drawable, which provides a clean separation between local and constant state information. This ensures that calls to mutate() can create a new constant state without losing local drawable state and that newDrawable() still relies on the same constant state. Bug: 19156549 Bug: 13877782 Change-Id: I48146f6c7ac3593009cfa323fc341bcd7d8ab21b
* | | | | | | | | | | | | | | | | | am 94474515: Merge "Prevent memory corruption from use-after-free" into ↵John Reck2015-01-231-2/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev automerge: bb8d7ff automerge: 1e5dd46 * commit '1e5dd46133bd47445ba0657692fb86492acad705': Prevent memory corruption from use-after-free
| * | | | | | | | | | | | | | | | | am 94474515: Merge "Prevent memory corruption from use-after-free" into ↵John Reck2015-01-231-2/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev automerge: bb8d7ff * commit 'bb8d7ffeae187e8782a9494e252e335db537b2a1': Prevent memory corruption from use-after-free
| | * | | | | | | | | | | | | | | | | Prevent memory corruption from use-after-freeJohn Reck2015-01-231-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19035637 If an app tries to call recycle() on a Bitmap that has already been finalized it will result in use-after-frees. This is bad. Avoid this by setting the pointer to 0 and checking for this Change-Id: I12d73703a0f95b05fe4c2fd8e9c01b6a3f2f023b
* | | | | | | | | | | | | | | | | | | Avoid ripple buffer creation for empty bounds automerge: b74155c automerge: ↵Alan Viverette2015-01-211-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e6e216c automerge: 2aacb86 * commit '2aacb861f4c7b80c5d2bb22956c9a5d4ace4df67': Avoid ripple buffer creation for empty bounds
| * | | | | | | | | | | | | | | | | | Avoid ripple buffer creation for empty bounds automerge: b74155cAlan Viverette2015-01-211-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: e6e216c * commit 'e6e216c48ea25bdbc2d0a262c74670fb6513e42b': Avoid ripple buffer creation for empty bounds
| | * | | | | | | | | | | | | | | | | Avoid ripple buffer creation for empty boundsAlan Viverette2015-01-211-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19068439 Change-Id: I031d4303bbf101a25612dce6f02d81ce4cf58e2b
* | | | | | | | | | | | | | | | | | | Merge "Update the javadoc for the clip path fix."ztenghui2015-01-201-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Update the javadoc for the clip path fix.ztenghui2015-01-141-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b/18758765 Change-Id: I1845c09a120ecdf0d7685ff1f6165b1e841db5ce
generated by cgit v1.1 at 2025-02-15 18:36:00 +0000