Adam Lesinski
eaf83ef61b
Merge "Optimize ResTable::getLocales() to improve bindApplication performance" into nyc-dev
...
am: b5abb78
* commit 'b5abb78b7c329069d5d5e7fd9c6a6e5e81f79c90':
Optimize ResTable::getLocales() to improve bindApplication performance
Change-Id: I9b2e5d8488f15a400287f8cfacc3531bdb007068
2016-04-13 22:25:45 +00:00
Adam Lesinski
b5abb78b7c
Merge "Optimize ResTable::getLocales() to improve bindApplication performance" into nyc-dev
2016-04-13 21:53:47 +00:00
Adam Lesinski
5520581b5f
Optimize ResTable::getLocales() to improve bindApplication performance
...
Change from linear searching for uniqueness to binary search.
Bug:27198799
Change-Id: Ifa4672929df286c4693ab1f77716f08945941b0c
2016-04-13 13:25:09 -07:00
Doris Liu
61ce25a24b
Merge "Allow leading spaces in path string (to keep behavior consistent)" into nyc-dev
...
am: a184abe
* commit 'a184abe4b0348b7c4633fb2c9922d2ec82cee34a':
Allow leading spaces in path string (to keep behavior consistent)
Change-Id: I9340d31fe79251de3a37f999c0d7228bbd759e23
2016-04-13 17:35:56 +00:00
Doris Liu
d3473ffd95
Merge "rm log spam" into nyc-dev
...
am: 70eff90
* commit '70eff906ad6d944fab92608e2ad11deb3fbb396e':
rm log spam
Change-Id: I6c2a4865ba4146ffdec555346c35b5f77fa147bd
2016-04-13 17:28:33 +00:00
Doris Liu
da6c6ebebc
Merge "Fix translationY not being set correctly for VD during animation" into nyc-dev
...
am: 3513035
* commit '351303531f440b661215cb35394331d11568ac68':
Fix translationY not being set correctly for VD during animation
Change-Id: I340fb647e4475607658f64eb9a6233aeccff8d37
2016-04-13 17:28:31 +00:00
Doris Liu
a184abe4b0
Merge "Allow leading spaces in path string (to keep behavior consistent)" into nyc-dev
2016-04-13 17:26:54 +00:00
Doris Liu
70eff906ad
Merge "rm log spam" into nyc-dev
2016-04-13 17:22:57 +00:00
Doris Liu
351303531f
Merge "Fix translationY not being set correctly for VD during animation" into nyc-dev
2016-04-13 17:22:19 +00:00
Doris Liu
952670d9cf
rm log spam
...
Bug: 27385133
Change-Id: Ia97fbba61da691e2fde91ed1a857e0478046f8c0
2016-04-12 17:43:00 -07:00
Doris Liu
32d7cda0b8
Fix translationY not being set correctly for VD during animation
...
Bug: 28056917
Change-Id: Ic5b7d14ac3dff8cad1c62f08b6d3389f979a2b00
2016-04-12 17:32:21 -07:00
John Reck
aa21d56cfa
Merge "Fix reset() to zero slowFrameCounts" into nyc-dev
...
am: 7239d95
* commit '7239d957e9cd30c28c6d06fff0320258f0ae3a4f':
Fix reset() to zero slowFrameCounts
Change-Id: I8a15edd4b1e672998438d1befc986cfac2b02b4e
2016-04-12 22:22:55 +00:00
Doris Liu
b35da39060
Allow leading spaces in path string (to keep behavior consistent)
...
Bug: 28132454
Change-Id: Iee799c13a85738db3d6940aca0fe917f284fa651
2016-04-12 21:38:07 +00:00
John Reck
8f55d00c2a
Fix reset() to zero slowFrameCounts
...
Change-Id: I9f7f7280bcd28c361e5665de39a4bd7c594ab521
Fixes: 26386641
2016-04-12 13:10:19 -07:00
John Reck
f3c2dee3e1
Merge "Framework-side of SurfaceView#getBitmap" into nyc-dev
...
am: d2eec0e
* commit 'd2eec0efb2e47b23b2a12ab2967e422f0be49094':
Framework-side of SurfaceView#getBitmap
Change-Id: I4da75d89a536c11dbaa9ee1feba8e5838fbb5a41
2016-04-12 14:45:44 +00:00
John Reck
d2eec0efb2
Merge "Framework-side of SurfaceView#getBitmap" into nyc-dev
2016-04-12 14:36:11 +00:00
sergeyv
55134c89fe
Merge "Stop comparing Descriptions with memcmp" into nyc-dev
...
am: e414371
* commit 'e41437167b9730d2d3550b1cbb5e2813a101b5f0':
Stop comparing Descriptions with memcmp
Change-Id: Ib8bbf379bed2f48d81957d759804168a20b13455
2016-04-11 23:09:37 +00:00
John Reck
10dd0585c1
Framework-side of SurfaceView#getBitmap
...
Bug: 27708453
Change-Id: Ie6fd7eca522d3e6549d8af587c975fd7e6053649
2016-04-11 16:00:22 -07:00
Sergei Vasilinetc
e41437167b
Merge "Stop comparing Descriptions with memcmp" into nyc-dev
2016-04-11 22:58:57 +00:00
Chris Craik
7e5a2d86cf
Merge "Apply clip at reorder barriers to shadows" into nyc-dev
...
am: b38cb04
* commit 'b38cb04952202c330b29237aaeeda51165298a57':
Apply clip at reorder barriers to shadows
Change-Id: I33bad16dda8a2618d14e9b345069758f081ed4eb
2016-04-11 21:25:17 +00:00
Chris Craik
b38cb04952
Merge "Apply clip at reorder barriers to shadows" into nyc-dev
2016-04-11 21:17:39 +00:00
John Reck
26d6685d1e
Merge "Revert "Make stopped state a first-class thing"" into nyc-dev
...
am: 825fa4d
* commit '825fa4d5ae7b2907ee1769d09e6333306de2a92e':
Revert "Make stopped state a first-class thing"
Change-Id: I2f2a6281d0e0ba9587b00cdb6f1cb32ac632ee41
2016-04-11 21:05:20 +00:00
Seigo Nonaka
fda187f040
Merge "Follow the constructor signature change in Minikin." into nyc-dev
...
am: f9104e3
* commit 'f9104e33e496aeb5581ba9b89f1564d0cbec71fd':
Follow the constructor signature change in Minikin.
Change-Id: I5d0e3eb8140b28d1ec1313937492713c40816596
2016-04-11 20:58:04 +00:00
John Reck
825fa4d5ae
Merge "Revert "Make stopped state a first-class thing"" into nyc-dev
2016-04-11 20:54:36 +00:00
John Reck
eab3f2658a
Revert "Make stopped state a first-class thing"
...
This reverts commit 945961f78a .
Change-Id: Iebc1d49fac33380233f8785fc39bec6c30a5e714
2016-04-11 20:49:28 +00:00
sergeyv
7224e2b624
Stop comparing Descriptions with memcmp
...
bug:27894959
Change-Id: I379c11381c08f6f77577a914638b32415768f26e
2016-04-11 13:09:00 -07:00
Chris Craik
d645640180
Apply clip at reorder barriers to shadows
...
Fixes: 28004930
Change-Id: I208b78430c770a3135afd68c53cf8ff3fba50c52
2016-04-11 12:32:41 -07:00
Seigo Nonaka
b93872ad64
Follow the constructor signature change in Minikin.
...
Bug: 28105730
Change-Id: I933521ba08e89c0538b5aa9efa5dcc5e2a17b905
2016-04-11 18:12:27 +09:00
Doris Liu
9d5c93f407
resolve merge conflicts of 0e89f98 to nyc-dev-plus-aosp
...
Change-Id: Ifa9dea0e4a0337c24dad899a10b5def46679742c
2016-04-08 13:31:42 -07:00
Doris Liu
0e89f98044
Merge "Improve error logging for parsing failures" into nyc-dev
2016-04-08 18:02:51 +00:00
Doris Liu
0a1a5167be
Improve error logging for parsing failures
...
Bug: 27043594
Change-Id: I901b65f734c49444a78e0714e007e15e2340ab9d
2016-04-08 18:01:54 +00:00
Raph Levien
eadd2b8aba
Merge "Avoid copying of font table data, provide raw font bytes" into nyc-dev
...
am: c147dbb
* commit 'c147dbbca4ea1870bcf88c5889e6a83865ceed54':
Avoid copying of font table data, provide raw font bytes
Change-Id: Icf7e1aa1bc8ae759aaff94a3eeea7261a5456b47
2016-04-08 16:48:25 +00:00
Raph Levien
c147dbbca4
Merge "Avoid copying of font table data, provide raw font bytes" into nyc-dev
2016-04-08 16:32:14 +00:00
Raph Levien
296bf8c55a
Avoid copying of font table data, provide raw font bytes
...
Minikin is changing its approach to table access to use HarfBuzz to
access the tables, based on raw font data, rather than calling the
MinikinFont::GetTable() virtual method. This patch provides raw access
to the font data to make this work.
There's a bit of plumbing to make sure fonts get a pointer to the raw
data as well.
Bug: 27860101
Change-Id: I638e18cf363644bf22fbc9fb9b3358a9e731087f
2016-04-08 08:29:32 -07:00
John Reck
620a86e464
Merge "Make stopped state a first-class thing" into nyc-dev
...
am: c724dcf
* commit 'c724dcf23c5e2ebd22c042a8a6f2424b7e9d5029':
Make stopped state a first-class thing
Change-Id: Idfa3cc5d8fa5b07c742c2700b38441ff7d692f42
2016-04-08 15:17:03 +00:00
John Reck
944e6b51b1
Merge "Fix a derp" into nyc-dev
...
am: 4a73544
* commit '4a735441e82207e18036be09d0d02c855930938f':
Fix a derp
Change-Id: I1975a6ed121ad0ddfc12784c45092c8af3823bdf
2016-04-08 15:17:01 +00:00
John Reck
c724dcf23c
Merge "Make stopped state a first-class thing" into nyc-dev
2016-04-08 15:09:42 +00:00
John Reck
4a735441e8
Merge "Fix a derp" into nyc-dev
2016-04-08 15:09:26 +00:00
John Reck
a41f244515
Fix a derp
...
Fixes: 28074465
I knew I added that flag for a reason...
Change-Id: I6e28237dcd50191769a828bf2646c3a00c14387c
2016-04-07 16:36:57 -07:00
Chris Craik
6e5c652347
Merge "Support replace op in new pipeline" into nyc-dev
...
am: d306065
* commit 'd30606575783acd8689cfac604cba51e537b6b77':
Support replace op in new pipeline
Change-Id: Iab37f13a5fca72b2e581a897f7e03c17f9ce0b84
2016-04-07 23:30:19 +00:00
Chris Craik
d306065757
Merge "Support replace op in new pipeline" into nyc-dev
2016-04-07 23:21:02 +00:00
John Reck
c01a9b6a9b
Merge "Fix some edge cases" into nyc-dev
...
am: 4a62eff
* commit '4a62effbfe8ad9a0eb7049c2f52a57d39bb64e29':
Fix some edge cases
Change-Id: I35a99c3164bf3bf91f609ce8bec01d15ca8b7c0d
2016-04-07 23:12:14 +00:00
John Reck
945961f78a
Make stopped state a first-class thing
...
Bug: 27286867
WindowManager has committed to stopped state
controlling the lifecycle of the Surface, so
make that a first-class thing in HWUI as well.
This makes it more resistent to things like
a rogue updateSurface() happening while mStopped=true,
leading to bad things down the line. Instead let
the surface be changed/updated as often as desired,
and just block any attempt to draw on that surface.
Also removes some unnecessary makeCurrent()s, as
EglManager ensures that we *always* have a valid
GL context now (using a pbuffer surface if there is
no window surface set)
Change-Id: Iead78ddebc7997e8fdb0c9534836352f5e54b9bd
2016-04-07 16:02:33 -07:00
Chris Craik
04d46eb69f
Support replace op in new pipeline
...
bug:26562461
Change-Id: Ie48d2da30f5e9d9abe88a5cd973dfb26e38abf63
2016-04-07 15:02:39 -07:00
John Reck
51f2d606dc
Fix some edge cases
...
Bug: 27709981
This desperately needs a refactor, but to keep
the current (really needed & nice) behavior of
dispatching after sync finishes would be difficult
to handle cleanly without lots of ripping so... #yolo
Change-Id: I831a06c6ae7412a062720d68ecbe3085190f0258
2016-04-07 14:10:43 -07:00
Chris Craik
4d5c3769c0
Fix OffscreenBuffer leak
...
am: 74af6e2
* commit '74af6e282f8a8f75928a071e8200039517cf5c12':
Fix OffscreenBuffer leak
Change-Id: I24c16488d73588efe15e64ab711f8d3bc7a580b7
2016-04-05 20:50:03 +00:00
Chris Craik
74af6e282f
Fix OffscreenBuffer leak
...
Fixes: 27941148
Make OffscreenBuffer lifecycle an explicit (and tested) contract between
FrameBuilder and BakedOpRenderer, entirely separate from dispatch. This
makes it safe to reject any rendering work via overdraw content
rejection (before it gets to a BakedOpDispatcher).
Adds a couple tests around OffscreenBuffer leaks, and switches
OffscreenBuffer tests to RENDERTHREAD_TEST macro, as appropriate.
Change-Id: Id114b835d042708ae921028fb4b17e5fa485fe64
2016-04-05 20:42:37 +00:00
sergeyv
f7f984425d
Merge "Fix opacity setup in FrameBuilder" into nyc-dev
...
am: 5169c62
* commit '5169c62c6c0acbf9d5a36a90233e7ba2e9532e58':
Fix opacity setup in FrameBuilder
Change-Id: Ic887d694e745d365b8e0cfe335814e0ecd8e682f
2016-04-05 01:59:30 +00:00
Sergei Vasilinetc
5169c62c6c
Merge "Fix opacity setup in FrameBuilder" into nyc-dev
2016-04-05 01:54:47 +00:00
sergeyv
a82ffc549b
Fix opacity setup in FrameBuilder
...
bug:27941278
Change-Id: Ib0599f669406d2fb477d51d5ba701a89f83f9bd9
2016-04-04 17:25:35 -07:00