Commit Graph

8277 Commits

Author SHA1 Message Date
Chong Zhang
43faf5c5cb Merge "Debug traces to facilitate screen timeout debugging" into nyc-dev am: 6afe594461 am: 242eadabea
am: c4c65f211e

* commit 'c4c65f211e3c40ee00dd0be796fe0d0a4080378b':
  Debug traces to facilitate screen timeout debugging

Change-Id: Id698967d9d1d11c2d086584b60fa1fe3766df091
2016-05-05 00:34:15 +00:00
Chris Craik
0af20e8385 Merge "Fix View leakage from mPreSortedChildren" into nyc-dev am: 4e34cd0537 am: 2f66d0a849
am: 115f86846b

* commit '115f86846b74ea45e15f9bc60b9edfee9b13f3c2':
  Fix View leakage from mPreSortedChildren

Change-Id: I77778638af8ae77bfe423c8e617932df606b4268
2016-05-04 22:55:37 +00:00
Chong Zhang
242eadabea Merge "Debug traces to facilitate screen timeout debugging" into nyc-dev
am: 6afe594461

* commit '6afe594461930e83cbf5ecf181bf43fcba0060dd':
  Debug traces to facilitate screen timeout debugging

Change-Id: I89dad5e66db460af83deac679f2f81bef34d0e69
2016-05-04 22:52:55 +00:00
Chong Zhang
6afe594461 Merge "Debug traces to facilitate screen timeout debugging" into nyc-dev 2016-05-04 22:50:11 +00:00
Chet Haase
426e872d35 Merge "Force second measure pass when there is a configuration change" into nyc-dev am: c381c4e8e7 am: 26a4627102
am: c96a245e1a

* commit 'c96a245e1a771a2a9b020c14fee90aa60b832318':
  Force second measure pass when there is a configuration change

Change-Id: Ic81ffd3b7ea102f8e4e72a3a6c5d779dfb1b009e
2016-05-04 22:31:34 +00:00
Chris Craik
2f66d0a849 Merge "Fix View leakage from mPreSortedChildren" into nyc-dev
am: 4e34cd0537

* commit '4e34cd05379d1e96a5ca8081b3e3fa3b1a1cc534':
  Fix View leakage from mPreSortedChildren

Change-Id: Idd17fa7d0cb1bfbca1725525d85e4068a234c8b6
2016-05-04 22:30:30 +00:00
TreeHugger Robot
4e34cd0537 Merge "Fix View leakage from mPreSortedChildren" into nyc-dev 2016-05-04 22:23:26 +00:00
Chong Zhang
4ffc318012 Debug traces to facilitate screen timeout debugging
bug: 27522448
Change-Id: I4d51be316e4aedecffb7001126849d7c6136d517
2016-05-04 15:09:01 -07:00
Chet Haase
c96a245e1a Merge "Force second measure pass when there is a configuration change" into nyc-dev am: c381c4e8e7
am: 26a4627102

* commit '26a4627102e466e3e7831e84e459d95f0ff7778a':
  Force second measure pass when there is a configuration change

Change-Id: Icbc841e1641bbe2fabac589a3c60fc3404cda0c2
2016-05-04 21:55:13 +00:00
Chet Haase
512c406be9 Merge "Force second measure pass when there is a configuration change" into nyc-dev
am: c381c4e8e7

* commit 'c381c4e8e7b7dfc2aed0a662bf56e3d6e512df5d':
  Force second measure pass when there is a configuration change

Change-Id: I2586fe3605461b2e6e4d9678afd6436078dab21c
2016-05-04 21:51:38 +00:00
Chris Craik
fc56377178 Fix View leakage from mPreSortedChildren
bug:28553824

Change-Id: I62bfa3dcb121792dff7d00be1f4b018a99c96e1d
2016-05-04 13:40:07 -07:00
Chet Haase
d86fb2ce37 Force second measure pass when there is a configuration change
It's possible for a call to updateConfiguration() to happen in the middle
of performTraversals(), after the measure phase has happened, but before
the layout phase. During the configuration call, it's possible for views to
have requestLayout() called on them. This can result in the request flag
not getting cleared, because views that have had layout requested, but which
have not yet been measured, may not be told to layout.

The correct flow should be that any code path causing requestLayout() (which
could be anything that calls out to user/app code) should happen before the
measure phase (or cause a second measure to occur). For now, causing the second
measure to occur is a low-risk simple change that fixes the immediate problem.

Issue #28152259  Calling requestLayout from inside View.onConfigurationChanged can cause problems

Change-Id: I3b532eeacc3784d8d21193d01ddd7fa15ac0684e
2016-05-04 18:14:46 +00:00
Abodunrinwa Toki
b970e9bf01 Merge "Implement alternative ViewGroup.getChildVisibleRect." into nyc-dev am: f62dd564ed am: a04fe4fc92
am: 6609b23ae0

* commit '6609b23ae0ce114cd44c4cef1e3c4ebd98bc1623':
  Implement alternative ViewGroup.getChildVisibleRect.

Change-Id: I08542776d74a1804e8787458f5f1688fafc34f18
2016-05-03 20:25:16 +00:00
Abodunrinwa Toki
6609b23ae0 Merge "Implement alternative ViewGroup.getChildVisibleRect." into nyc-dev am: f62dd564ed
am: a04fe4fc92

* commit 'a04fe4fc92b8a60587104f082b590cf787d04b3b':
  Implement alternative ViewGroup.getChildVisibleRect.

Change-Id: I37c2543c0c53031a779c3cb93668a4e824eb98b6
2016-05-03 20:22:27 +00:00
Abodunrinwa Toki
98f91884ff Merge "Implement alternative ViewGroup.getChildVisibleRect." into nyc-dev
am: f62dd564ed

* commit 'f62dd564edfa7f9e02e17e7a2e3107dbc7b4abb0':
  Implement alternative ViewGroup.getChildVisibleRect.

Change-Id: I8adae611f525a14dadc2fc0e2c15cc961b61d0cf
2016-05-03 20:20:05 +00:00
Abodunrinwa Toki
4e7a1208ea Implement alternative ViewGroup.getChildVisibleRect.
This CL allows getChildVisibleRect to optionally always call the
view's parent. The previous version attempted to optimize the call
by not calling further up the view heirarchy when the rect isn't
visible in the current view.

The call is hidden and the previous behaviour is preserved to limit
the bits of code that this change affects.

Bug: 28514727
Change-Id: I49550ed4082bcbdcfe4643b962b50f3308092525
2016-05-03 19:41:15 +01:00
Jaewan Kim
45768d4c3f Merge "Fix crash when device doesn\'t support picture-in-picture" into nyc-dev am: bfa0f48407 am: 550533dc29
am: ce85489d4c

* commit 'ce85489d4cf8d879cd91b539bc00806f3de6bbfb':
  Fix crash when device doesn't support picture-in-picture

Change-Id: I3ea6bd8c649db86f535026888efdf61a91b012d5
2016-05-02 22:51:27 +00:00
Jaewan Kim
ce85489d4c Merge "Fix crash when device doesn\'t support picture-in-picture" into nyc-dev am: bfa0f48407
am: 550533dc29

* commit '550533dc298afbcfbb5f7ba5b3421145ab34522b':
  Fix crash when device doesn't support picture-in-picture

Change-Id: I8f16400db11282e28e4e8935896a90eeed49e2f2
2016-05-02 22:41:18 +00:00
Jaewan Kim
1e28182362 Merge "Fix crash when device doesn\'t support picture-in-picture" into nyc-dev
am: bfa0f48407

* commit 'bfa0f48407e70099c2558983b19163c1d92d063b':
  Fix crash when device doesn't support picture-in-picture

Change-Id: Icbbe69970e5f43387323b5ed810ebc11b1cf77b1
2016-05-02 22:36:31 +00:00
Jaewan Kim
d98dcab679 Fix crash when device doesn't support picture-in-picture
Bug: 28512987
Change-Id: Ic8287d70fed491d7493d443ba7d9633b7d9aaea9
2016-05-03 07:13:28 +09:00
Robert Carr
9b564dbd42 Merge "Merge "Fix ViewRoot inset adjustment after initial setup." into nyc-dev am: 3446a6ef71 am: f022f71888" into nyc-mr1-dev-plus-aosp
am: 1107b1d737

* commit '1107b1d737802be229a31b0e63a51bc8b9651372':
  Fix ViewRoot inset adjustment after initial setup.

Change-Id: I1bec398f2b7fafb45fd23297b21c0c3da1de88a6
2016-04-29 20:44:33 +00:00
Robert Carr
1d488eb651 Merge "Fix ViewRoot inset adjustment after initial setup." into nyc-dev am: 3446a6ef71
am: f022f71888

* commit 'f022f718882c3f8ccd8ab02b240ba9b9f7ffadb0':
  Fix ViewRoot inset adjustment after initial setup.

Change-Id: I6d9968c38758112e5ad0679ffde178081c456500
2016-04-29 20:41:44 +00:00
Robert Carr
8175a59c2b Merge "Fix ViewRoot inset adjustment after initial setup." into nyc-dev
am: 3446a6ef71

* commit '3446a6ef71872f07de1ea59ff4aa060dad92eb22':
  Fix ViewRoot inset adjustment after initial setup.

Change-Id: Ia3a33d0d2031f4929cfb898ad0847cd620792bba
2016-04-29 20:39:56 +00:00
TreeHugger Robot
3446a6ef71 Merge "Fix ViewRoot inset adjustment after initial setup." into nyc-dev 2016-04-29 20:37:33 +00:00
Robert Carr
1bccabf3c4 Fix ViewRoot inset adjustment after initial setup.
If the insets change, "mWidth/mHeight" won't change
as it's based on the window frame (not the surface size),
we need to track when the insets change and call
HardwareRenderer.setup with the new values.

Bug: 28257246
Bug: 28368990
Change-Id: Ida304b57c4671d010d1cf7b370674c9453841c97
2016-04-29 11:13:57 -07:00
Michael Wright
98d75a2cb6 Merge "Properly parcel HdrCapabilities." into nyc-dev am: 5bddeaa am: b3324b4
am: e5231fe

* commit 'e5231fed951f0ad24fe58604c56c4177d3d00902':
  Properly parcel HdrCapabilities.

Change-Id: I4b8cd07da559ce0ecef1ac48b6d2f4a58711a859
2016-04-28 15:12:54 +00:00
Michael Wright
b3324b4a2e Merge "Properly parcel HdrCapabilities." into nyc-dev
am: 5bddeaa

* commit '5bddeaa9bce6325c900eeabaa6a1cdfaf83910c6':
  Properly parcel HdrCapabilities.

Change-Id: I768887156c78cca859db6123a2bb184f12295ab0
2016-04-28 15:05:44 +00:00
TreeHugger Robot
5bddeaa9bc Merge "Properly parcel HdrCapabilities." into nyc-dev 2016-04-28 15:01:31 +00:00
Phil Weaver
e58aa16282 Merge "Fix several accessibility magnification issues." into nyc-dev am: 1f70f0b am: 44e272b
am: 5a4be4d

* commit '5a4be4d8a26e844ade76f836163de6c4047ca263':
  Fix several accessibility magnification issues.

Change-Id: I362ed6a9717465668120e75d63ca3e07ab7c7c4d
2016-04-28 00:53:24 +00:00
Phil Weaver
44e272b469 Merge "Fix several accessibility magnification issues." into nyc-dev
am: 1f70f0b

* commit '1f70f0b7d60ad0b98fe6597162769bce8b85e3ed':
  Fix several accessibility magnification issues.

Change-Id: Ib174d8ff353fd990c5b3119b0728ec942784fbdc
2016-04-27 23:31:54 +00:00
Michael Wright
b082890149 Properly parcel HdrCapabilities.
Since the field might be null, we can't just read and write the
object directly. Use Parcel's convenience methods to do so safely
instead.

Bug: 28427070
Change-Id: I6460c9cb43dc6da97d5fd9edeaa78bdaaf105446
2016-04-27 19:28:29 -04:00
Phil Weaver
1f70f0b7d6 Merge "Fix several accessibility magnification issues." into nyc-dev 2016-04-27 22:50:37 +00:00
Phil Weaver
70439244ba Fix several accessibility magnification issues.
Clarifying region used for magnification as "magnificationRegion",
both in the public API and in the code. There's been significant
confusion about what "magnfifiedRegion" means. Removing
"availableRegion" from everywhere except where it's required, as
that region was identical to magnified/magnification region.

Trying to shut down magnification was a complex situation where
animations in progress and new magnification requests were tricky to
handle correctly. It was not possible to guarantee that the
magnification callbacks were unregistered consistently. There were
at least two situations that led to phone restarts:
1. If a triple tap was detected between unregistering the callbacks
and shutting down the input filter. In this case the magnification
request would go through.
2. If an animation had just started when magnification was turned
off, so the current magnification was 1.0 but the animator was
about to change it. In this case the callbacks would be unregistered,
and then the animator would start changing the magnification.

This change makes registering and unregistering magnification atomic.
It also makes MagnificationController stick around indefinitely once it
is created, registering and unregistering as needed to support
magnification gestures and services that control magnification. Services
that merely query the status of magnification no longer register for
callbacks.

One part of shutting down is turning off the animation and guaranteeing
that it won't try to make further changes. Adding a flag to
SpecAnimationBridge and a lock in that class so we can guarantee that
nothing happens when we aren't registered for magnification callbacks.

Also reconfiguring all accessibility options when a service stops to
make sure that only the features required by the current configuration
are enabled.

Bug: 27497138
Bug: 27821103
Change-Id: If697cbd34b117d82c8eee1ba7d0254089ee4241d
2016-04-27 13:57:43 -07:00
Bo Liu
b1229186d1 Merge "Revert "Expose setDrawGLFunctionDetachedCallback to webview"" into nyc-dev am: 08ca2e3 am: 55f3776
am: 7d3c51c

* commit '7d3c51cfdd6e54b157ad62a3dd85856dad758513':
  Revert "Expose setDrawGLFunctionDetachedCallback to webview"

Change-Id: I258f3ad08c23dac94f3679813188ec715b9635ac
2016-04-27 18:19:44 +00:00
Bo Liu
7d3c51cfdd Merge "Revert "Expose setDrawGLFunctionDetachedCallback to webview"" into nyc-dev am: 08ca2e3
am: 55f3776

* commit '55f3776d82c2ebc9831868bcc068d53ceb38565f':
  Revert "Expose setDrawGLFunctionDetachedCallback to webview"

Change-Id: I6aa64553e7dfec0757bcd5b6d3299289185c5c6c
2016-04-27 18:11:30 +00:00
Bo Liu
7dc710d564 Merge "Revert "Expose setDrawGLFunctionDetachedCallback to webview"" into nyc-dev
am: 08ca2e3

* commit '08ca2e3a7593ced4967c56709a1fe675408d42dc':
  Revert "Expose setDrawGLFunctionDetachedCallback to webview"

Change-Id: I4bba52ddc4b89273eceb2627facbb9091eb341c0
2016-04-27 18:06:25 +00:00
Bo Liu
08ca2e3a75 Merge "Revert "Expose setDrawGLFunctionDetachedCallback to webview"" into nyc-dev 2016-04-27 17:58:34 +00: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
Hangyu Kuang
61734544d1 Merge changes from topic \'atv-hdr\' into nyc-dev
am: 39bb2c2

* commit '39bb2c29b427b0cf2396a8691176584094ae805c':
  Unhide getHdrCapabilities and HdrCapabilities.
  Plumb HDR capabilities to Display
  Revert "Revert "Hook up HDR capabilities from native SurfaceControl""

Change-Id: I53f0414c0a408edeae8ffe7161a035e45b8670b7
2016-04-27 16:46:30 +00:00
Hangyu Kuang
39bb2c29b4 Merge changes from topic 'atv-hdr' into nyc-dev
* changes:
  Unhide getHdrCapabilities and HdrCapabilities.
  Plumb HDR capabilities to Display
  Revert "Revert "Hook up HDR capabilities from native SurfaceControl""
2016-04-27 16:38:21 +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
Robert Carr
b07221b248 Merge "Fix bugs with takeSurface and preserveWindows." into nyc-dev am: 69a6fe3 am: 63b38d8
am: 2fb8889

* commit '2fb8889854b26fde160971d194abbf497b61dda8':
  Fix bugs with takeSurface and preserveWindows.

Change-Id: I0b41f0d3a2baee6c2add1ac6bfffac2135c63bca
2016-04-27 02:16:31 +00:00
Oren Blasberg
f6a02c4cda Merge "Accommodate NaN in new context menu methods." into nyc-dev am: a86d1e0 am: 1fab8d9
am: 306ceb8

* commit '306ceb84b4c8833eaa46093fbba7638378eee456':
  Accommodate NaN in new context menu methods.

Change-Id: Iddd48717534ab7ce5ef93aab0016190a50c42e9b
2016-04-27 01:23:54 +00:00
Rob Carr
2fb8889854 Merge "Fix bugs with takeSurface and preserveWindows." into nyc-dev am: 69a6fe3
am: 63b38d8

* commit '63b38d84b9acfb3719d188ec6499984028a2f02c':
  Fix bugs with takeSurface and preserveWindows.

Change-Id: Idb6d1bd25efce4b8bab7f4ae11d3934164eca1b3
2016-04-27 01:00:38 +00:00
Robert Carr
3c0de7768f Merge "Fix bugs with takeSurface and preserveWindows." into nyc-dev
am: 69a6fe3

* commit '69a6fe321c7b3934ee8849d2038a85443011050c':
  Fix bugs with takeSurface and preserveWindows.

Change-Id: I6f7b52b3d880eede508c12f8d2ffa1c29f17bbd5
2016-04-27 00:54:54 +00:00
Rob Carr
69a6fe321c Merge "Fix bugs with takeSurface and preserveWindows." into nyc-dev 2016-04-27 00:47:59 +00:00
sergeyv
aa5122b675 Merge "DisplayListCanvas: throw exception at attempt to draw bitmap with size > 100MB" into nyc-dev am: c015719 am: 47591b0
am: 9f12dd4

* commit '9f12dd434854d0bfc70dd95b9ef630a60adfebf9':
  DisplayListCanvas: throw exception at attempt to draw bitmap with size > 100MB

Change-Id: Ie022389901d40c4e814706c9eab8d8249b85e54c
2016-04-26 23:33:02 +00:00
Oren Blasberg
306ceb84b4 Merge "Accommodate NaN in new context menu methods." into nyc-dev am: a86d1e0
am: 1fab8d9

* commit '1fab8d995e74de2128b45d9cae294c8d5ccf2fc6':
  Accommodate NaN in new context menu methods.

Change-Id: Ifaf625d13b5dc57cf69f10ef1af99aef4acfecb6
2016-04-26 23:16:14 +00:00
Hangyu Kuang
da802f5100 Unhide getHdrCapabilities and HdrCapabilities.
Bug:25684127
Change-Id: Ibeefc566213da5b76deba13eb2224916a4fefd13
2016-04-26 23:04:56 +00:00