Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
244,862 Commits 3 Branches 0 Tags
d58e6cf14b671ce84dc350fdd60da8ce5070cdbd
Commit Graph

64178 Commits

Author SHA1 Message Date
John Reck
7c2a570035 Merge "Make stopped state a first-class thing" into nyc-dev am: c724dcf 
am: 620a86e

* commit '620a86e464d585c796e51a16dad419d46d3837e4':
  Make stopped state a first-class thing

Change-Id: Idd258fd34c68ec214e41ceb90f1d911901535802
 2016-04-08 15:21:28 +00: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
c724dcf23c Merge "Make stopped state a first-class thing" into nyc-dev 2016-04-08 15:09:42 +00:00
Gustav Sennton
58eec6a52d Merge "Create WebViewUpdateServiceImpl to move implementation there." into nyc-dev am: 1d16d77 
am: f6c4277

* commit 'f6c4277d08c0c63de1c167ab52048b3bf269a589':
  Create WebViewUpdateServiceImpl to move implementation there.

Change-Id: Ie0ccb9d84dcc9060d2c4bdbb434d7c27257269b0
 2016-04-08 14:38:37 +00:00
Gustav Sennton
f6c4277d08 Merge "Create WebViewUpdateServiceImpl to move implementation there." into nyc-dev 
am: 1d16d77

* commit '1d16d773b0d2d12301bda68d15adc6953ce68710':
  Create WebViewUpdateServiceImpl to move implementation there.

Change-Id: Id9940a6b7cbcf4481eb4ec6f52387fd1d470b8a7
 2016-04-08 14:34:20 +00:00
Gustav Sennton
1d16d773b0 Merge "Create WebViewUpdateServiceImpl to move implementation there." into nyc-dev 2016-04-08 14:25:59 +00:00
Benjamin Franz
183ae07bd4 Merge "Throw security exception for non-parent aware APIs" into nyc-dev am: 5c1fbad 
am: 1acb890

* commit '1acb89035105ae0c4ec16cfab6f792ae1791e765':
  Throw security exception for non-parent aware APIs

Change-Id: I65709d7957570e97d5dcfcb81cc75fe3686129c4
 2016-04-08 12:12:45 +00:00
Benjamin Franz
1acb890351 Merge "Throw security exception for non-parent aware APIs" into nyc-dev 
am: 5c1fbad

* commit '5c1fbadb1a1169186b7a0a357ae9c35183258c6c':
  Throw security exception for non-parent aware APIs

Change-Id: Ibfddb4d0894644adec0ea5aa9e9c7e55431ce5be
 2016-04-08 12:08:47 +00:00
Benjamin Franz
5c1fbadb1a Merge "Throw security exception for non-parent aware APIs" into nyc-dev 2016-04-08 12:02:26 +00:00
Rubin Xu
9002d00efd Merge "Relaunch previous activity after turning work profile on" into nyc-dev am: 1b2300b 
am: a8e7059

* commit 'a8e70595f4e7588183fb90c6dea3e92c22e7568c':
  Relaunch previous activity after turning work profile on

Change-Id: I5ce9ae730ae741cc26158d86e64b69b9e7a31c0b
 2016-04-08 09:29:40 +00:00
Rubin Xu
a8e70595f4 Merge "Relaunch previous activity after turning work profile on" into nyc-dev 
am: 1b2300b

* commit '1b2300b065a722cd65e7f9045b9806b1704b9280':
  Relaunch previous activity after turning work profile on

Change-Id: Iae8a8f0294521b7c60bcc8104e1b5708dcf91108
 2016-04-08 09:25:23 +00:00
Rubin Xu
1b2300b065 Merge "Relaunch previous activity after turning work profile on" into nyc-dev 2016-04-08 09:20:46 +00:00
Ruchi Kandoi
32896d3d98 Merge "batteryService: Add Charge Counter." into nyc-dev am: 0f36ba8 
am: e6f97ae

* commit 'e6f97ae2eb7ed6e255c8b0104a245ca75482a28c':
  batteryService: Add Charge Counter.

Change-Id: Ica8ddf078297ec64bcf157dc072ad9827052ba42
 2016-04-08 01:21:36 +00:00
Ruchi Kandoi
e6f97ae2eb Merge "batteryService: Add Charge Counter." into nyc-dev 
am: 0f36ba8

* commit '0f36ba81e7a8c05d6500ce32197989c6fc3c30fc':
  batteryService: Add Charge Counter.

Change-Id: Ia15b676d999118b774b5cdc7695083e1d694ee3f
 2016-04-08 01:17:47 +00:00
Ruchi Kandoi
0f36ba81e7 Merge "batteryService: Add Charge Counter." into nyc-dev 2016-04-08 01:09:24 +00:00
Ruchi Kandoi
6361e22fea batteryService: Add Charge Counter. 
Bug: 27174034
Change-Id: Ib8bc8f617288c0ad543c67e0fa609c5a0c87b5fd
Signed-off-by: Ruchi Kandoi <kandoiruchi@google.com>
 2016-04-08 01:09:02 +00:00
Jorim Jaggi
f7ff639e26 Merge "Dismiss docked stack when opening non-resizable activity" into nyc-dev am: 7c3912e 
am: 220a909

* commit '220a9090ac24879c0a990d2a0eb0dac588e6166b':
  Dismiss docked stack when opening non-resizable activity

Change-Id: Ie0c301132353d45a3337e21303514780a2197e69
 2016-04-07 23:56:52 +00:00
Jorim Jaggi
220a9090ac Merge "Dismiss docked stack when opening non-resizable activity" into nyc-dev 
am: 7c3912e

* commit '7c3912e4abc71886ad41e7be67d4eff41974d21f':
  Dismiss docked stack when opening non-resizable activity

Change-Id: I3c4953fdafc45b55217c9362799f88aeb23ca799
 2016-04-07 23:52:43 +00:00
Jorim Jaggi
7c3912e4ab Merge "Dismiss docked stack when opening non-resizable activity" into nyc-dev 2016-04-07 23:40:44 +00:00
Tim Murray
a7b7449fec Merge "Improve service start/creation tracing." into nyc-dev am: d8ca02f 
am: f2a63fd

* commit 'f2a63fda7de06af41fdc76b200bcec921011486b':
  Improve service start/creation tracing.

Change-Id: I495a4b87a51df0d0a40a529a3901aec5aea7af8e
 2016-04-07 23:34:01 +00:00
Tim Murray
f2a63fda7d Merge "Improve service start/creation tracing." into nyc-dev 
am: d8ca02f

* commit 'd8ca02f25225a033ad0f69e1ad4a2af5df289db2':
  Improve service start/creation tracing.

Change-Id: I8bb66e4d51d05d98474d84d901182c52f98c4c4c
 2016-04-07 23:30:18 +00:00
Tim Murray
d8ca02f252 Merge "Improve service start/creation tracing." into nyc-dev 2016-04-07 23:19:38 +00:00
John Reck
4e2838ead6 Merge "Fix some edge cases" into nyc-dev am: 4a62eff 
am: c01a9b6

* commit 'c01a9b6a9ba2662fafa6f4152ca9986faacd2d66':
  Fix some edge cases

Change-Id: I52d65ed7c5da33b33a4f98953800c1dedea2bf09
 2016-04-07 23:15:52 +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
4a62effbfe Merge "Fix some edge cases" into nyc-dev 2016-04-07 23:08:10 +00:00
Jorim Jaggi
d53f09254e Dismiss docked stack when opening non-resizable activity 
- Also move the toast to SysemUI as a cleanup.

Bug: 27341740
Bug: 28026841
Change-Id: Ic6196ed75511751c6fadb12fa24574c881100f65
 2016-04-07 16:07:27 -07: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
Oren Blasberg
351cca5ad2 Merge "Fix top level menu lingering when submenu opens." into nyc-dev am: 7ce082a 
am: 3fe68e1

* commit '3fe68e14b066f0238f12c4920becc8781d8ade5b':
  Fix top level menu lingering when submenu opens.

Change-Id: I1ede9d53699c8fe82f6e893af3dca157c47dc5c4
 2016-04-07 22:54:15 +00:00
Oren Blasberg
3fe68e14b0 Merge "Fix top level menu lingering when submenu opens." into nyc-dev 
am: 7ce082a

* commit '7ce082a46259e948e4ea6a12f327f32aecaf167a':
  Fix top level menu lingering when submenu opens.

Change-Id: I994fe5fa29f9b10c0d7a8e4dd306fe2e4f35df7e
 2016-04-07 22:50:43 +00:00
Oren Blasberg
7ce082a462 Merge "Fix top level menu lingering when submenu opens." into nyc-dev 2016-04-07 22:43:18 +00:00
Tim Murray
b6f5a4292b Improve service start/creation tracing. 
bug 27998068

Change-Id: If18ab5d293f0bb0dfbfbed2f2af383c349464963
 2016-04-07 15:37:43 -07:00
Vladislav Kaznacheev
b526b42509 Merge "Hide unnecessary extra name constants in ClipDescription" into nyc-dev am: e1efbce 
am: ee03cdf

* commit 'ee03cdf9a71c67edd56f3dfef3c4258aa36800dc':
  Hide unnecessary extra name constants in ClipDescription

Change-Id: I425e34fa44893b1e745e387a8393df52bd275136
 2016-04-07 22:32:01 +00:00
Vladislav Kaznacheev
ee03cdf9a7 Merge "Hide unnecessary extra name constants in ClipDescription" into nyc-dev 
am: e1efbce

* commit 'e1efbceeb76799e99e53821165ce6ea3f7f8d274':
  Hide unnecessary extra name constants in ClipDescription

Change-Id: Iacf66c41d405248ceb94a4acbf5088d6ef466551
 2016-04-07 22:28:26 +00:00
Vladislav Kaznacheev
e1efbceeb7 Merge "Hide unnecessary extra name constants in ClipDescription" into nyc-dev 2016-04-07 22:21:45 +00: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
Vladislav Kaznacheev
45699f1d95 Merge "Rename View.DragShadowBuilder#onProvideShadowMetrics parameters" into nyc-dev am: 78740ad 
am: 1dac79b

* commit '1dac79b2ba1d0e3aa95aa9b89c643e98d40f447f':
  Rename View.DragShadowBuilder#onProvideShadowMetrics parameters

Change-Id: Ifd83bbf5d5055a477363465e9c380055c1f07fe0
 2016-04-07 20:50:36 +00:00
Vladislav Kaznacheev
1dac79b2ba Merge "Rename View.DragShadowBuilder#onProvideShadowMetrics parameters" into nyc-dev 
am: 78740ad

* commit '78740add9b0bce8bf001fa6f1a064bbc1151c355':
  Rename View.DragShadowBuilder#onProvideShadowMetrics parameters

Change-Id: If96b5ebb8658d68b0f058216d23037a0f20a25f1
 2016-04-07 20:47:09 +00:00
Phil Weaver
395d3564fe Merge "Treat accessibility gestures like physical ones." into nyc-dev am: fb6dd3b 
am: 5e0f193

* commit '5e0f19333910d4e3319b77b24b1df5a2851a3d15':
  Treat accessibility gestures like physical ones.

Change-Id: Ib2867ce30282baf97d8ff16386326e46767e97c3
 2016-04-07 20:43:12 +00:00
Vladislav Kaznacheev
78740add9b Merge "Rename View.DragShadowBuilder#onProvideShadowMetrics parameters" into nyc-dev 2016-04-07 20:41:54 +00:00
Phil Weaver
5e0f193339 Merge "Treat accessibility gestures like physical ones." into nyc-dev 
am: fb6dd3b

* commit 'fb6dd3bbc18a425e25f9761cbcc96b8eb169b04f':
  Treat accessibility gestures like physical ones.

Change-Id: Idecb2de61673c94c44a128b32bcd035d050c604a
 2016-04-07 20:39:41 +00:00
Phil Weaver
fb6dd3bbc1 Merge "Treat accessibility gestures like physical ones." into nyc-dev 2016-04-07 20:34:34 +00:00
Jeff Sharkey
a4ab470ad1 Merge "Clarify version docs." into nyc-dev am: cff1025 
am: ea32701

* commit 'ea327017a90636083176e66bc7b597d718eab932':
  Clarify version docs.

Change-Id: Ib58f9be60c06011c544fe4fb991ee339f88894bc
 2016-04-07 20:19:25 +00:00
Jeff Sharkey
ea327017a9 Merge "Clarify version docs." into nyc-dev 
am: cff1025

* commit 'cff102508cf4cf1d2f298ebdba663bd27c458520':
  Clarify version docs.

Change-Id: I78c60a6a8f83c211eca854e2b1b56afbabc8e07b
 2016-04-07 20:15:31 +00:00
Alexander Hills
126709f314 Merge "Adds support for MessagingStyle" into nyc-dev am: 5418765 
am: 52546b0

* commit '52546b014beb0a6288f8397707baa3ff5b8eb19d':
  Adds support for MessagingStyle

Change-Id: I483ff9ddbb66523272da4a8d5c71448b12f99d11
 2016-04-07 20:12:10 +00:00
Alex Hills
52546b014b Merge "Adds support for MessagingStyle" into nyc-dev 
am: 5418765

* commit '5418765d4d0e4befef811c0a2cbc5d8a69ed6cfd':
  Adds support for MessagingStyle

Change-Id: I77354888ee4a6292896b0a6b5e85cee4f63af606
 2016-04-07 20:08:33 +00:00
Jeff Sharkey
cff102508c Merge "Clarify version docs." into nyc-dev 2016-04-07 20:08:18 +00:00
Jeff Sharkey
e721615f43 Clarify version docs. 
Change-Id: I64cc9e5e51f12d33e770e73734efd89df20c8504
 2016-04-07 14:07:10 -06:00
Alexander Hills
5418765d4d Merge "Adds support for MessagingStyle" into nyc-dev 2016-04-07 19:59:20 +00:00
Phil Weaver
155dda1e43 Treat accessibility gestures like physical ones. 
Gestures now operate on the screen as the user sees it, so they are
affected by magnification. This makes gesture coordinates consistent
with the node bounds in screen and makes an eye or head tracking service
work much more easily.

Bug: 27747314
Change-Id: Idee60398d49d8c9af7405d974893c796b034c974
 2016-04-07 12:20:27 -07:00
Alex Hills
fc737def02 Adds support for MessagingStyle 
This change adds support for the new MessagingStyle, which
supports a fully back-and-forth messaging/chat experience
within the notification display itself.

Bug:28043958
Change-Id: Ibb9c2a0784f028d8cf01bd3cee4fecc5f72d68cd
 2016-04-07 15:19:14 -04:00