Commit Graph

8177 Commits

Author SHA1 Message Date
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
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
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
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
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
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
Hangyu Kuang
da802f5100 Unhide getHdrCapabilities and HdrCapabilities.
Bug:25684127
Change-Id: Ibeefc566213da5b76deba13eb2224916a4fefd13
2016-04-26 23:04:56 +00:00
Michael Wright
9ff94c0251 Plumb HDR capabilities to Display
Bug: 25684127
Change-Id: I0a4fcdc59aa1a7b295c8df03699466685300e735
2016-04-26 23:04:30 +00:00
Oren Blasberg
27e0f35620 Merge "Accommodate NaN in new context menu methods." into nyc-dev
am: a86d1e0

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

Change-Id: I40a1d6b55b7f9cb422d35c1f0881efccd36cc290
2016-04-26 22:53:40 +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
Oren Blasberg
a86d1e0b59 Merge "Accommodate NaN in new context menu methods." into nyc-dev 2016-04-26 22:41:01 +00:00
Hangyu Kuang
54ac219184 Revert "Revert "Hook up HDR capabilities from native SurfaceControl""
This reverts commit 2c38f45f27.


Bug:25684127
2016-04-26 22:24:23 +00:00
sergeyv
47591b04dc Merge "DisplayListCanvas: throw exception at attempt to draw bitmap with size > 100MB" into nyc-dev
am: c015719

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

Change-Id: I3f5e7bd67b57d074939e1db6ef0651ade46d31bf
2016-04-26 21:44:54 +00:00
Sergei Vasilinetc
c015719954 Merge "DisplayListCanvas: throw exception at attempt to draw bitmap with size > 100MB" into nyc-dev 2016-04-26 21:39:43 +00:00
Robert Carr
b259485087 Fix bugs with takeSurface and preserveWindows.
When reusing a ViewRoot and DecorView as we do with preserveWindows
there are two issues with SurfaceHolders.  First, we update the
SurfaceHolder callbacks when we call ViewRootImpl.setView. In the
case of preserved window relaunch, the DecorView is reused and there is
no call to setView. We need the ActivityThread to notify the ViewRoot
that something has changed. Secondly, we were assuming the only time
a new surface would be created for the purposes of SurfaceHolder
notification was when we previously did not have a valid surface.
Instead we need to check if the native Surface object has changed each time we
get a result from relayout.

Bug: 28331264
Change-Id: If1b4aab9b2ba579fa040e2a3ab4471842476d82f
2016-04-26 14:33:21 -07:00
Jaewan Kim
0f360d80ad Merge "PIP: Send KEYCODE_WINDOW to app first if PIP isn\'t exist" into nyc-dev
am: bdc4700

* commit 'bdc4700155f5ff89e213cb0e9efe49897b888f7d':
  PIP: Send KEYCODE_WINDOW to app first if PIP isn't exist

Change-Id: Ic77538cac9562acf878c7c56f443a691e9d0b45f
2016-04-26 06:08:59 +00:00
Jaewan Kim
f0fd218382 PIP: Send KEYCODE_WINDOW to app first if PIP isn't exist
Bug: 27954955
Change-Id: I517e378d5c1672ac0eb87bdf4375b7d733276e58
2016-04-26 13:06:21 +09:00
Clara Bayarri
dea459c750 Merge "Improve KeyboardShortcutInfo documentation for Modifiers" into nyc-dev
am: f48f390

* commit 'f48f390a60694df6f4b72bd0ac462dd19c5e1191':
  Improve KeyboardShortcutInfo documentation for Modifiers

Change-Id: I36a85346b9b5a8606b75cf670ddbc67ab9831377
2016-04-25 09:39:35 +00:00
Clara Bayarri
f48f390a60 Merge "Improve KeyboardShortcutInfo documentation for Modifiers" into nyc-dev 2016-04-25 09:31:06 +00:00
Chris Banes
bdc696607b Merge "Make AbsSavedState read using given ClassLoader" into nyc-dev
am: b02d51b

* commit 'b02d51b3d31b1a49ddc7c7e7db97b576d6e4f78f':
  Make AbsSavedState read using given ClassLoader

Change-Id: If0e2679ca978a0423ff26e7b0f416d09c50ab70b
2016-04-23 07:09:22 +00:00
Chris Banes
b02d51b3d3 Merge "Make AbsSavedState read using given ClassLoader" into nyc-dev 2016-04-23 07:04:21 +00:00
Bo Liu
d443f36957 Revert "Expose setDrawGLFunctionDetachedCallback to webview"
This reverts commit ee34ef1633.

This API is no longer needed by webview since 51.0.2704.22.
So remove this API. Note that this system API has never shipped
so it's ok to simply remove it.

Original description:
> Expose setDrawGLFunctionDetachedCallback to webview
>
> Add WebViewDelegate.setDrawGLFunctionDetachedCallback system API that's
> used for webview to receive the functor detach callback.
>
> BUG: 27709981
> Change-Id: Ie6b5e445c0090a181f94fcd2ec1ea77095c9cb03

BUG: 27709981
Change-Id: I9920dbedc6a280b4a19a8715832c4d2f64a7a7be
2016-04-22 13:32:23 -07:00
Andres Morales
2e9c311abd Merge "FrameMetricsListener API council changes" into nyc-dev
am: 82ee675330

* commit '82ee6753305b484d778743882fb827c6b73d82c1':
  FrameMetricsListener API council changes

Change-Id: I8ea921d0f7d4658ee0b9827e9b38637c9d370922
2016-04-22 16:34:17 +00:00
Andres Morales
82ee675330 Merge "FrameMetricsListener API council changes" into nyc-dev 2016-04-22 16:31:21 +00:00
Chris Banes
02e81a094f Make AbsSavedState read using given ClassLoader
Currently it does not use a ClassLoader to read
any super state, which can cause crashes for
custom views using the class but on a different
class loader.

BUG: 27790353
Change-Id: I4f4d1d72f213f2481606673643c0e56c23d34bc6
2016-04-22 13:52:08 +01:00
John Reck
59311fb7c9 Merge "Fix flag value collision" into nyc-dev
am: e5cebf7aaa

* commit 'e5cebf7aaa1a1eaa16bbb8b039a572e19e0a5542':
  Fix flag value collision

Change-Id: I7efb08917bbab1c3594b23fd256ba6fa2e68ba6e
2016-04-21 23:30:10 +00:00
Tim Murray
e5cebf7aaa Merge "Fix flag value collision" into nyc-dev 2016-04-21 22:59:42 +00:00
John Reck
60e885f672 Fix flag value collision
Bug: 28314544
Change-Id: If73c1e8fd0e7b313bccbeffa172bdc3ab9496a43
2016-04-21 15:40:45 -07:00
sergeyv
3d8298e1a8 DisplayListCanvas: throw exception at attempt to draw bitmap with size > 100MB
bug:26943116
Change-Id: If72c9f21ca2d8eb660ea2db4a42c8199f8d02472
2016-04-21 14:48:04 -07:00
Vladislav Kaznacheev
45b1e14468 Merge "Rename DropPermissions to DragAndDropPermissions" into nyc-dev
am: 729c640cc8

* commit '729c640cc887da9fe7a1b57121167a7bf83fee97':
  Rename DropPermissions to DragAndDropPermissions

Change-Id: I4a43cc10586d548befffa182d89382071ba412e7
2016-04-21 21:43:08 +00:00
Vladislav Kaznacheev
729c640cc8 Merge "Rename DropPermissions to DragAndDropPermissions" into nyc-dev 2016-04-21 21:34:26 +00:00
Andres Morales
d908c6294d FrameMetricsListener API council changes
Bug: 28296251
Change-Id: I8fe0d8b37c0a3220666570f242f9c20fa16b78ab
2016-04-21 14:20:42 -07:00
Robert Carr
674bedee2e Merge "Respect manually set HARDWARE_ACCELERATED flag." into nyc-dev
am: 37696cccd8

* commit '37696cccd8925ca6e4aa6f2ca6f29807066c7f1e':
  Respect manually set HARDWARE_ACCELERATED flag.

Change-Id: I2b63fc161dc7dccf21080ad7dd27d9b958808ad1
2016-04-21 20:01:15 +00:00
Rob Carr
37696cccd8 Merge "Respect manually set HARDWARE_ACCELERATED flag." into nyc-dev 2016-04-21 19:52:02 +00:00
Clara Bayarri
77b4fda89c Improve KeyboardShortcutInfo documentation for Modifiers
This was a request from API council

Bug: 28295817
Change-Id: I2b80dc9877fdd473cec89abdd0c06df15799796a
2016-04-21 10:33:11 +01:00
Vladislav Kaznacheev
bd048c598d Merge "Add JavaDoc for View.updateDragShadow" into nyc-dev
am: 28609360cf

* commit '28609360cfe25446ab5b0ba165af363378b3d805':
  Add JavaDoc for View.updateDragShadow

Change-Id: I2d5488d78f4095cdfa3558dc0a4e3a785c420648
2016-04-21 00:18:20 +00:00
TreeHugger Robot
28609360cf Merge "Add JavaDoc for View.updateDragShadow" into nyc-dev 2016-04-21 00:02:08 +00:00
Vladislav Kaznacheev
ea4d221c42 Add JavaDoc for View.updateDragShadow
Bug: 28296402
Change-Id: I2aec5ab9932c3177cb08dbf1210abfd949e0dab7
2016-04-20 14:40:32 -07:00
Oren Blasberg
23e282d297 Accommodate NaN in new context menu methods.
Bug: 28296401
Change-Id: I0ae6067e1ae01c342c1b39d6f64db5dcd02492d5
2016-04-20 14:28:39 -07:00