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

7609 Commits

Author SHA1 Message Date
Adam Lesinski
6f4b566169 Merge "Fix misc-macro-parentheses warnings in aapt and androidfw." 2016-05-19 23:25:09 +00:00
Chih-Hung Hsieh
0a87059452 resolve merge conflicts of 404e2b2 to nyc-dev-plus-aosp 
Change-Id: I3c486e83a3f2b27ee0e6bfe4e3bba3df3af758a5
 2016-05-19 16:22:09 -07:00
Chih-Hung Hsieh
cef190de85 Fix misc-macro-parentheses warnings in hwui and graphic jni. 
Bug: 28705665
Change-Id: I7d1eb38a713fe6cc7f41a3cc3f2f9d0aa0114b2c
 2016-05-19 15:25:50 -07:00
Chih-Hung Hsieh
2bd7a3efc4 Fix misc-macro-parentheses warnings in common_time. 
Bug: 28705665
Change-Id: Ibdab4631f0e692b8a291faecdeb4a6062f906ea5
 2016-05-19 15:21:42 -07:00
Chih-Hung Hsieh
e819d01e3e Fix misc-macro-parentheses warnings in aapt and androidfw. 
Bug: 28705665
Change-Id: Iac353e66718aadad384183cf300330695df25909
 2016-05-19 15:19:22 -07:00
Michael Wright
1831ca8f04 Merge "DO NOT MERGE Rename PointerIcon and Pointer Capture APIs" into nyc-dev 
am: a1e0cebf3a

* commit 'a1e0cebf3a18ac097d370e21d698e079f974bfff':
  DO NOT MERGE Rename PointerIcon and Pointer Capture APIs

Change-Id: I20532a3148a99d4ea91ba7dc050f8669d5f19400
 2016-05-19 15:12:30 +00:00
TreeHugger Robot
a1e0cebf3a Merge "DO NOT MERGE Rename PointerIcon and Pointer Capture APIs" into nyc-dev 2016-05-19 15:03:36 +00:00
Michael Wright
778e3b91ac DO NOT MERGE Remove Pointer Capture API 
The underlying implementation needs to be completely rethought. If a
process crashed while you were in pointer capture mode, you were
pretty much stuck in it. If the mouse happened to move outside of
your bounds right before you called the API, you'd never actually get
an event (whatever it was hovering over would). There's no easy way
for the system to tell you when you enter or exit this mode because
it doesn't actually track who the current request is from.

These are all solvable, but not in the N time frame. Maybe next time.

Bug: 26830970
Change-Id: I03efd63c499b86dc278491ca3284566c1965581f
 2016-05-17 18:02:37 +01:00
Michael Wright
f9d9ce7705 DO NOT MERGE Rename PointerIcon and Pointer Capture APIs 
This is a response to API council feedback.

Bug: 26830970
Change-Id: Ia2d284b5c1ab8365bedfdc37d129be4b8146036b
 2016-05-17 18:02:32 +01:00
Chris Craik
bd2edfca03 Merge "Fix hw layer overdraw/update visualization" into nyc-dev 
am: 189e3e5ec5

* commit '189e3e5ec5b698f1062fb98692fa75d3750148e0':
  Fix hw layer overdraw/update visualization

Change-Id: Ic4c49b25e0d1709d34974adb828c3ab4644415e5
 2016-05-17 00:08:14 +00:00
TreeHugger Robot
189e3e5ec5 Merge "Fix hw layer overdraw/update visualization" into nyc-dev 2016-05-16 23:58:28 +00:00
Chris Craik
3741328947 Fix hw layer overdraw/update visualization 
Fixes: 28748255

Change-Id: I83b531cdf5e4407fd17edd72d96e6189924926fa
 2016-05-16 13:54:02 -07:00
Chris Craik
0cf377c6ae Merge "Fix Skia filter behavior test" into nyc-dev 
am: 0c5bd7dffe

* commit '0c5bd7dffec8e5a5f21eed79dc827ef809048c2a':
  Fix Skia filter behavior test

Change-Id: I505e0cf42d47afed31dda7dfcae8a890f17f2dff
 2016-05-13 23:17:34 +00:00
Chris Craik
36ce80d530 Fix Skia filter behavior test 
Fixes: 28751534

Change-Id: Ie5e2ee946b21702539fc0cc7358d0f9550e7d095
 2016-05-12 17:55:47 -07:00
sergeyv
db607a6cde Merge "Draw textShadow always first." into nyc-dev 
am: 45d6e79565

* commit '45d6e7956544051c06a228755b7fd7c179bcdbfe':
  Draw textShadow always first.

Change-Id: Ic7b600ef444bf58d37203266f3faede21cd50711
 2016-05-11 21:59:52 +00:00
Sergei Vasilinetc
45d6e79565 Merge "Draw textShadow always first." into nyc-dev 2016-05-11 21:34:19 +00:00
sergeyv
284b765e3c Draw textShadow always first. 
Interleaving text and shadow rendering resulted in issuing draw commands from FontRenderer::renderDropShadow.

bug: 28528923
Change-Id: Ife2677f58180aaf10ec74d7c6efe5c44fe248daa
 2016-05-11 10:30:14 -07:00
Adam Lesinski
63d0964fc0 Merge "Resource shared libraries: fix theme references" into nyc-dev 
am: 47521a6631

* commit '47521a66314555e2450192a77e75ccbeb19acbb0':
  Resource shared libraries: fix theme references

Change-Id: Ie0265ea7652bb29d017eedae16ecff85c665d71f
 2016-05-11 00:11:53 +00:00
Adam Lesinski
8ac51d14b6 Resource shared libraries: fix theme references 
Theme values that would reference other theme values would not work
if they were declared in a shared library.

We now introduce a parallel resource type to TYPE_DYNAMIC_REFERENCE,
TYPE_DYNAMIC_ATTRIBUTE, which allows us to lookup and resolve
theme value references from shared libraries.

Bug:28687378
Change-Id: I4f2364e3e8b567679f90784fcaaea12b6b05e926
 2016-05-10 10:45:52 -07:00
Chris Craik
85bf1a85bd Merge "Add layer tracing tags in new pipeline" into nyc-dev 
am: f8892359b0

* commit 'f8892359b0ae07031160a71cf3f7e3a86604c2b1':
  Add layer tracing tags in new pipeline

Change-Id: Id77f8234013d6bdbfd75b8fbc6a63b724820fd95
 2016-05-05 20:10:42 +00:00
TreeHugger Robot
f8892359b0 Merge "Add layer tracing tags in new pipeline" into nyc-dev 2016-05-05 19:57:08 +00:00
Chris Craik
aff230f6f9 Add layer tracing tags in new pipeline 
bug:28596354

Change-Id: I351cb50c8c9ddfc73be73d28a1af94d2a8f9992e
 2016-05-04 16:27:29 -07:00
Chris Craik
92e7158f81 Merge "Use LUT for computing final shadow alpha" into nyc-dev 
am: b2e36d7939

* commit 'b2e36d7939610de538a6ec95a821b61b365b3073':
  Use LUT for computing final shadow alpha

Change-Id: Ia17e3b93e9ade0633aee5a1e9edd60b92dd1e062
 2016-05-04 01:11:15 +00:00
TreeHugger Robot
b2e36d7939 Merge "Use LUT for computing final shadow alpha" into nyc-dev 2016-05-04 01:03:42 +00:00
Chris Craik
138c21fbec Use LUT for computing final shadow alpha 
bug:27415250

Significantly reduces shadow fragment shader computation.

Change-Id: Ie9b3c712700754b3734d0ae9cda8751c298fc59e
 2016-05-03 14:36:29 -07:00
Chris Craik
f921dfc23d Merge "Add LightingFilter behavior test" into nyc-dev 
am: 7039adafa9

* commit '7039adafa9a99f8eb4f8ccab9a6f9d2208454150':
  Add LightingFilter behavior test

Change-Id: Iab2b353423990cfe78c72e980d76ba7fec6b7f7b
 2016-05-03 21:20:03 +00:00
Chris Craik
7039adafa9 Merge "Add LightingFilter behavior test" into nyc-dev 2016-05-03 21:12:04 +00:00
Doris Liu
031fc2de5c Merge "Count native allocation for VD against Java heap" into nyc-dev 
am: 6543533f29

* commit '6543533f29d869d5cbbc1c403e4e0ed219fcc300':
  Count native allocation for VD against Java heap

Change-Id: I2bc21681d07d759f7fd668ec286f719b7ea6707a
 2016-05-03 16:51:48 +00:00
Doris Liu
6543533f29 Merge "Count native allocation for VD against Java heap" into nyc-dev 2016-05-03 16:41:20 +00:00
John Reck
d023da1fa9 Merge "Remove high-overhead low-signal trace section" into nyc-dev 
am: a2c10caef2

* commit 'a2c10caef20bbdb447844c09a822073fd0c9d62f':
  Remove high-overhead low-signal trace section

Change-Id: I26b96da6906374c7ed86b93d8e0594a2e7066f9d
 2016-05-03 15:05:08 +00:00
John Reck
ded1d3c45b Remove high-overhead low-signal trace section 
Bug: 28519669

This trace tag makes shadows look way more expensive
than they actually are, particularly troublesome
when tracing things with large number of shadows.

Change-Id: Ib6558b1388edd4b006ec15127470cb9ab563f954
 2016-05-02 16:24:28 -07:00
Doris Liu
f8d131cc8d Count native allocation for VD against Java heap 
There are two parts to VD's native allocation:
1) VD's internal data structure (i.e. groups, paths, etc that make
   up of the VD tree). This structure can change, when a VD is used
   to load a different drawable resource.
2) Two bitmap caches, not both of which will necessarily be allocated
   The size of the bitmap cache depends on canvas matrix and drawable
   bounds, and therefore can often change.

We need to count the native allocation from the above against Java heap.

Bug: 26269056
Change-Id: If833aedcf7f3efe00ea73a41ddccb1b48066ffd8
 2016-05-02 15:34:40 -07:00
Chris Craik
20136f3194 Add LightingFilter behavior test 
bug:28519669

Change-Id: I81ca4109bae04387f2eb73374d0f11821745fea1
 2016-05-02 09:43:30 -07:00
John Reck
1fd9f81745 Merge "Support transform\'d GraphicBuffers" into nyc-dev 
am: 6d42b5c6e3

* commit '6d42b5c6e399a10799d2bba3f7113dd198cbcae6':
  Support transform'd GraphicBuffers

Change-Id: I620f9ef9e1e2ce4df6471b37d1ec06b0fcdb2a88
 2016-04-29 14:55:28 +00:00
John Reck
6d42b5c6e3 Merge "Support transform'd GraphicBuffers" into nyc-dev 2016-04-29 14:49:21 +00:00
John Reck
2f69d6d4fd Support transform'd GraphicBuffers 
Bug: 28428955
Change-Id: I23e2fc9b96a67c7cfda42d9d7319e478194a7fa7
 2016-04-28 13:32:27 -07:00
Chih-Hung Hsieh
85e0c89ba5 resolve merge conflicts of 1599b981 to nyc-dev-plus-aosp 
Change-Id: I90807581e10b6a0024515ff634ac8b29eaa5fc9f
 2016-04-28 12:08:15 -07:00
Chih-hung Hsieh
6e35557ad3 Merge "Fix google-explicit-constructor warnings." 2016-04-28 18:47:00 +00:00
Shammi Khattar
7134ce3540 ZipUtils: Fix wrong timestamps when getEntryInfo 
"tm_mon" format should align with "ZipEntry::setModWhen" in aapt.
"tm_isdst" should be initialized, or it will because random value
and cause error in function mktime().

BUG:28021145

(cherry picked from commit bb0eb3f4cb33c077b296a18555a9a1a966ff696b)

Change-Id: Ia39cf63fcd4bb39c24af080562960279106f526c
 2016-04-28 15:07:34 +00:00
Narayan Kamath
e53f65897d Merge "ZipUtils: Fix wrong timestamps when getEntryInfo" am: 3f0355f 
am: b7dd102

* commit 'b7dd1026f3ee076a5620aeb09125719147c99116':
  ZipUtils: Fix wrong timestamps when getEntryInfo

Change-Id: I964fcec6b7b88dae0d2b53cafe40707f814271ca
 2016-04-28 12:26:53 +00:00
Shammi Khattar
1ead474f61 ZipUtils: Fix wrong timestamps when getEntryInfo 
"tm_mon" format should align with "ZipEntry::setModWhen" in aapt.
"tm_isdst" should be initialized, or it will because random value
and cause error in function mktime().

BUG:28021145
Change-Id: I1e8d5c14e5d7b875bf9cd940cb7f4c5b93a1bcd6
 2016-04-28 12:13:16 +00:00
Chris Craik
eb7bb568d2 Merge "Fix oval positioning when drawn with patheffect" into nyc-dev 
am: 8438a72

* commit '8438a7297c16c1ee73f4e67efef18ad9062e15f1':
  Fix oval positioning when drawn with patheffect

Change-Id: If367a59c4faef13e6f43f3c7512abceb14bf7f42
 2016-04-27 21:05:28 +00:00
Chris Craik
8438a7297c Merge "Fix oval positioning when drawn with patheffect" into nyc-dev 2016-04-27 20:52:51 +00:00
Chih-Hung Hsieh
c6baf563ba Fix google-explicit-constructor warnings. 
Bug: 28341362
Change-Id: Ibdd6a210bb7ff228e3624cc319169f77aca3b51e
 2016-04-27 11:38:12 -07:00
John Reck
f97dca612e Merge "API tweaks to PixelCopy and make it public" into nyc-dev 
am: 7f209d3

* commit '7f209d37f17d4df09475137c38b84a3338c84023':
  API tweaks to PixelCopy and make it public

Change-Id: I1aac8afacfd054fe10fc26a73552608c51dfa9f5
 2016-04-27 14:44:38 +00:00
John Reck
7f209d37f1 Merge "API tweaks to PixelCopy and make it public" into nyc-dev 2016-04-27 14:36:53 +00:00
John Reck
e94cbc76d5 API tweaks to PixelCopy and make it public 
Bug: 27708453
Change-Id: I81667ce42f9ca1c1a13e1e61299927900845fc84
 2016-04-26 15:41:43 -07:00
Chris Craik
e98a046d31 Fix oval positioning when drawn with patheffect 
Fixes: 28396277

Change-Id: I9e21696d81d7cd219f3eaa081bf3d9ba988fe051
 2016-04-26 15:38:33 -07:00
sergeyv
55d2936f4c Merge "Stop always set OffsetByFudgeFactor in renderVertexBuffer" into nyc-dev 
am: b7d1657

* commit 'b7d1657016d5f5b384e231979c6dcf18b0334ca4':
  Stop always set OffsetByFudgeFactor in renderVertexBuffer

Change-Id: If537a4039c3490737ad35b3d537098f0328ea391
 2016-04-26 21:44:50 +00:00
Sergei Vasilinetc
b7d1657016 Merge "Stop always set OffsetByFudgeFactor in renderVertexBuffer" into nyc-dev 2016-04-26 21:39:09 +00:00