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
Robert Shih
696dc4d8df
Merge "DrmInitData: prevent public constructor access" into nyc-dev
2016-04-06 17:13:23 +00:00
Robin Lee
c195fd649f
Merge "Remove bool return from setAlwaysOnVpnPackage" into nyc-dev am: 589b855
...
am: 0694d00
* commit '0694d0095cd0541ba65ff783a60e8bd2621c0f4a':
Remove bool return from setAlwaysOnVpnPackage
Change-Id: Iee41dd36989da78becf5f4d13be7a0fcd72ff1bb
2016-04-06 17:08:37 +00:00
Robin Lee
589b855719
Merge "Remove bool return from setAlwaysOnVpnPackage" into nyc-dev
2016-04-06 17:01:24 +00:00
Robin Lee
ee5eb934e3
Remove bool return from setAlwaysOnVpnPackage
...
Bug: 27533151
Change-Id: I4c656488e69cb5247dbb9cfd62d6f6f7043f9a90
2016-04-06 16:30:22 +01:00
Erik Kline
5a0577a334
Merge "Make public the registerDefaultNetworkCallback API" into nyc-dev am: 3671285
...
am: a577a3a
* commit 'a577a3a29f601fd2b71ad89eedcc52bdd8efbccb':
Make public the registerDefaultNetworkCallback API
Change-Id: Ic749ede5b84e443fed04701ecdd0f6521a77158f
2016-04-06 08:58:22 +00:00
Erik Kline
f46600d074
Make public the registerDefaultNetworkCallback API
...
Change-Id: I89d7a6f49f5d6a0da3402a07407b0f8d93181b4f
2016-04-06 12:22:47 +09:00
Svetoslav Ganov
99017ede1d
Merge "Remove unusable a11y APIs for ClickableSpans." into nyc-dev am: f13f14e
...
am: 30457a1
* commit '30457a1dcebacac639326cbbf8960934c980afe1':
Remove unusable a11y APIs for ClickableSpans.
Change-Id: I819d8bc38f6a7fe33fbb1a8550d4beacac7f2f30
2016-04-06 02:17:57 +00:00
Svetoslav Ganov
f13f14ef30
Merge "Remove unusable a11y APIs for ClickableSpans." into nyc-dev
2016-04-06 02:05:42 +00:00
Vladislav Kaznacheev
5d196673b8
Hide unnecessary extra name constants in ClipDescription
...
Bug: 27530944
Change-Id: I6989a55ea4f5d16d7cfd2ba3ab9342f0be34113c
2016-04-05 17:12:25 -07:00
Abhijith Shastry
ca5d6c8277
Merge "Remove deprecated API launchManageBlockedNumbersActivity" into nyc-dev am: 7f376b9
...
am: 306c251
* commit '306c25175d226a14eea342aa7b38538a79a43fbf':
Remove deprecated API launchManageBlockedNumbersActivity
Change-Id: I64ac10f5937b99c3a08a5b861ef0f6f6c0c9dbd8
2016-04-05 23:51:24 +00:00
Kirill Grouchnikov
2e9400dd4a
Merge "Return correct unfocused month date color for pre-Material themes." into nyc-dev am: 12454dc
...
am: a8dc3d4
* commit 'a8dc3d426f5e0a20eb7ea2f5b11cef4ff06be5f4':
Return correct unfocused month date color for pre-Material themes.
Change-Id: Icf77dc0052a3f24db4a2efe2a9fa3810316930b9
2016-04-05 23:32:29 +00:00
Abhijith Shastry
7f376b9e8e
Merge "Remove deprecated API launchManageBlockedNumbersActivity" into nyc-dev
2016-04-05 23:24:42 +00:00
Dianne Hackborn
141f11c82a
More work on issue #26390151 : Add new JobScheduler API...
...
...for monitoring content providers
- Improve media provider change reporting so that observers can
avoid spurious reports of the top-level content directory changing.
- Fix a bug where collected content changes while a job was running
were not being properly propagated to the next job.
Change-Id: I29e3c2960e6fec75b16ee3ee6588d47342bf8c75
2016-04-05 15:58:42 -07:00
Robert Shih
50cd766a57
DrmInitData: prevent public constructor access
...
Bug: 27949882
Change-Id: I8482f8eba18632eea95e14f0123c11da18e70fae
2016-04-05 14:51:44 -07:00