Commit Graph

13403 Commits

Author SHA1 Message Date
Zhijun He
8fcc25dade Merge "Camera2: update API per API council review" into nyc-dev am: b0fe2a9
am: c2ec322

* commit 'c2ec3226ea018e415c57871727c34d44abd80ca4':
  Camera2: update API per API council review

Change-Id: I4ad3be32bee216a92731b07901a661c1ce0463b3
2016-04-09 05:57:41 +00:00
Bryce Lee
744743a869 Merge "Add granular control over disabled effects." into nyc-dev am: 196a057
am: 931690f

* commit '931690f28a074b3882cdd1c6b7d54a23d74437a6':
  Add granular control over disabled effects.

Change-Id: Ibaf6cfb3f7b6a63b6de2b89a7116b36dfdbe178d
2016-04-09 05:56:02 +00:00
Julia Reynolds
c54a7d7b76 Merge "Allow the ranker to autobundle notifications." into nyc-dev am: 3898db9
am: af343d6

* commit 'af343d6796eb0996d134bd606b76b6b2ee5bb185':
  Allow the ranker to autobundle notifications.

Change-Id: I9b5011fa6261d8717db66c5786b51679188f6d8c
2016-04-09 05:53:09 +00:00
Jason Monk
847c7e8c2a Merge "Allow mode of TileService to be changed" into nyc-dev am: aa336f8
am: 1476f35

* commit '1476f3573be229ae00c3a13afb324648305a8bf8':
  Allow mode of TileService to be changed

Change-Id: I8a6b58f4dd2d8bd135e4cadfdc63198720d6e7a8
2016-04-09 05:52:16 +00:00
Adam Powell
c72c505b23 Merge "Chooser filtering and caller direct share targets" into nyc-dev am: fe5e1a7
am: a1be176

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

Change-Id: I17d733ef5f6d2381dea3050f666436fbfe185982
2016-04-09 05:50:11 +00:00
Zhijun He
b0fe2a9637 Merge "Camera2: update API per API council review" into nyc-dev 2016-04-08 23:30:41 +00:00
Zhijun He
0034743236 Camera2: update API per API council review
Per API concil recommendation, made below API change:
* change method name from createCaptureSessionByOutputConfiguration to
createCaptureSessionByOutputConfigurations
* Change method name from
createReprocessableCaptureSessionWithConfigurations to
createReprocessableCaptureSessionByConfigurations

Bug: 27950067
Change-Id: I8346d384210556a40bc2544c3660cc4819f304a1
2016-04-08 23:21:06 +00:00
Bryce Lee
196a05724d Merge "Add granular control over disabled effects." into nyc-dev 2016-04-08 20:59:10 +00: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
Julia Reynolds
e46bb37acf Allow the ranker to autobundle notifications.
Bug: 26709317
Change-Id: I5017a471604e513a7b582cdc2f3472441e108fae
2016-04-08 13:55:03 -04:00
Bryce Lee
7219adadb0 Add granular control over disabled effects.
Currently, we can only wholesale disable effects outside of zen mode.
There are some devices that require long running suppression of features.
Effects disabling was added previously to support this. However, calling
suppression was broken recently on a device where we needed notification
suppression, but not calling suppression.

This CL remedies this problem by adding more granular disabled effects
hints. The NotificationManagerService has been updated to handle these
request types and present ZenModeHelper with a unified map of what should
be suppressed.

Bug: 27992763
Change-Id: I38b4706446dfd6e1c3eb97266dbc3332b250adda
2016-04-08 10:54:23 -07: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
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
e1efbceeb7 Merge "Hide unnecessary extra name constants in ClipDescription" into nyc-dev 2016-04-07 22:21:45 +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
Alexander Hills
5418765d4d Merge "Adds support for MessagingStyle" into nyc-dev 2016-04-07 19:59:20 +00:00
Lifu Tang
ffded1b56a Merge "Addressed API review comments and updated JavaDoc" into nyc-dev am: 80fa590
am: ecb5a34

* commit 'ecb5a34a0de8bb3ac90208619b331ff98aa447ec':
  Addressed API review comments and updated JavaDoc

Change-Id: Ib4317e33de4eda0d5870e20b38d3d3ef1cbd09f5
2016-04-07 19:50:35 +00:00
Lifu Tang
80fa590644 Merge "Addressed API review comments and updated JavaDoc" into nyc-dev 2016-04-07 19:36:03 +00:00
Yi Kong
b9aef08059 Merge "Track libcore change c5c1e2717349a96913dc88722a20c7c1ec2cae68" into nyc-dev 2016-04-07 19:29:19 +00:00
Yi Kong
26aea7b710 Track libcore change c5c1e2717349a96913dc88722a20c7c1ec2cae68
Bug: 28058863
Change-Id: Id4bfeaf0f85d63b658dee3b74f91d7468c8eab95
(cherry picked from commit b443d5d171)
(cherry picked from commit 0201c5566d)
2016-04-07 20:28:00 +01: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
Chris Wren
0132172c69 Merge "add an onListenerDisconnected() callback to NLS" into nyc-dev am: e7e7cb2
am: 9a93368

* commit '9a9336868e865e6cc662ff233f9133fa1159b7f5':
  add an onListenerDisconnected() callback to NLS

Change-Id: I4d84ce81df7f79f3ab983ec43c8f1b67fc358220
2016-04-07 18:00:00 +00:00
Chris Wren
9a9336868e Merge "add an onListenerDisconnected() callback to NLS" into nyc-dev
am: e7e7cb2

* commit 'e7e7cb2d057348644002e986eeb68c211c8fa071':
  add an onListenerDisconnected() callback to NLS

Change-Id: I1448b1e8c368c083313afb6c31582e32a502a684
2016-04-07 17:56:30 +00:00
Yi Kong
4d8d39d01d Merge "Track libcore change e9d9ae3d5e57a60e20c2c01e3dceb3e51de8b9f4" into nyc-dev
am: 2ada7bc

* commit '2ada7bc851ad17790a15f029802a8e4eb2af0e9a':
  Track libcore change e9d9ae3d5e57a60e20c2c01e3dceb3e51de8b9f4

Change-Id: I8c391099d14101174672e5dee04fcba8bcf71313
2016-04-07 17:46:22 +00:00
Chris Wren
e7e7cb2d05 Merge "add an onListenerDisconnected() callback to NLS" into nyc-dev 2016-04-07 17:44:10 +00:00
Yi Kong
3e31dc3804 Track libcore change e9d9ae3d5e57a60e20c2c01e3dceb3e51de8b9f4
Change-Id: I272d9d8a15034dce4e0858b76e1ca22e315e4acd
(cherry picked from commit 3f0f27f6cc)
(cherry picked from commit abd00ff0e7)
2016-04-07 18:38:20 +01:00
Yi Kong
31b0470068 Merge "Track libcore change c5c1e2717349a96913dc88722a20c7c1ec2cae68" am: 937abc9
am: 4bfddce

* commit '4bfddce384836c1ab03bd851ee819bef23a83c49':
  Track libcore change c5c1e2717349a96913dc88722a20c7c1ec2cae68

Change-Id: I81e87a7894844ac728d32c71a122e57afcf32711
2016-04-07 17:36:18 +00:00
Yi Kong
9b741f8051 Merge "Track libcore change c5c1e2717349a96913dc88722a20c7c1ec2cae68" 2016-04-07 17:29:26 +00:00
Yi Kong
937abc9dba Merge "Track libcore change c5c1e2717349a96913dc88722a20c7c1ec2cae68" 2016-04-07 17:23:58 +00:00
Chris Wren
5717bd6ddb add an onListenerDisconnected() callback to NLS
Also block all callbacks if the listener is not connected.

Also update the documentation to make lifecycle restictions
more clear.

Bug: 27582839
Change-Id: I029304e1fb87bd8d754cfb4641ba8cc095fc2b2e
2016-04-07 13:12:21 -04:00
Yi Kong
0201c5566d Track libcore change c5c1e2717349a96913dc88722a20c7c1ec2cae68
Bug: 28058863
Change-Id: Id4bfeaf0f85d63b658dee3b74f91d7468c8eab95
(cherry picked from commit b443d5d171)
2016-04-07 18:06:45 +01:00
Yi Kong
3e267e8a25 Merge "Track libcore change e9d9ae3d5e57a60e20c2c01e3dceb3e51de8b9f4" am: 79c76f9
am: 75eb18f

* commit '75eb18f7c4adbf54b0f07002a4a8f126ae92f7ea':
  Track libcore change e9d9ae3d5e57a60e20c2c01e3dceb3e51de8b9f4

Change-Id: I426f15eba093bb8f7c750b2d8f05473b5eb1dd7e
2016-04-07 17:01:58 +00:00
Yi Kong
abd00ff0e7 Track libcore change e9d9ae3d5e57a60e20c2c01e3dceb3e51de8b9f4
Change-Id: I272d9d8a15034dce4e0858b76e1ca22e315e4acd
(cherry picked from commit 3f0f27f6cc)
2016-04-07 17:48:19 +01:00
Yi Kong
b443d5d171 Track libcore change c5c1e2717349a96913dc88722a20c7c1ec2cae68
Bug: 28058863
Change-Id: Id4bfeaf0f85d63b658dee3b74f91d7468c8eab95
2016-04-07 17:20:31 +01:00
Yi Kong
3f0f27f6cc Track libcore change e9d9ae3d5e57a60e20c2c01e3dceb3e51de8b9f4
Change-Id: I272d9d8a15034dce4e0858b76e1ca22e315e4acd
2016-04-07 16:19:35 +00:00
Alexander Hills
e9765a3c3a Merge "Adds a content-intent-launching-activity flag to WearableExtender" into nyc-dev am: a5ec16e
am: 9f1e6de

* commit '9f1e6de054f836e3b35bb96998c1400435cd5d7a':
  Adds a content-intent-launching-activity flag to WearableExtender

Change-Id: If09863a35440db6b0fc10c021226c9b61b52283f
2016-04-07 14:03:06 +00:00
Alexander Hills
a5ec16e367 Merge "Adds a content-intent-launching-activity flag to WearableExtender" into nyc-dev 2016-04-07 13:52:58 +00:00
Lifu Tang
e8abe8e5ad Addressed API review comments and updated JavaDoc
Bug: 27274532
Bug: 27948390
Change-Id: I0255d2511deab788dcab9815def9c1287a50b7f9
2016-04-06 17:54:35 -07:00
Alan Viverette
379bd8afac Merge "Deprecate methods not supported by Material-style date picker" into nyc-dev am: b2df6af
am: 106d380

* commit '106d380ae98c80fe25130be1286479258515503e':
  Deprecate methods not supported by Material-style date picker

Change-Id: I1973884a036352f02269e0ecd366cee0edc5e2b0
2016-04-06 23:00:24 +00:00
Alan Viverette
b2df6af902 Merge "Deprecate methods not supported by Material-style date picker" into nyc-dev 2016-04-06 22:49:44 +00:00
Alex Hills
9ab3a238b3 Adds a content-intent-launching-activity flag to WearableExtender
This adds a flag to WearableExtender (and Action.WearableExtender)
indicating that the attached ContentIntent will launch an activity
on Wear, which lets the platform know that it can (and should)
generate a sleek transition for the launching of said intent (as
opposed to the intent causing change in the background).

Bug:28019194
Change-Id: Id8b422ea52c5e941e38558aaf31ce2cf4bb7c6f3
2016-04-06 17:20:11 -04:00
Selim Cinek
4b47ff616e Merge "Deprecated the contentinfo and the number" into nyc-dev am: 82404bc
am: ac51be5

* commit 'ac51be5b1cd048397ed9e4e0e7d6bac5b3610394':
  Deprecated the contentinfo and the number

Change-Id: I6acb57542bba80a9d4e8fadfbd480c3b3102ff3b
2016-04-06 20:56:42 +00:00
Selim Cinek
82404bc068 Merge "Deprecated the contentinfo and the number" into nyc-dev 2016-04-06 20:45:56 +00:00
Alan Viverette
0e672148a7 Deprecate methods not supported by Material-style date picker
Bug: 28039932
Change-Id: Ide53b42c9197ca9076184adef2e96170dd24785a
2016-04-06 15:56:11 -04:00
Dianne Hackborn
fd84a7af4f Merge "More work on issue #26390151: Add new JobScheduler API..." into nyc-dev am: d273f0d
am: cfb4721

* commit 'cfb472112dfac835950b4c53fdf921c569388114':
  More work on issue #26390151: Add new JobScheduler API...

Change-Id: Idd203c9daba08a3498c8184028554d5136101085
2016-04-06 19:45:48 +00:00
Dianne Hackborn
d273f0d659 Merge "More work on issue #26390151: Add new JobScheduler API..." into nyc-dev 2016-04-06 19:38:50 +00:00
Selim Cinek
0f9dd1e2f5 Deprecated the contentinfo and the number
It was mainly adding noise to the notification
rather than useful information.

Bug: 27431551
Change-Id: Ie22c9935d60eeac1cca5d9ce97239aadfac9b3cf
2016-04-06 12:18:31 -07:00
Robert Shih
dc05dab86f Merge "DrmInitData: prevent public constructor access" into nyc-dev am: 696dc4d
am: dd9c91d

* commit 'dd9c91d2bafb255f6ec91e257166c6bfbcc4651a':
  DrmInitData: prevent public constructor access

Change-Id: I9753ed732d1c522b5753946c51f38178b650bd0a
2016-04-06 17:23:27 +00:00