Commit Graph

63322 Commits

Author SHA1 Message Date
Mark Renouf
41178c21c8 Merge "Customizes input extract edit view for Wear" into nyc-dev
am: 4430308

* commit '44303087cc4d8a0830b14a87c2b7f32a39e9080b':
  Customizes input extract edit view for Wear

Change-Id: Ic3fba9b190ca762a9e0ff60a705a1cb132cf7dec
2016-04-09 00:42:27 +00:00
Julia Reynolds
af343d6796 Merge "Allow the ranker to autobundle notifications." into nyc-dev
am: 3898db9

* commit '3898db9e152ff8e2b34ae97f4a2ed37b9cb667db':
  Allow the ranker to autobundle notifications.

Change-Id: I652a43365b8eee51e91ed1c5d22aacb1b488e373
2016-04-09 00:41:35 +00:00
Jason Monk
1476f3573b Merge "Allow mode of TileService to be changed" into nyc-dev
am: aa336f8

* commit 'aa336f89265b8936d23e43189904de6ea9575538':
  Allow mode of TileService to be changed

Change-Id: Ia48acae4fb65f123755bc7c73b6d8204435f4d16
2016-04-09 00:41:23 +00:00
Dianne Hackborn
97907066c6 Merge "Fix issue #28075893: Don\'t hold strong refs on to JobService" into nyc-dev
am: 6827db3

* commit '6827db3e5fccb5185009ad5ac6a9e30d17573bf2':
  Fix issue #28075893: Don't hold strong refs on to JobService

Change-Id: I0112842918f713cbf30d061f82dcdfa4e8c084ca
2016-04-09 00:40:37 +00:00
Adam Powell
a1be176a42 Merge "Chooser filtering and caller direct share targets" into nyc-dev
am: fe5e1a7

* commit 'fe5e1a75c125095b90719b22ffcf71e0968a6530':
  Chooser filtering and caller direct share targets

Change-Id: I8be4c3a825632be9e621ba542877d484d0b2b7f8
2016-04-09 00:40:08 +00:00
Andrii Kulian
d4b770e16e Merge "Fix multiple configuration changes in multiwindow" into nyc-dev
am: 21400cb

* commit '21400cb552f5dc7f4c8296be53fabaa46b03fa85':
  Fix multiple configuration changes in multiwindow

Change-Id: I01db63f6b8899ad04fad72b759611a550b3b42ac
2016-04-09 00:39:52 +00:00
Phil Weaver
9a375470d4 Merge "Eliminate side effects of a11y window title." into nyc-dev
am: ab4d5ff

* commit 'ab4d5ffd123433d434a8c4e1f3bf2674d99a5fb3':
  Eliminate side effects of a11y window title.

Change-Id: I388abfd86355bc90df4ee3b788bda0a6cd494f81
2016-04-09 00:39:20 +00:00
Mark Renouf
880602eb64 Customizes input extract edit view for Wear
Provides an alternate presentation of the extract edit area
of an input method window, designed for sub 250dp width screens.

An icon is used on a round material style button in place of a text
action, providing more horizontal space for the editing area.

BUG: 22512982
Change-Id: I16226ce393f2d15065d08e66a36d008eb1a0c8a1
(cherry picked from commit fd71a6a5d99bad5d3ab32edc328fb5b026b66215)
2016-04-08 16:56:25 -04: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
Julia Reynolds
3898db9e15 Merge "Allow the ranker to autobundle notifications." into nyc-dev 2016-04-08 20:13:45 +00:00
Jason Monk
aa336f8926 Merge "Allow mode of TileService to be changed" into nyc-dev 2016-04-08 19:37:55 +00:00
Dianne Hackborn
6827db3e5f Merge "Fix issue #28075893: Don't hold strong refs on to JobService" into nyc-dev 2016-04-08 19:28:42 +00:00
Adam Powell
fe5e1a75c1 Merge "Chooser filtering and caller direct share targets" into nyc-dev 2016-04-08 19:20:25 +00:00
Andrii Kulian
21400cb552 Merge "Fix multiple configuration changes in multiwindow" into nyc-dev 2016-04-08 19:05:20 +00:00
Andrii Kulian
701214b282 Fix multiple configuration changes in multiwindow
When in split-screen mode and activity handles configuration changes
it gets 2 onConfigurationChanged calls which originate from
ActivityManagerService#updateConfigurationLocked:
1. app.thread.scheduleConfigurationChanged calls to all process records
   send configuration of the whole screen for corresponding orientation,
   which leads to CONFIGURATION_CHANGED message in ActivityThread.
2. mStackSupervisor.resizeStackLocked call resizes both visible stacks and
   eventually ActivityThread receives ACTIVITY_CONFIGURATION_CHANGED
   message with correct configuration corresponding to space occupied in
   split-screen.

In this CL if component callback is an instance of Activity and it had
override config set - onConfigurationChanged will not be triggered unless
override config has changed.

Bug: 27948331
Change-Id: Ia73b045570b44eb5b351811bf6c4f63d78c3f909
2016-04-08 11:58:43 -07:00
Phil Weaver
ab4d5ffd12 Merge "Eliminate side effects of a11y window title." into nyc-dev 2016-04-08 18:22:02 +00: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
Julia Reynolds
e46bb37acf Allow the ranker to autobundle notifications.
Bug: 26709317
Change-Id: I5017a471604e513a7b582cdc2f3472441e108fae
2016-04-08 13:55:03 -04:00
Jason Monk
97d2272be0 Allow mode of TileService to be changed
Since the mode of a tile service was set in onTileAdded, it couldn't
be controlled by developers if they updated their tile.  To handle
the mode has been moved to a boolean meta-data flag to indicate
a tile should be an active tile.

Bug: 28043969
Change-Id: I6403d34f8cb70809edc07769389d5a1f835c1ab3
2016-04-08 11:42:57 -04:00
Adam Powell
52c39215db Chooser filtering and caller direct share targets
Let apps invoking the system chooser specify components to filter out
such as themselves; this will prevent duplicate nonsensical UX where
it doesn't make sense for an app to share to itself.

Similarly, let apps provide their own Direct Share targets for when
they do want to let users share via their own internal services in the
same UI. These options can be used together.

Also fix a bug where a lingering binder reference from a remote
ChooserTargetService that hasn't been GC'd in the remote process could
keep an active reference to a ChooserActivity instance.

Bug 28073484

Change-Id: Ib613b1153b49dfedf79574b1af7c45379eceec24
2016-04-08 08:40:38 -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
c724dcf23c Merge "Make stopped state a first-class thing" into nyc-dev 2016-04-08 15:09:42 +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
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
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
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
Dianne Hackborn
0796e9fb3d Fix issue #28075893: Don't hold strong refs on to JobService
Change-Id: I822adaee953be9b14213def001b174d5c348fa14
2016-04-07 17:29:36 -07: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
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
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
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
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
Phil Weaver
9be3c7bdc7 Eliminate side effects of a11y window title.
ag/898112 added passing the window title to accessibility. To do that,
it also updated copy of the title in WindowManager.LayoutParams. That
was a behavior change, and the change broke cts tests that enforce that
the title in LayoutParams matches its expected format.

This change restores the previous behavior and adds a separate field to
LayoutParams to old an up-to-date title to pass to accessibility.

Bug: 28002185
Change-Id: Ia5b549113600b7c4fcc80b76c3f3a944dddaf483
2016-04-07 15:15:41 -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
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
Vladislav Kaznacheev
78740add9b Merge "Rename View.DragShadowBuilder#onProvideShadowMetrics parameters" into nyc-dev 2016-04-07 20:41:54 +00:00