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
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
Chris Craik
db7cc60eb2 Improve ColorMatrix docs 
bug:18415632

Clean up some text, and add a sample.

Change-Id: I39fdda2004e1932831058701f95f67355786ad9d
 2014-11-20 13:28:01 -08:00
Raph Levien
0a39f8ffe0 am 7010d0b6: am 505ffe36: Merge "Check bounds on CharSequence drawText methods" into lmp-mr1-dev automerge: 58fa003 
* commit '7010d0b6c398cb03b4be43a547921c3e9a95eeb0':
  Check bounds on CharSequence drawText methods
 2014-11-14 22:00:49 +00:00
Raph Levien
7010d0b6c3 am 505ffe36: Merge "Check bounds on CharSequence drawText methods" into lmp-mr1-dev 
automerge: 58fa003

* commit '58fa0035775bbb897115bae1b59719391a1a7edd':
  Check bounds on CharSequence drawText methods
 2014-11-14 21:53:11 +00:00
Raph Levien
505ffe3633 Merge "Check bounds on CharSequence drawText methods" into lmp-mr1-dev 2014-11-14 20:54:29 +00:00
Alan Viverette
a208f546d5 am 5961f6b7: am a9566f90: am 0c242376: Merge "Set current degrees when updating RotateDrawable from typed array" into lmp-mr1-dev 
* commit '5961f6b767a3e549654c6bfdae2960144b4ca428':
  Set current degrees when updating RotateDrawable from typed array
 2014-11-14 19:18:39 +00:00
Chris Craik
a76634b855 am bbac83fc: am c3784c4d: am 6b3bf0ce: Merge "Add offset method to Outline" into lmp-mr1-dev 
* commit 'bbac83fc7987b67e6116b4422aee47580aae128a':
  Add offset method to Outline
 2014-11-14 19:17:14 +00:00
Alan Viverette
5961f6b767 am a9566f90: am 0c242376: Merge "Set current degrees when updating RotateDrawable from typed array" into lmp-mr1-dev 
* commit 'a9566f9085427287e99b0b20c51dda4688a3e1e8':
  Set current degrees when updating RotateDrawable from typed array
 2014-11-14 02:06:53 +00:00
Alan Viverette
0c24237686 Merge "Set current degrees when updating RotateDrawable from typed array" into lmp-mr1-dev 2014-11-14 01:52:14 +00:00
Chris Craik
bbac83fc79 am c3784c4d: am 6b3bf0ce: Merge "Add offset method to Outline" into lmp-mr1-dev 
* commit 'c3784c4d6140517a6927685f552fa8719353e46f':
  Add offset method to Outline
 2014-11-14 00:03:33 +00:00
Alan Viverette
d03963ce36 Set current degrees when updating RotateDrawable from typed array 
This regressed after enabling theming in RotateDrawable.

BUG: 18288235
Change-Id: I61a7b2c178253ed2d550fa0636e27e021ac9eb64
 2014-11-13 15:14:36 -08:00
Chris Craik
6b3bf0ceef Merge "Add offset method to Outline" into lmp-mr1-dev 2014-11-13 22:46:22 +00:00
Rob Tsuk
95e5a82e1d Merge "Add a way to override Xfermode" 2014-11-13 17:17:06 +00:00
Chris Craik
e8a39f5960 am b71be9c3: am 9750c696: am 075b2b4f: Merge "Add details and performance warnings to save flag docs" into lmp-mr1-dev 
* commit 'b71be9c3523adef99b42833e974b6f61369a24b0':
  Add details and performance warnings to save flag docs
 2014-11-13 02:16:58 +00:00
Chris Craik
b71be9c352 am 9750c696: am 075b2b4f: Merge "Add details and performance warnings to save flag docs" into lmp-mr1-dev 
* commit '9750c6961c5cbe5600ee96efbdfd3cffe0b2a778':
  Add details and performance warnings to save flag docs
 2014-11-13 00:21:04 +00:00
Chris Craik
0e12fa12cb Add offset method to Outline 
Also clean up offset docs in Path

Change-Id: Ieca02611d32acce726efba652ae1969340a55a76
 2014-11-12 16:17:33 -08:00
Chris Craik
075b2b4ff9 Merge "Add details and performance warnings to save flag docs" into lmp-mr1-dev 2014-11-13 00:05:59 +00:00
Alan Viverette
8aa0bbfcc7 am 469e72ff: am 5f876974: am 667ec63c: Merge "Don\'t propagate AnimatedStateListDrawable state change to super()" into lmp-mr1-dev 
* commit '469e72ffe70e05101dddc8b49f5add0b6888a9d4':
  Don't propagate AnimatedStateListDrawable state change to super()
 2014-11-13 00:00:24 +00:00
ztenghui
74a2d7695e am c3e29108: am d46cf713: Merge "AVD: Requires all animator has stopped before start again." into lmp-mr1-dev automerge: ffcb5e2 
* commit 'c3e29108fcd87b8229cddacec98e63fe5f79efdf':
  AVD: Requires all animator has stopped before start again.
 2014-11-12 23:59:44 +00:00
Alan Viverette
710f713baa am 84ed482f: am 1c252a6f: Merge "Fix default attributes in ScaleDrawable" into lmp-mr1-dev automerge: 26478ba 
* commit '84ed482ff9a9e8f6ea6e14c978d4311f23396bc6':
  Fix default attributes in ScaleDrawable
 2014-11-12 23:59:40 +00:00
Alan Viverette
469e72ffe7 am 5f876974: am 667ec63c: Merge "Don\'t propagate AnimatedStateListDrawable state change to super()" into lmp-mr1-dev 
* commit '5f876974d025406cd48eac9759989c09c899a4dd':
  Don't propagate AnimatedStateListDrawable state change to super()
 2014-11-12 23:49:46 +00:00
Rob Tsuk
c495e611b9 Add a way to override Xfermode 
Add a non-public API to Canvas/GLES20Canvas to provide a way to draw
the touch ripple animation without using a save layer.

Bug: 18226391
Change-Id: I6f8fb8938505e976892c4e14f6f864362c43e73c
 2014-11-12 15:49:45 -08:00
Rob Tsuk
6552afa878 am ccc956b2: am 41a8043b: Merge "Add a way to override Xfermode DO NOT MERGE" into lmp-mr1-dev 
* commit 'ccc956b2b4602dca28f7c79d1155df29bcc0d696':
  Add a way to override Xfermode DO NOT MERGE
 2014-11-12 23:49:19 +00:00
ztenghui
c3e29108fc am d46cf713: Merge "AVD: Requires all animator has stopped before start again." into lmp-mr1-dev automerge: ffcb5e2 
* commit 'd46cf7138a955d004911bbd637535390030b328f':
  AVD: Requires all animator has stopped before start again.
 2014-11-12 23:40:21 +00:00
Alan Viverette
84ed482ff9 am 1c252a6f: Merge "Fix default attributes in ScaleDrawable" into lmp-mr1-dev automerge: 26478ba 
* commit '1c252a6f8b3dbeb7aa533203731256b3b037d3e2':
  Fix default attributes in ScaleDrawable
 2014-11-12 23:40:10 +00:00
Raph Levien
d82f8a9a38 Check bounds on CharSequence drawText methods 
The canvas drawText() methods on CharSequence arguments didn't check
whether the start and end offsets were within bounds, which triggered
native crashes. This patch checks the bounds and throws
IndexOutOfBoundsException when invalid.

Bug: 18282500
Change-Id: I1935bf21f828b960c817b40ebce6affd4ce8bb99
 2014-11-12 15:05:16 -08:00
Alan Viverette
667ec63c9e Merge "Don't propagate AnimatedStateListDrawable state change to super()" into lmp-mr1-dev 2014-11-12 22:19:06 +00:00
Rob Tsuk
41a8043b30 Merge "Add a way to override Xfermode DO NOT MERGE" into lmp-mr1-dev 2014-11-12 21:42:00 +00:00
ztenghui
ffcb5e210a Merge "AVD: Requires all animator has stopped before start again." into lmp-mr1-dev 2014-11-12 20:47:45 +00:00