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

1863 Commits

Author SHA1 Message Date
Alan Viverette
830960cce0 Material theme 
BUG: 15467097
Change-Id: I15191362e104a902895418fc615892c21db64c35
 2014-06-06 15:48:55 -07:00
Alan Viverette
6e083aeaad am 58248d04: Merge "Update drawables to fix CTS test failures" into lmp-preview-dev 
* commit '58248d049e8b17dd60e4e94e784c09b00e0a7e9d':
  Update drawables to fix CTS test failures
 2014-06-06 20:57:37 +00:00
Alan Viverette
06318a0869 Update drawables to fix CTS test failures 
Change-Id: I78617aedab450f5bc18807c03d07ee776584ece0
 2014-06-06 10:59:55 -07:00
Alan Viverette
0622a4c8b8 am 7553d48d: Merge "Fix default stroke width and NPE for line with no stroke width" into lmp-preview-dev 
* commit '7553d48d28683b5b21e964d837a3f3c0f66af9ad':
  Fix default stroke width and NPE for line with no stroke width
 2014-06-05 22:22:57 +00:00
Alan Viverette
3b983a74c6 Fix default stroke width and NPE for line with no stroke width 
Also fixes restart on visiblity change in AnimationDrawable

BUG: 15437284
Change-Id: I698e7ffb11489061a38fbcd5cea10ba11a6abb34
 2014-06-05 13:43:25 -07:00
Alan Viverette
c740ffa3c6 am c1462be8: Merge "Update ripple spec, fix ripple mask, rotate progress drawable" into lmp-preview-dev 
* commit 'c1462be80a2581ddd522bf24d91ba183f166de80':
  Update ripple spec, fix ripple mask, rotate progress drawable
 2014-06-04 23:26:57 +00:00
Alan Viverette
b996d809bf Update ripple spec, fix ripple mask, rotate progress drawable 
Change-Id: I4fc155bf2f12d9f324c354dee81479f9cddafac4
 2014-06-04 14:35:42 -07:00
Raph Levien
f8423bae17 am 8fad12dc: Merge "Fix incorrect getStringBounds (Minikin)" into lmp-preview-dev 
* commit '8fad12dc66f47af2fd394f44858802d10cf110f1':
  Fix incorrect getStringBounds (Minikin)
 2014-06-04 21:32:07 +00:00
Raph Levien
c5dc037008 am aef648f4: Merge "Better Minikin integration" into lmp-preview-dev 
* commit 'aef648f405a6f2ed2e523e69cd6f1da884f4b9dd':
  Better Minikin integration
 2014-06-04 18:44:32 +00:00
Alan Viverette
3b1e08fc9f am 62ea9554: Merge "Temporary drawable for Quantum progress indicator" into lmp-preview-dev 
* commit '62ea9554753820df25343e52e0dcab090e5755b5':
  Temporary drawable for Quantum progress indicator
 2014-06-04 18:44:09 +00:00
Alan Viverette
8a3e0a5c0b am 15fabac3: Merge "Fix build, fix Drawable loop" into lmp-preview-dev 
* commit '15fabac37d6c1ce575c66338b4a51b2f8d8afb96':
  Fix build, fix Drawable loop
 2014-06-04 18:43:23 +00:00
Alan Viverette
22b893fde1 Merge commit '096d52fb' into manualmerge 
Conflicts:
	api/current.txt

Change-Id: Iaf1f9172a73e74885475c30ffefcb7d0e32a5883
 2014-06-04 11:42:06 -07:00
Alan Viverette
5398aec700 am a929b2d4: Merge "Set starting value on ripple exit animation" into lmp-preview-dev 
* commit 'a929b2d49386cfb3cdf4e0eaecca61184fa0c857':
  Set starting value on ripple exit animation
 2014-06-04 18:09:52 +00:00
Alan Viverette
d9ec3dafa0 am b1c7f7f5: Merge "Fix NPE when ripples are canceled due to visibility change" into lmp-preview-dev 
* commit 'b1c7f7f538e8c4947f75406cc6089f6680f59a31':
  Fix NPE when ripples are canceled due to visibility change
 2014-06-04 18:08:22 +00:00
Florin Malita
676f92e9a7 Merge "Canvas JNI cleanup." 2014-06-04 16:04:45 +00:00
Florin Malita
95d49149cc Canvas JNI cleanup. 
As pointed out in a previous patch review, some native Canvas methods do not
receive a native canvas handle and instead have to use GraphicsJNI to query
the object mNativeCanvasWrapper field.

To avoid the extra JNI call, this change adds the missing Java wrapper
methods and ensures that all native calls are passed efficient native
handles.

Also, some native methods are consolidated: save, saveAll -> save,
clipRect* -> clipRect.

Change-Id: I2eae4a633f6a463d9fbae2ca632661acc8b5cfc3
 2014-06-04 11:09:18 -04:00
Leon Scroggins III
a578ab00c4 Merge "Ignore inPurgeable and inInputShareable." 2014-06-04 14:04:18 +00:00
Raph Levien
854363e3d2 Fix incorrect getStringBounds (Minikin) 
This patch wires up getStringBounds to do the layout with Minikin to get
accurate bounds, and with the correct typeface. It fixes bug 15416575
"getStringBounds gives wrong result in Minikin".

Change-Id: I5c020bc372acb1d785a33c3c296239c151bd8c87
 2014-06-03 21:11:06 -07:00
Raph Levien
38bd7b9c4d Merge "Better Minikin integration" into lmp-preview-dev 2014-06-04 00:46:25 +00:00
Raph Levien
f2114d5646 Better Minikin integration 
This patch improves the Minikin integration in a number of ways,
including:

Software rendering does text decorations and handles alignment
correctly. This fixes bug 15139067 "Centered text isn't working".

Paint implements getTextPath. This fixes bug 15143354 "Text rendering in
Maps Navigation wrong typeface?"

Also a bit of refactoring, since there was duplicated code for iterating
font runs that's now a static method in MinikinUtils.

Change-Id: I4cfdb2c0559982376348325a757d95235fab1768
 2014-06-03 17:44:35 -07:00
Alan Viverette
bb938107b7 Merge "Temporary drawable for Quantum progress indicator" into lmp-preview-dev 2014-06-04 00:00:14 +00:00
Alan Viverette
3567140b04 Temporary drawable for Quantum progress indicator 
Also cleans up unused 20dp spinner drawables.

Change-Id: I69aba84eca9f9e8d44a4237d894015caeb3d2308
 2014-06-03 16:02:26 -07:00
Alan Viverette
a48e7b5500 Merge "Fix build, fix Drawable loop" into lmp-preview-dev 2014-06-03 22:49:33 +00:00
Alan Viverette
55a54e17df Merge "Update theme colors, fix EditText state transition" into lmp-preview-dev 2014-06-03 22:49:33 +00:00
Alan Viverette
bd4d1c31f3 Merge "Set starting value on ripple exit animation" into lmp-preview-dev 2014-06-03 22:49:33 +00:00
Alan Viverette
910a0b4d02 Fix build, fix Drawable loop 
Change-Id: I524b7f40c700ebe601fdbe80644a46e90ab2bba0
 2014-06-03 15:48:30 -07:00
Alan Viverette
dcf7b59f84 Update theme colors, fix EditText state transition 
BUG: 11218747
BUG: 15200201
Change-Id: I94368897ea9466ae971b25fc80d6ca43433aadd5
 2014-06-03 14:43:38 -07:00
ztenghui
a8cb975aa7 Merge "Handle the alpha in the group setting and fix the fill issue." 2014-06-03 18:07:31 +00:00
Leon Scroggins III
0aa39dc2dc Ignore inPurgeable and inInputShareable. 
These are discouraged anyway, due to the fact that using them may
result in decoding on the UI thread. Now that they are ignored, the
images will still be decoded; they just will never have their
memory purged, meaning there could be a RAM penalty. This is
acceptable, since apps are encouraged to instead use inBitmap to
manage bitmap memory.

This incidentally fixes BUG:15390468 by converting purgeable index8
(e.g. gif) images to non purgeable.

Change-Id: Ieaf3ab25d28d93fb94bdaea1eb3bd762f163b09a
 2014-06-03 14:05:58 -04:00
ztenghui
2af745b56c Handle the alpha in the group setting and fix the fill issue. 
The fill used to be dafault as "none".
Now it is default to opaque black, which is consistent with svg now.
So it is better to always set the fill value.

bug:15288554

Change-Id: I07ac41c5adc77665e66e52f2c0220139586fb09b
 2014-06-03 10:54:14 -07:00
Alan Viverette
02a078d088 am 25931ade: Merge "Clean up drawable theming APIs" into lmp-preview-dev 
* commit '25931adee5ba954220190f48901bb66c8c9dd462':
  Clean up drawable theming APIs
 2014-06-03 17:16:27 +00:00
Raph Levien
690d45157d am faa91203: Merge "Support fallbacks for custom typefaces (Minikin)" into lmp-preview-dev 
* commit 'faa912037ca4895eb99155a4a53354435ee413c2':
  Support fallbacks for custom typefaces (Minikin)
 2014-06-03 17:15:56 +00:00
Alan Viverette
7a98f74438 Fix NPE when ripples are canceled due to visibility change 
BUG: 15406248
Change-Id: I63ce42fef8e1614372ee4a82e45eb15e8bbe1fe3
 2014-06-03 10:13:22 -07:00
ztenghui
5e9a42588e Merge "Add the tree hierarchy for the group" 2014-06-03 16:03:37 +00:00
Alan Viverette
840ff80962 Set starting value on ripple exit animation 
Change-Id: I2eca91c02ea059591a2ee0c75c5355f0ecd5a4be
 2014-06-02 18:01:38 -07:00
ztenghui
4d24caf1de Add the tree hierarchy for the group 
bug:15288554

Change-Id: I7caedb8466d078a0d9a6148e00d02eded4a4d234
 2014-06-02 17:18:10 -07:00
Alan Viverette
5a4af17e27 Merge "Clean up drawable theming APIs" into lmp-preview-dev 2014-06-02 23:41:59 +00:00
Alan Viverette
6dbe51b50e Clean up drawable theming APIs 
Removes APIs for themed creation of a drawable from a stream, since
that doesn't involve any inflation. Also cleans up tinting methods
left over from previous clean up.

BUG: 15089957
Change-Id: I2af7aa9a6d351ae61b33ee1216c674fae1bffe11
Signed-off-by: Alan Viverette <alanv@google.com>
 2014-06-02 16:39:04 -07:00
Raph Levien
596f0b1a03 Merge "Support fallbacks for custom typefaces (Minikin)" into lmp-preview-dev 2014-06-02 22:54:58 +00:00
Raph Levien
d573794d83 Support fallbacks for custom typefaces (Minikin) 
This patch adds the fallback font list to custom typefaces created from
files and assets, as well as those created by name. This is a fix for
the deskclock half of bug 15139067 "Centered text isn't working".

Change-Id: I0cc60951953dfb73817a98ddfee5713f0387ee90
 2014-06-02 10:56:23 -07:00
Alan Viverette
57f285d3ab am 73d37038: Merge "Fix null paint in GradientDrawable, make default values explicit" into lmp-preview-dev 
* commit '73d370389338b97f801631182bd9a650b42f9a1b':
  Fix null paint in GradientDrawable, make default values explicit
 2014-06-02 17:45:04 +00:00
Alan Viverette
08847c8344 Merge "Fix null paint in GradientDrawable, make default values explicit" into lmp-preview-dev 2014-06-02 17:36:50 +00:00
Florin Malita
9ec2eabe5a Merge "Add a native Canvas wrapper." 2014-06-02 13:37:11 +00:00
Alan Viverette
71b2fbde56 Fix null paint in GradientDrawable, make default values explicit 
BUG: 15237001
Change-Id: I80844919b910163ed986257efb4b6f8fb62eaf6a
 2014-06-01 18:03:09 -07:00
Alan Viverette
52a557fae5 am cc179e25: Merge "Allow ripple bounds to change during enter animation" into lmp-preview-dev 
* commit 'cc179e25ccab51cddd16bd3be064590a4c5bb58b':
  Allow ripple bounds to change during enter animation
 2014-06-02 00:36:59 +00:00
Alan Viverette
dc6046fca3 Allow ripple bounds to change during enter animation 
BUG: 15315168
Change-Id: I7588be96648318473998cfd5deba678224f1db51
 2014-06-01 16:48:31 -07:00
Alan Viverette
6a407b0d48 am 8709eeb9: Merge "Fix padding for GradientDrawable" into lmp-preview-dev 
* commit '8709eeb9ed08a70550b308e4e79cadf884e2e2d3':
  Fix padding for GradientDrawable
 2014-06-01 23:45:51 +00:00
Alan Viverette
c65c7ae635 Merge commit '6682183b' into manualmerge 
Conflicts:
	core/res/res/values/public.xml

Change-Id: Ic91db6ee85dcd8a6b13716b600b04c78ceac4b33
 2014-06-01 16:44:28 -07:00
Alan Viverette
c6c967b68a Merge "Fix padding for GradientDrawable" into lmp-preview-dev 2014-06-01 23:23:51 +00:00
Alan Viverette
982c59a55f Fix padding for GradientDrawable 
BUG: 15197745
Change-Id: Ibd1c20dd8ba8c7ffbf65031be4ca9813304d4d0f
 2014-06-01 16:11:32 -07:00