drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
182,469 Commits 1 Branch 0 Tags
Commit Graph

2360 Commits

Author SHA1 Message Date
Alan Viverette
2929579d20 am 370403db: am 07a08010: am 425b1dc8: Merge "Add theme and config change support to more Drawable types" into lmp-mr1-dev 
* commit '370403dbdec3a1d769c31aca66e5fcbd6617c897':
  Add theme and config change support to more Drawable types
 2014-10-31 00:25:33 +00:00
Alan Viverette
370403dbde am 07a08010: am 425b1dc8: Merge "Add theme and config change support to more Drawable types" into lmp-mr1-dev 
* commit '07a08010a87daec2091b643a8fcf2f7a27588098':
  Add theme and config change support to more Drawable types
 2014-10-31 00:14:51 +00:00
Alan Viverette
7f4a63d1eb Ensure we don't pass null values in to Theme.resolveAttributes 
BUG: 18182274
Change-Id: I08acf877cb81478cc205254edf92a31fcf05991d
 2014-10-30 10:29:03 -07:00
Alan Viverette
425b1dc88c Merge "Add theme and config change support to more Drawable types" into lmp-mr1-dev 2014-10-30 00:24:28 +00:00
Alan Viverette
d21fd9d1cc Add theme and config change support to more Drawable types 
BUG: 16045735
Change-Id: Ic03173a1c1779c1bb545c4c389f77afed97011ee
 2014-10-29 10:24:42 -07:00
Alan Viverette
c6dac7ef17 am 51547e75: am eba0a750: Merge "Clean up GradientDrawable styled attributes, fix useLevelForShape" into lmp-mr1-dev automerge: 91a1a72 
* commit '51547e750e30801e2d367433d8cd59f6b77fdc8c':
  Clean up GradientDrawable styled attributes, fix useLevelForShape
 2014-10-25 02:36:06 +00:00
Alan Viverette
51547e750e am eba0a750: Merge "Clean up GradientDrawable styled attributes, fix useLevelForShape" into lmp-mr1-dev automerge: 91a1a72 
* commit 'eba0a7509178094a46c3cca212bc3f07e70b159e':
  Clean up GradientDrawable styled attributes, fix useLevelForShape
 2014-10-24 23:03:11 +00:00
Alan Viverette
969ca91acd Clean up GradientDrawable styled attributes, fix useLevelForShape 
BUG: 18117976
Change-Id: Iff2ea392204346f68ea47d577e442d398114e5d8
 2014-10-24 12:25:04 -07:00
Yigit Boyar
ba4814a49c am ab43570f: am f3ab4410: am fa9ed8ca: Merge "Added a generic configuration and theme based cache" into lmp-mr1-dev 
* commit 'ab43570f5db770e55a73ccff346b3e922443d126':
  Added a generic configuration and theme based cache
 2014-10-23 22:18:17 +00:00
Yigit Boyar
ab43570f5d am f3ab4410: am fa9ed8ca: Merge "Added a generic configuration and theme based cache" into lmp-mr1-dev 
* commit 'f3ab441090a05bd428b9488b2e8e175f33bd6fe9':
  Added a generic configuration and theme based cache
 2014-10-23 22:04:11 +00:00
Yigit Boyar
d422dc358f Added a generic configuration and theme based cache 
For now, only animators use it but we can consider migrating
drawable cache to it as well.

Bug: 17456416
Change-Id: I571b96856805edb171f0fc52e6bff5a365f46b70
 2014-10-23 11:46:01 -07:00
Derek Sollenberger
425cc668a9 Merge "Refactor HWUI to better handle Canvas DrawFilters." 2014-10-22 15:59:28 +00:00
Alan Viverette
ac68e997b9 am ef2fef17: am ed89e452: am 7c133e19: Merge "Fix gradient drawable radius when specified as float, dimension" into lmp-mr1-dev 
* commit 'ef2fef1719c3c2db5d44b8c6c78db2cf7d6ac882':
  Fix gradient drawable radius when specified as float, dimension
 2014-10-21 18:43:50 +00:00
Alan Viverette
ef2fef1719 am ed89e452: am 7c133e19: Merge "Fix gradient drawable radius when specified as float, dimension" into lmp-mr1-dev 
* commit 'ed89e45253ffded993ed88cd33457f45dbd6a32b':
  Fix gradient drawable radius when specified as float, dimension
 2014-10-21 18:39:06 +00:00
Alan Viverette
7fd807d8f4 am 2c861c78: am 0a8a3eab: am 46b4920a: Merge "Propagate state changes even when we don\'t change drawable index" into lmp-mr1-dev 
* commit '2c861c782d84c61687c969605c28d543a1754e63':
  Propagate state changes even when we don't change drawable index
 2014-10-21 18:38:53 +00:00
Alan Viverette
2c861c782d am 0a8a3eab: am 46b4920a: Merge "Propagate state changes even when we don\'t change drawable index" into lmp-mr1-dev 
* commit '0a8a3eab8bfc3390e1225dfade40599279b4921b':
  Propagate state changes even when we don't change drawable index
 2014-10-21 18:29:02 +00:00
Alan Viverette
7c133e19dd Merge "Fix gradient drawable radius when specified as float, dimension" into lmp-mr1-dev 2014-10-21 18:25:01 +00:00
Alan Viverette
46b4920ac8 Merge "Propagate state changes even when we don't change drawable index" into lmp-mr1-dev 2014-10-21 18:14:50 +00:00
Alan Viverette
2efbe9816e Fix gradient drawable radius when specified as float, dimension 
BUG: 18070756
Change-Id: I991ff792c376c9695a007f8f1187390ab5ff6e3c
 2014-10-21 11:04:04 -07:00
Derek Sollenberger
662d8a3688 Merge "Ensure that all requests for the Paint's nativePtr use p.getNativeInstance()" 2014-10-21 11:41:09 +00:00
Alan Viverette
f81c6af10e Propagate state changes even when we don't change drawable index 
Previously we could miss the state change if we were simply reversing the
current transition.

BUG: 17967405
Change-Id: I2cb396dedbff61b980741ef8c0d931be6abe129c
 2014-10-20 14:42:53 -07:00
ztenghui
f164f2bca6 am 9aa6ea10: am 8c857eec: am 12d808a2: am a724d1ab: am 877ce2c4: Merge "Make sure the bitmap from VD\'s cache is drawn using bi-linear filter." into lmp-dev 
* commit '9aa6ea106d7aec78e5ea4ea251c1eac146496fa6':
  Make sure the bitmap from VD's cache is drawn using bi-linear filter.
 2014-10-20 21:04:42 +00:00
ztenghui
9aa6ea106d am 8c857eec: am 12d808a2: am a724d1ab: am 877ce2c4: Merge "Make sure the bitmap from VD\'s cache is drawn using bi-linear filter." into lmp-dev 
* commit '8c857eec746307dfeb8acb6b080ecc2aa8476ece':
  Make sure the bitmap from VD's cache is drawn using bi-linear filter.
 2014-10-20 20:56:09 +00:00
ztenghui
12d808a24f am a724d1ab: am 877ce2c4: Merge "Make sure the bitmap from VD\'s cache is drawn using bi-linear filter." into lmp-dev 
* commit 'a724d1ab4083f08958bd88e76e15b7c0af337bfc':
  Make sure the bitmap from VD's cache is drawn using bi-linear filter.
 2014-10-20 20:42:51 +00:00
Derek Sollenberger
09c2d4fe15 Refactor HWUI to better handle Canvas DrawFilters. 
First, this CL removes the need to decompose the DrawFilters
in Java and instead passes the SkDrawFilter to HWUI directly.
This also allows the removal of duplicated logic between HWUI
and other Canvas implementations regarding Paint filter levels.

Second, the DrawFilter is now stored in the DisplayListRenderer
where we apply it to every paint BEFORE it is stored in the
DisplayList.  This eliminates the need to filter all Paints on
playback and removes additional complexity at playback.

Finally, as a result of storing the filtered paint we can now
do a better job caching the paints.  This takes advantage of
recent changes in Skia to quickly enable quick hashing and
comparison of paint objects.

Change-Id: Iec507a2d894827975cc4f1d22241542bb0534b4e
 2014-10-17 10:44:29 -04:00
Derek Sollenberger
f4242b107c Ensure that all requests for the Paint's nativePtr use p.getNativeInstance() 
Since requesting the native pointer triggers specific paint behavior we need
to ensure that the field is private and that callers use the public method.

Change-Id: I598a8bf2904960023397728c1ce4502ce408348e
 2014-10-17 08:22:46 -04:00
ztenghui
eec6164e6f Make sure the bitmap from VD's cache is drawn using bi-linear filter. 
b/17949291

Change-Id: I0e59852220ab8a3be2c70afa483e805029a9e19e
 2014-10-16 15:40:04 -07:00
Alan Viverette
2d7ba84349 am fac81d40: am 274d24f1: am b70cfb91: Merge "Avoid saveLayer in RippleDrawable if the background won\'t draw" into lmp-mr1-dev 
* commit 'fac81d40e1e1910a4f6931c77ea0f313518f357f':
  Avoid saveLayer in RippleDrawable if the background won't draw
 2014-10-15 21:30:49 +00:00
Alan Viverette
fac81d40e1 am 274d24f1: am b70cfb91: Merge "Avoid saveLayer in RippleDrawable if the background won\'t draw" into lmp-mr1-dev 
* commit '274d24f18d30eb18eaa4d9ece3056a3b9856721d':
  Avoid saveLayer in RippleDrawable if the background won't draw
 2014-10-15 21:25:38 +00:00
Alan Viverette
b70cfb9103 Merge "Avoid saveLayer in RippleDrawable if the background won't draw" into lmp-mr1-dev 2014-10-15 21:18:00 +00:00
Alan Viverette
0dfd1e2eb1 am 6ee5699b: am eecfb52a: am 9a00cbcc: Merge "Update preload list, clean up drawable theming" into lmp-mr1-dev 
* commit '6ee5699b225db260b0660ee93e7ed2d542b4c962':
  Update preload list, clean up drawable theming
 2014-10-15 02:22:41 +00:00
Alan Viverette
6ee5699b22 am eecfb52a: am 9a00cbcc: Merge "Update preload list, clean up drawable theming" into lmp-mr1-dev 
* commit 'eecfb52ad56a3bb4f5bf2cdaeb83cfe8b33fa0c1':
  Update preload list, clean up drawable theming
 2014-10-15 02:07:34 +00:00
Alan Viverette
9a00cbcc66 Merge "Update preload list, clean up drawable theming" into lmp-mr1-dev 2014-10-14 22:47:43 +00:00
Alan Viverette
17cd4dfe3a Update preload list, clean up drawable theming 
Removes all implementations of three-arg ConstantState constructor, since
we handle mutation and applyTheme() in Resources now. Moves progress bar
tinting to android:tint attribute. Correctly implements applyTheme() and
canApplyTheme() in all drawable wrapper and container classes.

Change-Id: Ic9cb43d0d6228aa4914f3124bed234b837beaa41
 2014-10-14 14:07:21 -07:00
Alan Viverette
a0d48e1cd7 am 882d5cd0: am d9a2b99d: am 42e96769: Merge "Add support for tint and tintMode to GradientDrawable" into lmp-mr1-dev 
* commit '882d5cd051b2081e27f97dcf35a695737e00b434':
  Add support for tint and tintMode to GradientDrawable
 2014-10-14 19:04:10 +00:00
Alan Viverette
42d7f6c17e am b50d1586: am db8ecf80: am 788e30bd: Merge "Revert "Always project ripples"" into lmp-mr1-dev 
* commit 'b50d1586053d16f31faa989a0643e809353a04ee':
  Revert "Always project ripples"
 2014-10-14 19:04:00 +00:00
Alan Viverette
882d5cd051 am d9a2b99d: am 42e96769: Merge "Add support for tint and tintMode to GradientDrawable" into lmp-mr1-dev 
* commit 'd9a2b99de201c89b1b6c58eae213bb15bef58168':
  Add support for tint and tintMode to GradientDrawable
 2014-10-14 17:50:34 +00:00
Alan Viverette
b50d158605 am db8ecf80: am 788e30bd: Merge "Revert "Always project ripples"" into lmp-mr1-dev 
* commit 'db8ecf8005294833a9fe758e5e4a4d6fd100bd66':
  Revert "Always project ripples"
 2014-10-14 17:50:27 +00:00
Alan Viverette
42e96769ae Merge "Add support for tint and tintMode to GradientDrawable" into lmp-mr1-dev 2014-10-14 01:00:36 +00:00
Alan Viverette
788e30bd34 Merge "Revert "Always project ripples"" into lmp-mr1-dev 2014-10-14 00:37:03 +00:00
Alan Viverette
43027b7bca Add support for tint and tintMode to GradientDrawable 
BUG: 17975498
Change-Id: I8aeec48b8499abaf055e75018759f99801efdecc
 2014-10-13 16:55:59 -07:00
Alan Viverette
a7b64e8eef Avoid saveLayer in RippleDrawable if the background won't draw 
BUG: 17952941
Change-Id: Ic2640f847e2ed43fc5117d43230513ee7696d9e7
 2014-10-13 16:47:57 -07:00
Alan Viverette
2627206e1b Revert "Always project ripples" 
Projecting ripples places them under shadows, which is not
ideal. Punting this workaround and waiting until we have
proper support for rounded corner clipping on windows.

This reverts commit f90b6bd54f60960a790b5bd507a0d75d961a981a.

Change-Id: I61946649bbb1bf74a969d74e5353608afc8e4463
 2014-10-13 23:18:04 +00:00
Alan Viverette
6f351bcc7c am 2776b173: am 204e9f4c: am 2f82e48a: Merge "Always project ripples" into lmp-mr1-dev 
* commit '2776b17327e99338630db96d68170b0327084b3d':
  Always project ripples
 2014-10-13 21:12:43 +00:00
Alan Viverette
2776b17327 am 204e9f4c: am 2f82e48a: Merge "Always project ripples" into lmp-mr1-dev 
* commit '204e9f4cae2d49348c121c9738f8f33b5cb20b27':
  Always project ripples
 2014-10-13 21:07:55 +00:00
Alan Viverette
2f82e48abb Merge "Always project ripples" into lmp-mr1-dev 2014-10-13 20:58:48 +00:00
Marcin Kosiba
b2b7c6ebe4 Make Paint.mNativePaint package protected to fix the build. 
The Paint_Delegate changes from lmp-dev reference mNativePaint, which
has been made private in master. Change it to being package-protected
to fix the build.

Change-Id: I4bf30a530f0145cf7697cef6aa9a698fc9bab4ed
 2014-10-13 10:32:46 +01:00
Alan Viverette
961dc4c2f1 am bb3fad78: am 8cb9a9e6: am 284559bf: Merge "Fix inset drawable\'s intrinsic size, replace ic_text_dot asset" into lmp-mr1-dev 
* commit 'bb3fad78c922f5da9ecafcd0389a552b2a84ce94':
  Fix inset drawable's intrinsic size, replace ic_text_dot asset
 2014-10-11 00:26:58 +00:00
Alan Viverette
bb3fad78c9 am 8cb9a9e6: am 284559bf: Merge "Fix inset drawable\'s intrinsic size, replace ic_text_dot asset" into lmp-mr1-dev 
* commit '8cb9a9e6ba602cc4a2da334fcec966e7f06c63a4':
  Fix inset drawable's intrinsic size, replace ic_text_dot asset
 2014-10-11 00:22:41 +00:00
Alan Viverette
cdd5e067f2 Fix inset drawable's intrinsic size, replace ic_text_dot asset 
BUG: 17648301
Change-Id: I8af0f6d1beee7a1cb3a3b9db571ed2c407e24556
 2014-10-10 14:08:32 -07:00