Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
253,750 Commits 3 Branches 0 Tags
9cd773733c2467eeb604565fd65c8d6f8488bcbd
Commit Graph

8243 Commits

Author SHA1 Message Date
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
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
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
9ea37b9bee Merge "PIP: Send KEYCODE_WINDOW to app first if PIP isn\'t exist" into nyc-dev am: bdc4700 am: 0f360d8 
am: 8416446

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

Change-Id: I3ac695a7729ceb8e8c06e6df150fe3be1c351d7f
 2016-04-26 16:07:31 +00: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
14066c8ae9 Merge "Improve KeyboardShortcutInfo documentation for Modifiers" into nyc-dev am: f48f390 am: dea459c 
am: d3cd71b

* commit 'd3cd71b8a9c781921f6e4efe9685284bf1f4c6df':
  Improve KeyboardShortcutInfo documentation for Modifiers

Change-Id: Ia0b104bc5e689aa168bf4e7414ec82ff000c040d
 2016-04-25 09:49:27 +00: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
c1ede9aa2e Merge "Make AbsSavedState read using given ClassLoader" into nyc-dev am: b02d51b am: bdc6966 
am: 9465c72

* commit '9465c720f53d3ca7d0fa2311c887b727db3fdbaf':
  Make AbsSavedState read using given ClassLoader

Change-Id: Ia1ee1a8609c3cf7815e596cc74658dc4bb04c01e
 2016-04-23 07:16:42 +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
19284570d8 Merge "FrameMetricsListener API council changes" into nyc-dev am: 82ee675330 am: 2e9c311abd 
am: d02093198f

* commit 'd02093198fe84f05c9c062c7a67e26c73aeca41f':
  FrameMetricsListener API council changes

Change-Id: I012b699981d26c6f932c66573b43e8ce93a6e6b0
 2016-04-22 16:38:49 +00: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
be31f33405 Merge "Fix flag value collision" into nyc-dev am: e5cebf7aaa am: bf4e2f742c 
am: eaec808ac5

* commit 'eaec808ac5a3cfc82b3d954f00949760b85986ac':
  Fix flag value collision

Change-Id: Ia999f06d58d128e3ab01109ba9a7237957ce4321
 2016-04-21 23:34:58 +00:00
Tim Murray
eaec808ac5 Merge "Fix flag value collision" into nyc-dev am: e5cebf7aaa 
am: bf4e2f742c

* commit 'bf4e2f742c81c136e4f4a7019026a09dce8a3d98':
  Fix flag value collision

Change-Id: I45d049b899c2171957f8c005267928c07422a411
 2016-04-21 23:32:32 +00: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
Vladislav Kaznacheev
4465add3e1 Merge "Rename DropPermissions to DragAndDropPermissions" into nyc-dev am: 729c640cc8 am: 45b1e14468 
am: 0ee7fecd43

* commit '0ee7fecd437b4ba4676985e072c940a819d46114':
  Rename DropPermissions to DragAndDropPermissions

Change-Id: Id978e6f65b915955d1caff4825d89373f248d168
 2016-04-21 21:48:10 +00: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
001ccdc98f Merge "Respect manually set HARDWARE_ACCELERATED flag." into nyc-dev am: 37696cccd8 am: ff54c9eeb2 
am: e42b3f0586

* commit 'e42b3f0586b5055eeb1e77c4b5d52001fcff9c90':
  Respect manually set HARDWARE_ACCELERATED flag.

Change-Id: I84acd6bb147dded75314aa97e21dc8d9446fd43a
 2016-04-21 20:08:18 +00:00
Rob Carr
e42b3f0586 Merge "Respect manually set HARDWARE_ACCELERATED flag." into nyc-dev am: 37696cccd8 
am: ff54c9eeb2

* commit 'ff54c9eeb2eeebebcb8d14fd35dfcdcbafa187a6':
  Respect manually set HARDWARE_ACCELERATED flag.

Change-Id: Ie0530121ee8dc34ae41f89acb27eeaf41ddf3534
 2016-04-21 20:03:34 +00:00