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

2302 Commits

Author SHA1 Message Date
Yuichi Araki
c3fbf13d52 am e2fc3adb: am 61ce6c9b: am 776cf41d: Fix a broken link in javadoc 
* commit 'e2fc3adbb4040400496aebdab80c4cac1083da27':
  Fix a broken link in javadoc
 2015-04-02 20:19:09 +00:00
Yuichi Araki
776cf41d7c Fix a broken link in javadoc 
Bug: 19856130

Change-Id: I0456e951f8bed36e3a62ddfd882f9c2d2bef9627
 2015-04-02 04:03:07 +00:00
Andreas Gampe
7db6ebe037 Merge "Frameworks/base: Don't allocate another identity matrix" 2015-03-24 16:02:55 +00:00
Andreas Gampe
28e6aeca3a Merge "Frameworks/base: Make IDENTITY_MATRIX final" 2015-03-17 21:33:09 +00:00
Andreas Gampe
399fa8a60a Frameworks/base: Make IDENTITY_MATRIX final 
Bug: 19797138
Change-Id: I127f24b7060a0c4dab401ce8e3057d362c6d6b06
 2015-03-17 21:31:42 +00:00
Andreas Gampe
d538fa0fb2 Frameworks/base: Don't allocate another identity matrix 
There is already an identity matrix in Matrix. Don't allocate another
one for VectorDrawable.

Change-Id: I51735f262d6680e043b0009707ec42acb2d0d1ad
 2015-03-15 19:03:29 -07:00
Andreas Gampe
f2b1cff4e2 Frameworks/base: Fix null-pointer check 
Change-Id: I715a21c313e909ae654e0c1aa67bdf7bcd89de76
 2015-03-15 15:07:19 -07:00
Elliott Hughes
92c4f1756d am d002e027: Merge "Fix \'fuchsia\' typo." 
* commit 'd002e02750b51fed3da41a2b4b222824df8d1a10':
  Fix 'fuchsia' typo.
 2015-02-21 17:09:46 +00:00
Elliott Hughes
fd9bc7bb36 Fix 'fuchsia' typo. 
Bug: https://code.google.com/p/android/issues/detail?id=152142
Change-Id: Ib45f2d19d52fe9d95d560d37296d50cba190cb83
 2015-02-21 09:03:13 -08:00
John Reck
1e5dd46133 am 94474515: Merge "Prevent memory corruption from use-after-free" into lmp-mr1-dev 
automerge: bb8d7ff

* commit 'bb8d7ffeae187e8782a9494e252e335db537b2a1':
  Prevent memory corruption from use-after-free
 2015-01-23 20:33:18 +00:00
John Reck
4018eb3763 Prevent memory corruption from use-after-free 
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
 2015-01-23 11:01:05 -08:00
Alan Viverette
2aacb861f4 Avoid ripple buffer creation for empty bounds automerge: b74155c 
automerge: e6e216c

* commit 'e6e216c48ea25bdbc2d0a262c74670fb6513e42b':
  Avoid ripple buffer creation for empty bounds
 2015-01-21 21:09:39 +00:00
Alan Viverette
b74155cf01 Avoid ripple buffer creation for empty bounds 
Bug: 19068439
Change-Id: I031d4303bbf101a25612dce6f02d81ce4cf58e2b
 2015-01-21 12:30:49 -08:00
Alan Viverette
c83245be67 am 628e646e: am aa229902: Merge "Jump ripples to end when switching to a non-hardware canvas" into lmp-mr1-dev 
* commit '628e646eeae6147578428632d7c25326b8b7ef59':
  Jump ripples to end when switching to a non-hardware canvas
 2015-01-15 01:39:44 +00:00
Alan Viverette
a0c0ca7389 Jump ripples to end when switching to a non-hardware canvas 
Previously we canceled the hardware animations but neglected to reset
the state, which left us drawing in the pressed state.

Bug: 19020524
Change-Id: I439a18126b9093cac40006361be99f8d077b95a9
 2015-01-14 17:05:21 -08: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
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
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
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
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
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
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
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
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
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