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

2427 Commits

Author SHA1 Message Date
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
Alan Viverette
b65c4a6216 am 15913c80: am cda2dafd: am 27fdbc60: Merge "Ensure calling mutate() on DrawableContainer creates a new state" into lmp-mr1-dev 
* commit '15913c804f20bb37af90a4b81ff7758db90a2d17':
  Ensure calling mutate() on DrawableContainer creates a new state
 2014-11-25 18:50:52 +00:00
John Reck
af3efb4a9e am f2a382d4: am fb6121e0: Merge "Revert "Ensure calling mutate() on DrawableContainer creates a new state"" into lmp-mr1-dev 
* commit 'f2a382d4f7de5336d0c20358bb694e205a38fc38':
  Revert "Ensure calling mutate() on DrawableContainer creates a new state"
 2014-11-25 18:45:54 +00:00
Alan Viverette
c9b68e1150 am df188d41: am d30f6fba: Merge "Cannot set Pivot X,Y values from setPivotX, setPivotY API" into lmp-mr1-dev 
* commit 'df188d4137a9ebf0661127bab36c517a7fb001d5':
  Cannot set Pivot X,Y values from setPivotX, setPivotY API
 2014-11-25 18:44:37 +00:00
Alan Viverette
15913c804f am cda2dafd: am 27fdbc60: Merge "Ensure calling mutate() on DrawableContainer creates a new state" into lmp-mr1-dev 
* commit 'cda2dafd36641130fc41888d81c98cd2d54047b8':
  Ensure calling mutate() on DrawableContainer creates a new state
 2014-11-25 18:44:25 +00:00
Alan Viverette
8dcd533786 Ensure calling mutate() on DrawableContainer creates a new state 
Previously, a new state would only be created on newDrawable(), which
caused the first drawable loaded for a resource to share constant state
with the cached version. Even if mutate() was called, the constant
state was still shared and any changes were applied to the cached copy.

BUG: 18504919
Change-Id: I40d257867eb0a092ce580b9c4338ddc7406a031d
 2014-11-25 10:40:24 -08:00
John Reck
fb6121e069 Merge "Revert "Ensure calling mutate() on DrawableContainer creates a new state"" into lmp-mr1-dev 2014-11-25 15:54:25 +00:00
John Reck
cf84ab5e7f Revert "Ensure calling mutate() on DrawableContainer creates a new state" 
This reverts commit d7dab349c2af0e4bde188b1969f0c697b217dd57.

Change-Id: Icc1c4bfa296a59a551088fe7cc2449a97bb2b7b7
Reason: Broke the build
 2014-11-25 15:50:59 +00:00
Alan Viverette
d30f6fba8b Merge "Cannot set Pivot X,Y values from setPivotX, setPivotY API" into lmp-mr1-dev 2014-11-25 00:53:08 +00:00
Alan Viverette
d7dab349c2 Ensure calling mutate() on DrawableContainer creates a new state 
Previously, a new state would only be created on newDrawable(), which
caused the first drawable loaded for a resource to share constant state
with the cached version. Even if mutate() was called, the constant
state was still shared and any changes were applied to the cached copy.

BUG: 18504919
Change-Id: I1ce76fbbc144e9c0c93261e3a12cc613d0c74b83
 2014-11-24 11:11:05 -08:00
Chris Craik
90102e1009 am 1ae8a98e: am 29dc496a: Merge "Revert "Add a way to override Xfermode DO NOT MERGE"" into lmp-mr1-dev 
* commit '1ae8a98e8a6ba82396955c0b6ab0e02568a3494b':
  Revert "Add a way to override Xfermode DO NOT MERGE"
 2014-11-21 22:21:02 +00:00
Chris Craik
6bcf223bf6 Merge "Revert "Add a way to override Xfermode"" 2014-11-21 22:11:14 +00:00
Chris Craik
29dc496a42 Merge "Revert "Add a way to override Xfermode DO NOT MERGE"" into lmp-mr1-dev 2014-11-21 22:11:13 +00:00
Chris Craik
da3198a550 Revert "Add a way to override Xfermode" 
Feature no longer needed.

bug:18448377

This reverts commit c495e611b9fa1fc6b47a647c714bbbf94dd63461.

Change-Id: Ia3e37f06953ffd81ca3fac367ee790d26b1b5d29
 2014-11-21 22:05:46 +00:00
Chris Craik
69e65019b0 Revert "Add a way to override Xfermode DO NOT MERGE" 
Feature no longer needed.

bug:18448377

This reverts commit 4678dcc5524258908eadc5fe1e5e1874768967eb.

Change-Id: Ib0a19946e966a54857165555827b5fa7b34b6bea
 2014-11-21 22:05:33 +00:00
ztenghui
5287c18880 am 3458abd6: am 002bc810: Merge "ASLD: ASLD\'s XML reversible flag can turn off the reverse behavior now." into lmp-mr1-dev automerge: e9dbfe5 
* commit '3458abd6a7d0709f0360c1c18cce036bb7bc4299':
  ASLD: ASLD's XML reversible flag can turn off the reverse behavior now.
 2014-11-21 03:11:39 +00:00
jungheang.lee
735b75ce27 Cannot set Pivot X,Y values from setPivotX, setPivotY API 
Pivot value can not be changed once they have been set to default.
To be changed "==" -> "!=" in if()

BUG: 18474532
Change-Id: Iacd16eb951154ea97c241566b704e0ad3f225bd1
 2014-11-21 03:01:41 +00:00
Chris Craik
08dc405ecd am 0d6512a8: am 93ef9639: Merge "Improve ColorMatrix docs" into lmp-mr1-dev automerge: 5b41215 
* commit '0d6512a8dd398e5eea79744ce4541664041dfdb8':
  Improve ColorMatrix docs
 2014-11-21 02:58:11 +00:00
ztenghui
3458abd6a7 am 002bc810: Merge "ASLD: ASLD\'s XML reversible flag can turn off the reverse behavior now." into lmp-mr1-dev 
automerge: e9dbfe5

* commit 'e9dbfe5afd5cd350f06f078775a40e8df4e69ce6':
  ASLD: ASLD's XML reversible flag can turn off the reverse behavior now.
 2014-11-21 02:53:38 +00:00
Chris Craik
0d6512a8dd am 93ef9639: Merge "Improve ColorMatrix docs" into lmp-mr1-dev 
automerge: 5b41215

* commit '5b41215b1647d9673b1231d046736c8e0590fa8a':
  Improve ColorMatrix docs
 2014-11-21 02:48:35 +00:00
ztenghui
002bc81088 Merge "ASLD: ASLD's XML reversible flag can turn off the reverse behavior now." into lmp-mr1-dev 2014-11-20 23:11:38 +00:00
ztenghui
5b84eace6c ASLD: ASLD's XML reversible flag can turn off the reverse behavior now. 
Previously, the android:reversible flag behaves like a suggestion.
Now it is used to enforce no reverse when set to false. In this way, user can
safely setup one direction animation only.
When set to true, but AVD can't reverse , then it will show a warning.

At the same time, update the tests to show different cases, including
AnimationDrawable.

b/18413484

Change-Id: I5552c49dcbd76b0724b4d5593bce8388b27bd905
 2014-11-20 14:41:33 -08:00
Chris Craik
93ef96395a Merge "Improve ColorMatrix docs" into lmp-mr1-dev 2014-11-20 21:39:47 +00:00