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

6497 Commits

Author SHA1 Message Date
John Reck
fe2f7e31be Merge "Add some basic DA unit tests" into mnc-dev 2015-05-05 17:12:02 +00:00
John Reck
d0346cc14e Add some basic DA unit tests 
Change-Id: I01e32a8f0db34a27672010cea275de32d7500dd7
 2015-05-05 10:03:22 -07:00
Alan Viverette
261208e002 Merge "Add API for obtaining changing configurations bitmask from Theme" into mnc-dev 2015-05-05 16:50:29 +00:00
Alan Viverette
c1d527926e Add API for obtaining changing configurations bitmask from Theme 
Required to know when to reload the system context's theme in response
to configuration changes, and thus needed to support the DayNight theme.

Bug: 20267825
Change-Id: I7df5e28b7a6d8b611ea030032544cf4800788514
 2015-05-05 09:49:03 -07:00
Prerepa Viswanadham
d1808401ca Merge changes from topic 'mwd-merge-050415' into mnc-dev 
* changes:
  Merge commit 'b6f59f4' into master_merge
  Merge commit 'f6db0ce' into master_merge
  Merge commit '17455a3' into master_merge
  Merge commit 'b4d5b32' into master_merge
  Merge commit 'a1a2fa7' into master_merge
  Merge commit '8dfdb98' into master_merge
  Merge commit 'eba66c3' into master_merge
 2015-05-05 01:06:38 +00:00
John Reck
a15eedd266 Fix setName use-after-free 
Bug: 20764439
Change-Id: I7a0f85bb82629b1302db02015fa493dc09eb31f7
 2015-05-04 09:44:28 -07:00
John Reck
7c103a36f6 Remove Bitmap#getSkBitmap 
Change-Id: Ifb9047b426122d3e5a445eb7a0eb3fce38dedf27
 2015-05-01 14:38:44 -07:00
John Reck
c6e2e8ff47 Move AssetAtlas off of SkBitmap* 
Switched to SkPixelRef*

Change-Id: I4a1d9dc6c55c1ebcce6b0b8c585e69559e523898
 2015-05-01 14:30:21 -07:00
John Reck
78760b4ae4 Merge "A bunch more cleanups" into mnc-dev 2015-05-01 14:42:51 +00:00
John Reck
3731dc220e A bunch more cleanups 
Switch a few places to using android::canvas
instead of SkCanvas as well which eliminated
some JNI

Change-Id: I8f98b56442a06362b82b984cd1bd3a92398d8dbc
 2015-04-30 14:34:55 -07:00
Chris Craik
b86f0bc3a7 am 75c4e3e4: am ed375f26: Merge "Fix rendernode flag logging" into mnc-dev 
* commit '75c4e3e4d58f310174bbc24e6b2fb058773f8f31':
  Fix rendernode flag logging
 2015-04-30 16:39:15 +00:00
Chris Craik
031e69ff81 Fix rendernode flag logging 
Change-Id: I978c54ab26ef6dc3f6caef8604ac77a883b8e913
 2015-04-30 09:12:44 -07:00
Chris Craik
617b480bcd am 775e94cb: am e74ff81e: Merge "Remove concept of layer alpha override" into mnc-dev 
* commit '775e94cbf1536ec18449ae85b3c174633e8b1d31':
  Remove concept of layer alpha override
 2015-04-29 22:40:33 +00:00
Chris Craik
e74ff81e05 Merge "Remove concept of layer alpha override" into mnc-dev 2015-04-29 22:16:11 +00:00
Chris Craik
7a6208e24a am 4549108c: am 81bd735a: Merge "Require minimum 4 bit stencil for layers." into mnc-dev 
* commit '4549108c46ef1103996ae2f98123d033da54bce6':
  Require minimum 4 bit stencil for layers.
 2015-04-29 20:33:53 +00:00
John Reck
6228ea26ef am 108f0a34: am b2cec86a: Merge "Skip frames with no damage" into mnc-dev 
* commit '108f0a341ad2176b25df7757f1dc793289b48cc0':
  Skip frames with no damage
 2015-04-29 20:33:48 +00:00
Chris Craik
81bd735a01 Merge "Require minimum 4 bit stencil for layers." into mnc-dev 2015-04-29 20:17:43 +00:00
John Reck
b2cec86a44 Merge "Skip frames with no damage" into mnc-dev 2015-04-29 20:10:26 +00:00
Chris Craik
e145013153 Require minimum 4 bit stencil for layers. 
bug:19270131
Change-Id: I81367179d268e7c1642259c456c1f3d0018f6c0d
 2015-04-29 13:04:02 -07:00
Narayan Kamath
bb4ed9aa3a am 815d9bb1: Merge "Add a static dependency on libbase." 
* commit '815d9bb178a0488ed1579cd230d447630ad0891b':
  Add a static dependency on libbase.
 2015-04-29 14:38:15 +00:00
Narayan Kamath
9c8ba9666d Add a static dependency on libbase. 
Used by libziparchive.

Change-Id: I120494b620c72b36a725b01f1f274f5dc862a9a3
 2015-04-29 14:07:41 +00:00
Chris Craik
8df5ffa9ae Remove concept of layer alpha override 
bug:19412691
Change-Id: I9e150fe4a1b2c0cf140519a33c02fd4771ef1c50
 2015-04-28 17:47:20 -07:00
John Reck
240ff6246a Skip frames with no damage 
Bug: 20464038
Change-Id: Iae3aa9baf1d03c3aa443a39373e2bbd4a3910fad
 2015-04-28 13:50:00 -07:00
Chris Craik
956f340aac Remove unused flags and dirty rects 
bug:17209071

Also update DisplayList->RenderNode naming in Editor

Change-Id: I1d505640ba7388a0b0042d9c787f859e45a24da5
 2015-04-28 09:40:01 -07:00
Chris Craik
856f0cc3e3 Promote RenderProperties with an alpha to have a RenderLayer 
bug:20254728
Change-Id: I0bd1d440fe46683b291d4c8ab07a630c34b2eadc
 2015-04-27 18:12:07 +00:00
Nick Kralevich
2eb10c0075 am 05ad674a: am 00e165ae: am e8101c04: Merge "fix compiler error under FORTIFY_SOURCE=2" 
* commit '05ad674aa888e3f9217de0e5c3176161dd8e31aa':
  fix compiler error under FORTIFY_SOURCE=2
 2015-04-25 22:05:25 +00:00
Nick Kralevich
9709a1f04c fix compiler error under FORTIFY_SOURCE=2 
frameworks/base/libs/androidfw/ObbFile.cpp:340:5: error: ignoring return value of function declared with warn_unused_result attribute [-Werror,-Wunused-result]
    ftruncate(fd, mFooterStart);
    ^~~~~~~~~ ~~~~~~~~~~~~~~~~
1 error generated.
amake: *** [out/host/linux-x86/obj/STATIC_LIBRARIES/libandroidfw_intermediates/ObbFile.o] Error 1

Change-Id: I7080d64e7a830a10b41c1ebf33c60d32b7c8356e
 2015-04-24 20:27:06 -07:00
John Reck
b5bc454870 Teach LA how to destroy 
Change-Id: I57ab30b6d56370dade6987f442136ea5e5546c9b
 2015-04-23 16:04:50 -07:00
John Reck
1ed723723d Move LinearAlloc to libhuwi 
Change-Id: I1d8c99bdeef22ca569e1743cff6108f478737bc8
 2015-04-23 15:46:28 -07:00
John Reck
c1b33d665c GraphicsJNI Canvas cleanup 
Change-Id: I72e142986a8bc9f464c1951b6b5187919de3462e
 2015-04-22 09:34:34 -07:00
Chris Craik
2099ee8ab5 Merge "Rename native DisplayListRenderer to DisplayListCanvas" 2015-04-21 16:30:08 +00:00
Chris Craik
dee66b6d99 Simplify TaskManager fallback path 
Change-Id: Ie3833449f7fe6aa69b9f71eb8bab1bef0fe434aa
 2015-04-20 14:54:49 -07:00
Chris Craik
db663fe83f Rename native DisplayListRenderer to DisplayListCanvas 
Change-Id: I33e6f8cc85da1e7da7ff7bf18d4ebde64222067a
 2015-04-20 14:20:47 -07:00
John Reck
9d4efdf280 Revert "A bunch more cleanups" 
This reverts commit c294d128d03bc9a9982b273a82516c04583438cc.

Change-Id: Id1ebb236950f7c36c6d86e1dd95566d3a200748d
 2015-04-17 20:47:27 +00:00
John Reck
7809f835ca Revert "Move AssetAtlas off of SkBitmap*" 
This reverts commit 87ffb63d90fb6dd2689fe72dcb24fda9a6156220.

Change-Id: I92adfcee454a0a19020cdd9e96a134be0ee529aa
 2015-04-17 20:46:47 +00:00
John Reck
afbeb2c237 Merge "Revert "Remove Bitmap#getSkBitmap"" 2015-04-17 20:46:22 +00:00
John Reck
1ff961dd6d Revert "Remove Bitmap#getSkBitmap" 
This reverts commit 4bd981ec533a65e8dee053a0a709b484770b0a76.

Change-Id: I5c92cd955c6e70e197dc5cbc5dfeed8369a24a31
 2015-04-17 20:45:15 +00:00
Tom Hudson
9543c0be95 Merge "Fix offset of composeLayerRegion" 2015-04-17 12:02:48 +00:00
Tom Hudson
040b6d8baf Fix offset of composeLayerRegion 
composeLayerRect() pays attention to the offset of the layer, but
composeLayerRegion() ignores it. This patch makes the behavior of
the region case match the behavior of the rect case.

The difference will only be shown by tests which do not position
the saved layer at the origin.

BUG=20288561
R=ccraik@google.com,djsollen@google.com

Change-Id: Ie22737a8614c508cbffe39aa4c55f7d5434277aa
 2015-04-16 13:39:51 -04:00
John Reck
8560630596 Merge "Remove Bitmap#getSkBitmap" 2015-04-16 14:29:21 +00:00
John Reck
4bd981ec53 Remove Bitmap#getSkBitmap 
Change-Id: Ifb9047b426122d3e5a445eb7a0eb3fce38dedf27
 2015-04-15 15:56:12 -07:00
John Reck
8315167693 Merge "Move AssetAtlas off of SkBitmap*" 2015-04-15 21:23:19 +00:00
John Reck
87ffb63d90 Move AssetAtlas off of SkBitmap* 
Switched to SkPixelRef*

Change-Id: I4a1d9dc6c55c1ebcce6b0b8c585e69559e523898
 2015-04-15 13:27:05 -07:00
Tom Hudson
20c2b3ef74 Fix positioned text bounds 
drawPosText() bounds weren't taking their offset into account properly
in absolute-positioned cases.

R=djsollen@google.com
BUG=skia:3673

Change-Id: Ic39fd45491231ed3e3949ffbc1f063a4fc12c3f8
 2015-04-15 13:54:32 -04:00
John Reck
f7a61483bc Merge "A bunch more cleanups" 2015-04-15 14:48:19 +00:00
Dan Albert
39606e9f78 am 7b09e7a9: am 44d7989a: am 571c5a26: Merge "Fix UB in ResourceTable::stringToInt." 
* commit '7b09e7a9f3ef804e9cd159023b64eac1ef8b7931':
  Fix UB in ResourceTable::stringToInt.
 2015-04-15 00:07:01 +00:00
Dan Albert
571c5a26f7 Merge "Fix UB in ResourceTable::stringToInt." 2015-04-14 23:25:27 +00:00
John Reck
c294d128d0 A bunch more cleanups 
Switch a few places to using android::canvas
instead of SkCanvas as well which eliminated
some JNI

Change-Id: I8f98b56442a06362b82b984cd1bd3a92398d8dbc
 2015-04-14 15:38:22 -07:00
Tom Hudson
34e79c1e57 Convert from glyph count to byte length 
Canvas drawText* APIs are inconsistent, and this mismatch snuck through
our tests.

BUG=skia:3636
R=djsollen@google.com

Change-Id: Ibaab512c3f19df8445d582633b2748f1ec4d2902
 2015-04-14 11:34:39 -04:00
John Reck
cdd3021936 am 18ae2a02: am 32eafe9b: am a08f6a66: Merge "Fix GL_INVALID_OPERATION in font renderer when font cache is limited." 
* commit '18ae2a020d3c720f8b6125b9f4567e953f04c7b0':
  Fix GL_INVALID_OPERATION in font renderer when font cache is limited.
 2015-04-10 16:06:04 +00:00