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

2334 Commits

Author SHA1 Message Date
Alan Viverette
f4c068b72e Add getDither, getFilterBitmap to Drawable for CTS testing 
Also removes unnecessary overrides from PictureDrawable.

Change-Id: I13539b5204e8c0d8b9912da14de7ceae62720e3f
 2015-01-06 11:01:36 -08:00
Alan Viverette
304ea5aac7 Merge "Allow use of theme attributes in color state lists" 2015-01-06 18:47:29 +00:00
Tom Hudson
8dfaa49042 Make DisplayListRenderer inherit from Canvas, merge JNI 
Incrementally unify the upper layers for Skia and HWUI.
Remove redundant code from GLES20Canvas.java; instead
use inherited mNativeCanvasWrapper and superclass method
definitions.

Moves some unrelated SkPaint utility functions from Renderer
to new utils/PaintUtils.

bug: 15672762
Change-Id: I4ddd4214b8e9eeb95289d054ef423f2542bb5fa5
 2015-01-05 15:25:41 -08:00
Alan Viverette
45c4bbbbce Allow use of theme attributes in color state lists 
BUG: 17384842
Change-Id: Ibdc413acbd00e37b908432abd55f6521c22b8fc9
 2015-01-05 14:59:19 -08:00
Alan Viverette
5a4be5a2da am e260a358: am 7c3212b2: Merge "Propagate DrawableContainer state on mutate, fix ColorDrawable theming" into lmp-mr1-dev 
automerge: 81612d8

* commit '81612d80c5b2d40c8cf1fb03336a9b0f9249d82a':
  Propagate DrawableContainer state on mutate, fix ColorDrawable theming
 2014-12-12 22:15:39 +00:00
Alan Viverette
0a69ae9666 am 1060d75e: am 9a1b4c29: Merge "Move ripple to end state on jump when hardware exit is pending" into lmp-mr1-dev 
automerge: 2e0e2a4

* commit '2e0e2a44073e7417a42d97e9d7b82e050a845b4d':
  Move ripple to end state on jump when hardware exit is pending
 2014-12-12 22:14:20 +00:00
Alan Viverette
81612d80c5 am e260a358: am 7c3212b2: Merge "Propagate DrawableContainer state on mutate, fix ColorDrawable theming" into lmp-mr1-dev 
* commit 'e260a358bfc945bf01d901f496b7f30784cbf920':
  Propagate DrawableContainer state on mutate, fix ColorDrawable theming
 2014-12-12 22:11:46 +00:00
Alan Viverette
2e0e2a4407 am 1060d75e: am 9a1b4c29: Merge "Move ripple to end state on jump when hardware exit is pending" into lmp-mr1-dev 
* commit '1060d75e3abd37671b0962297f4587dd3d6e0cc8':
  Move ripple to end state on jump when hardware exit is pending
 2014-12-12 22:11:40 +00:00
Alan Viverette
7c3212b2f4 Merge "Propagate DrawableContainer state on mutate, fix ColorDrawable theming" into lmp-mr1-dev 2014-12-12 22:00:26 +00:00
Alan Viverette
9bc11ac168 Move ripple to end state on jump when hardware exit is pending 
BUG: 18734676
Change-Id: Ie063e1eec0b4f28f936ea27822afacfd1b72a0e9
 2014-12-12 13:38:10 -08:00
Alan Viverette
419aa7ad14 Propagate DrawableContainer state on mutate, fix ColorDrawable theming 
BUG: 18542282
BUG: 18467568
Change-Id: Id1d75cfe47fde3206ab40e5360289e0cb2504402
 2014-12-12 12:34:15 -08:00
Alan Viverette
9f2d0d27ac am 934d8d85: am daec5943: Fix build automerge: aaf2e19 
* commit '934d8d85be221b86cb5097625c0f48391b3a71b2':
  Fix build
 2014-12-11 01:40:26 +00:00
Alan Viverette
6a9fb4b6dd am 7d0aed2d: am 4e137437: Merge "Update tint filter after setting gradient drawable state" into lmp-mr1-dev automerge: c211857 
* commit '7d0aed2d2c0c2fd4bcaa0e786efd6134ae162d07':
  Update tint filter after setting gradient drawable state
 2014-12-11 01:40:17 +00:00
Alan Viverette
d8d9cbe3ff am 1259ab3a: am 3d517a70: am 62b780e8: Avoid creating futures for drawables with no constant state 
* commit '1259ab3a881adb008b74e5ad81c84e088f674cf6':
  Avoid creating futures for drawables with no constant state
 2014-12-11 01:38:38 +00:00
Alan Viverette
934d8d85be am daec5943: Fix build 
automerge: aaf2e19

* commit 'aaf2e190d363f5934e5bc2fd3293d41aa9ac00aa':
  Fix build
 2014-12-11 00:37:51 +00:00
Alan Viverette
7d0aed2d2c am 4e137437: Merge "Update tint filter after setting gradient drawable state" into lmp-mr1-dev 
automerge: c211857

* commit 'c211857af37eabb6073fa2ac402c9f7de9548822':
  Update tint filter after setting gradient drawable state
 2014-12-11 00:32:53 +00:00
Alan Viverette
daec594370 Fix build 
Change-Id: I2efdf2790aa768eaaa6e7e0b80a9ad7b2ddf3cb9
 2014-12-10 16:29:59 -08:00
Alan Viverette
1259ab3a88 am 3d517a70: am 62b780e8: Avoid creating futures for drawables with no constant state 
* commit '3d517a701cb583f59ed8deefd21ab854c3890065':
  Avoid creating futures for drawables with no constant state
 2014-12-11 00:07:20 +00:00
Alan Viverette
3ad771b384 Update tint filter after setting gradient drawable state 
BUG: 18706381
Change-Id: I7d664303c9b796243da6c55d1ea9482736aabf07
 2014-12-10 16:00:43 -08:00
Alan Viverette
62b780e85f Avoid creating futures for drawables with no constant state 
We don't need to create futures for drawables without constant state,
since we only copy on mutate and we don't need to do any work on mutate()
for drawables without shared constant state. Also we would crash in that
case, so avoiding the NPE is nice too.

Rider: Also fixes elevations again.

BUG: 18696100
Change-Id: I4d7737f39ce3efc5830704e5ce412c540603e6ac
 2014-12-10 13:52:28 -08:00
Nick Kralevich
7668e78601 resolved conflicts for merge of 3bae94d7 to master 
Change-Id: I381539b1494447d62290c492f2550840fe0b559c
 2014-12-10 11:03:40 -08:00
Alan Viverette
f1d6706fb4 am c5d71c67: am 60abe259: am 6ef76c60: Merge "Fix default value of AnimationDrawable\'s one shot property" into lmp-mr1-dev 
* commit 'c5d71c67dfbcd0d80ee1fa453e027ea642542fc3':
  Fix default value of AnimationDrawable's one shot property
 2014-12-09 23:47:27 +00:00
John Reck
3bae94d78e resolved conflicts for merge of fe11126d to lmp-mr1-dev-plus-aosp 
Change-Id: I60bf82ff71d9af0d80e7da8856efb4641c85885b
 2014-12-09 15:38:38 -08:00
Alan Viverette
d3a0da9aac am 5a50a8bc: am e615da7e: am f1792c42: Merge "Fix hotspot coordinate propagation in ViewGroup and AbsListView" into lmp-mr1-dev 
* commit '5a50a8bcabdb2593b48b06854a7455318399b6d1':
  Fix hotspot coordinate propagation in ViewGroup and AbsListView
 2014-12-09 22:23:37 +00:00
John Reck
dad7d84c04 Teach AssetAtlas about more drawables 
Bug: 18317479

Change-Id: I16868ee204d24af72af9a2efc987f7e9eb1d266b
 2014-12-09 14:18:33 -08:00
Alan Viverette
c5d71c67df am 60abe259: am 6ef76c60: Merge "Fix default value of AnimationDrawable\'s one shot property" into lmp-mr1-dev 
* commit '60abe25978ab1c1e4935dcd58af9cd3a0994c12e':
  Fix default value of AnimationDrawable's one shot property
 2014-12-09 18:14:13 +00:00
Alan Viverette
6ef76c60df Merge "Fix default value of AnimationDrawable's one shot property" into lmp-mr1-dev 2014-12-09 17:59:08 +00:00
Alan Viverette
0b9ab9749a Fix default value of AnimationDrawable's one shot property 
BUG: 18676499
Change-Id: Iaaf134b3a58a04cd99db001edc4438ee75dab878
 2014-12-09 09:48:18 -08:00
ztenghui
6828d32772 am 9bb5cef9: am 971fe6d6: am 04c022f4: Merge "AVD: Deep copy the animator target setup when mutate." into lmp-mr1-dev 
* commit '9bb5cef91f82f883a8899dee5fad56111648f1e1':
  AVD: Deep copy the animator target setup when mutate.
 2014-12-09 00:18:02 +00:00
Alan Viverette
d505fb7917 am 5f5e13d0: am 108e5394: am 6dfa60f3: Avoid extra saveLayer calls in RippleDrawable, fix docs 
* commit '5f5e13d07fcf7531c0bb61f147732a430ad5aeda':
  Avoid extra saveLayer calls in RippleDrawable, fix docs
 2014-12-09 00:16:54 +00:00
Alan Viverette
5a50a8bcab am e615da7e: am f1792c42: Merge "Fix hotspot coordinate propagation in ViewGroup and AbsListView" into lmp-mr1-dev 
* commit 'e615da7eb74907c7df993009ba8137e6ddd4ac62':
  Fix hotspot coordinate propagation in ViewGroup and AbsListView
 2014-12-08 19:45:20 +00:00
ztenghui
9bb5cef91f am 971fe6d6: am 04c022f4: Merge "AVD: Deep copy the animator target setup when mutate." into lmp-mr1-dev 
* commit '971fe6d66419065b96b46a20b7110ba435fa3a9a':
  AVD: Deep copy the animator target setup when mutate.
 2014-12-08 19:15:36 +00:00
Alan Viverette
5f5e13d07f am 108e5394: am 6dfa60f3: Avoid extra saveLayer calls in RippleDrawable, fix docs 
* commit '108e539495edb2bfc0d1a3a2cb0879583561bed6':
  Avoid extra saveLayer calls in RippleDrawable, fix docs
 2014-12-08 19:12:32 +00:00
Alan Viverette
b942b6f15c Fix hotspot coordinate propagation in ViewGroup and AbsListView 
There was a weird disconnect between setPressed() and hotspot propagation
behavior. This makes hotspot propagation work like setPressed(). Also
fixes ripple animation during drag-to-open.

BUG: 18631557
BUG: 18593243
Change-Id: Id4adf5d815e4d426b4182aac4d0c780f04472ae4
 2014-12-08 10:37:39 -08:00
Alan Viverette
b2accbb6d2 am 23d86231: am ae656af7: am bab2b594: Merge "Update locally cached drawables when constant state changes" into lmp-mr1-dev 
* commit '23d86231e9af2f4ba43cbc8a8cbbfc9757a98ddc':
  Update locally cached drawables when constant state changes
 2014-12-05 21:49:36 +00:00
Alan Viverette
23d86231e9 am ae656af7: am bab2b594: Merge "Update locally cached drawables when constant state changes" into lmp-mr1-dev 
* commit 'ae656af727966df132d5ec7a462bc8bd98e41b71':
  Update locally cached drawables when constant state changes
 2014-12-05 21:41:10 +00:00
ztenghui
04c022f4c1 Merge "AVD: Deep copy the animator target setup when mutate." into lmp-mr1-dev 2014-12-05 18:28:30 +00:00
ztenghui
d2f50c78c3 AVD: Deep copy the animator target setup when mutate. 
Only calling VectorDrawable's mutate here will miss all the animator setup,
when the VectorDrawable has a new state.
So we just deep copy everything and setup the animators again.

b/18521582

Change-Id: Id164312750bb548f9c2d21cc0b5806cd2bafcf0d
 2014-12-04 16:55:26 -08:00
Alan Viverette
6dfa60f33c Avoid extra saveLayer calls in RippleDrawable, fix docs 
Also fixes opacity returned from InsetDrawable to accurately reflect
the transparent inset area and updates button to correctly use tint.

BUG: 18226391
Change-Id: Ia9a88d9d663990a6829d2f251c7f59ea2a79d816
 2014-12-04 16:52:16 -08:00
John Reck
1022888d33 resolved conflicts for merge of 203c8171 to master 
Change-Id: I256397410c261fae049bae4572f132235be1c5c9
 2014-12-04 16:06:34 -08:00
Derek Sollenberger
203c817180 am c1a2f38c: am 4d9da135: Merge "Update AndroidPixelRef to prevent VM from cleaning up memory prematurely." into lmp-mr1-dev 
* commit 'c1a2f38ce0447b005d0cde6836857f451af84dc6':
  Update AndroidPixelRef to prevent VM from cleaning up memory prematurely.
 2014-12-04 21:46:39 +00:00
Alan Viverette
ebc9f2e773 Update locally cached drawables when constant state changes 
Previously we were failing to update references to drawables that had
been pulled from constant state, so we were drawing the wrong ones.

Also fixes button Z translation on press, which was WAY too high.

BUG: 18542282
Change-Id: Ifde7d64e31d31737854cfcbe75777e5b07a06e3a
 2014-12-04 12:54:46 -08:00
Derek Sollenberger
f29d5a5b21 Update AndroidPixelRef to prevent VM from cleaning up memory prematurely. 
bug:18306529
Change-Id: I1ea94df1dcaf4fcf248b63dc8b0a13f36412570a
 2014-12-03 13:43:30 -05:00
Alan Viverette
ea0db58af3 am 42b678b3: am fa173e0c: am d72901f0: Merge "Update drawable container constant state following clone" into lmp-mr1-dev 
* commit '42b678b3d7c10d6986aea82ec72e1b36f243972a':
  Update drawable container constant state following clone
 2014-12-03 00:31:39 +00:00
Alan Viverette
42b678b3d7 am fa173e0c: am d72901f0: Merge "Update drawable container constant state following clone" into lmp-mr1-dev 
* commit 'fa173e0c65219e56625c22b0ac482354d924bcd8':
  Update drawable container constant state following clone
 2014-12-02 23:45:31 +00:00
Alan Viverette
5ed8f27858 Update drawable container constant state following clone 
DrawableContainer's internal state was getting out of sync with the
internal state of child classes because we failed to call set state.

BUG: 18542282
Change-Id: Iacaa12042e99c1b9e9eaf08f0ab879d82260e7ee
 2014-11-26 17:16:08 -08:00
Alan Viverette
39319d1d4d am e5684843: am e6974e32: am 10e2700d: Merge "Ensure calling mutate() on DrawableContainer creates a new state" into lmp-mr1-dev 
* commit 'e56848431e31434f1d453222187a2e32f2e03e90':
  Ensure calling mutate() on DrawableContainer creates a new state
 2014-11-26 19:41:30 +00:00
Alan Viverette
e56848431e am e6974e32: am 10e2700d: Merge "Ensure calling mutate() on DrawableContainer creates a new state" into lmp-mr1-dev 
* commit 'e6974e32e740f9801b5023695881a80df0b363f6':
  Ensure calling mutate() on DrawableContainer creates a new state
 2014-11-26 18:41:06 +00:00
John Reck
58383869ab am af3efb4a: am f2a382d4: am fb6121e0: Merge "Revert "Ensure calling mutate() on DrawableContainer creates a new state"" into lmp-mr1-dev 
* commit 'af3efb4a9ea9eafc86888be48c88fe638a22c7e9':
  Revert "Ensure calling mutate() on DrawableContainer creates a new state"
 2014-11-25 18:51:33 +00:00
Alan Viverette
270ca583bb am c9b68e11: am df188d41: am d30f6fba: Merge "Cannot set Pivot X,Y values from setPivotX, setPivotY API" into lmp-mr1-dev 
* commit 'c9b68e115091f8cd0fd77590d9d1be2bb0f04953':
  Cannot set Pivot X,Y values from setPivotX, setPivotY API
 2014-11-25 18:51:02 +00:00