Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
257,245 Commits 3 Branches 0 Tags
906bf903b4c2160080c53a6103494de40fa00d81
Commit Graph

7676 Commits

Author SHA1 Message Date
Chris Craik
6d89da7a91 Merge "Add layer tracing tags in new pipeline" into nyc-dev am: f8892359b0 am: 85bf1a85bd 
am: ca4af965e1

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

Change-Id: I22b83a2709182951e09236ce4639c4da994e2676
 2016-05-05 20:20:48 +00: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
b5d88fb974 Merge "Update nullegl to support swapbuffers with damage" 2016-05-04 16:50:53 +00:00
Chris Craik
40205a76ae Merge "Use LUT for computing final shadow alpha" into nyc-dev am: b2e36d7939 am: 92e7158f81 
am: cd10b8870e

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

Change-Id: If999e689416f661107f10c1d5aa0c70bc045c06a
 2016-05-04 01:17:11 +00: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
63cd1b4d11 Update nullegl to support swapbuffers with damage 
Change-Id: I4bc4682c624c02f51235a3c4a6b4a6d5b17a3b6f
 2016-05-03 23:05:23 +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
02453ecae5 Merge "Add LightingFilter behavior test" into nyc-dev am: 7039adafa9 am: 3a86af812a 
am: 2670842b8d

* commit '2670842b8d55c237ec52317fbe3bdd80aa7aeb06':
  Add LightingFilter behavior test

Change-Id: I1aa609663d6e1a96758debf9c3500a043eacd681
 2016-05-03 21:25:07 +00:00
Chris Craik
2670842b8d Merge "Add LightingFilter behavior test" into nyc-dev am: 7039adafa9 
am: 3a86af812a

* commit '3a86af812a217231db210ab1aadcf545a2715ea2':
  Add LightingFilter behavior test

Change-Id: Id2d3a6fbb8eccab22b0d57be41f17a19cf18f5c7
 2016-05-03 21:22:22 +00: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
Chih-hung Hsieh
b494f840e2 Merge "Fix google-explicit-constructor warnings." 2016-05-03 18:48:14 +00:00
Chih-Hung Hsieh
d53e3bed1c Fix google-explicit-constructor warnings. 
Bug: 28341362
Change-Id: I080090d50f1a368a4e7c1a0732297bb6a295e34f
 2016-05-03 10:02:51 -07:00
Doris Liu
494e6b6e5e Merge "Count native allocation for VD against Java heap" into nyc-dev am: 6543533f29 am: 031fc2de5c 
am: 5b41913606

* commit '5b41913606b4a134b2e852b8e1dceb6d90f10513':
  Count native allocation for VD against Java heap

Change-Id: Ib18ac599272de1cd9177d841e3146d3d67379c5d
 2016-05-03 17:01:19 +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
3f0154833a Merge "Remove high-overhead low-signal trace section" into nyc-dev am: a2c10caef2 am: 750600e0d0 
am: 6eac229e9c

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

Change-Id: I439a5b116fdb2db2dd74d408132a81d53ef72db4
 2016-05-03 15:09:31 +00:00
John Reck
6eac229e9c Merge "Remove high-overhead low-signal trace section" into nyc-dev am: a2c10caef2 
am: 750600e0d0

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

Change-Id: I0830a655744f6571564253b2b8849950c6e4d671
 2016-05-03 15:07:22 +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
436c6262dc Merge "Merge "Support transform\'d GraphicBuffers" into nyc-dev am: 6d42b5c6e3 am: 88e7238235" into nyc-mr1-dev-plus-aosp 
am: 36dec9f831

* commit '36dec9f831a516fea3799f99cd3d1e3a95057fd1':
  Support transform'd GraphicBuffers

Change-Id: I6bcd0fec1f19a2255c15c3eeadae120c214e5ced
 2016-04-29 15:05:41 +00:00
John Reck
fa1088497b Merge "Support transform\'d GraphicBuffers" into nyc-dev am: 6d42b5c6e3 
am: 88e7238235

* commit '88e7238235e9edf147f44edf89ebcfc6aa5d93ab':
  Support transform'd GraphicBuffers

Change-Id: I9f4240f4c6bfcbf79d0ab292157a580a8998557f
 2016-04-29 15:00:24 +00: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
c968879eb6 Merge "resolve merge conflicts of 1599b981 to nyc-dev-plus-aosp am: 85e0c89ba5" into nyc-mr1-dev-plus-aosp 
am: 99feacb026

* commit '99feacb0263f8331e9afcbfdbc0a4322de75593c':
  Fix google-explicit-constructor warnings.

Change-Id: Ifb8bda3157f17c400ae403056bbef3b3c3625ea8
 2016-04-28 19:46:13 +00: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
Yuqian Li
c8b49a8348 Merge "Remove SkTLazy" 2016-04-28 14:57:53 +00:00
Narayan Kamath
d7160b83cd Merge "ZipUtils: Fix wrong timestamps when getEntryInfo" am: 3f0355f am: b7dd102 am: e53f658 
am: 5198d4a

* commit '5198d4a9128b203d7ad9a1eb448d1ca12a9aad75':
  ZipUtils: Fix wrong timestamps when getEntryInfo

Change-Id: Iccab4530db98166126115feb1b3328400ae0a9a0
 2016-04-28 12:33:40 +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
The Android Automerger
750ccd5333 Manually merge branch 'nyc-mr1-dev-plus-aosp' to shortcircuit automerger b/28407115 2016-04-27 22:14:50 +00:00
Yuqian Li
fd92ee4b73 Remove SkTLazy 
Change-Id: Ibce5cea66fe67fceb994ff45c9afb527dbaf641b
 2016-04-27 17:10:21 -04: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
The Android Automerger
8bdf39e19c Manually merge branch 'nyc-mr1-dev-plus-aosp' to fix automerger blockage b/28407115 2016-04-27 17:58:24 +00: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
sergeyv
4dd1175cdd Merge "Stop always set OffsetByFudgeFactor in renderVertexBuffer" into nyc-dev am: b7d1657 am: 55d2936 
am: 3f4c05f

* commit '3f4c05feae7f9a3febcd07a82e450d0f8bba16d7':
  Stop always set OffsetByFudgeFactor in renderVertexBuffer

Change-Id: I56c4a84e76ed4e5b24f5366ed778175b66903c11
 2016-04-26 23:30:15 +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