Commit Graph

13429 Commits

Author SHA1 Message Date
Alexander Hills
d98785e288 Merge "Fixes name of intent launch flag for Action Extender" into nyc-dev am: e3f3cb1
am: 0666069

* commit '06660697a3198835b5a7955f3955e58fb92e407f':
  Fixes name of intent launch flag for Action Extender

Change-Id: Ia824a1bc0a6c52697e0e0ce7cea0f6448ef60594
2016-04-12 17:29:39 +00:00
Alexander Hills
e3f3cb1048 Merge "Fixes name of intent launch flag for Action Extender" into nyc-dev 2016-04-12 17:10:19 +00:00
Yi Kong
0755fc6c61 Track libcore change 2115cc0ca7d60965a361129d8826478ff2d847e4
Bug: 28108421
Change-Id: I774f264bf538b0fa2aac63c8e5225f82d7b03c2e
(cherry picked from commit 5182e272ad)
(cherry picked from commit 05a77eee41)
2016-04-12 17:12:26 +01:00
Alex Hills
4ec3ff4f8f Fixes name of intent launch flag for Action Extender
Changes the name from set/getHintContentIntentLaunchesActivity
to set/getLaunchesActivty

Change-Id: I8ef879ae82cc360163fcd689eb5fad0d2b9d7db0
2016-04-12 11:44:36 -04:00
Yi Kong
05a77eee41 Track libcore change 2115cc0ca7d60965a361129d8826478ff2d847e4
Bug: 28108421
Change-Id: I774f264bf538b0fa2aac63c8e5225f82d7b03c2e
(cherry picked from commit 5182e272ad)
2016-04-12 15:45:10 +01:00
Shubham Ajmera
aeeabf072f Merge "Track libcore change 135ea6cd4f7ebe2f225351a1928d8a62bce5cb00" into nyc-dev am: 68b19f2
am: 0983951

* commit '098395171952abb0a2fd8bdeb5ecb7b8f5d8b2f4':
  Track libcore change 135ea6cd4f7ebe2f225351a1928d8a62bce5cb00

Change-Id: I10b7b20ca7cd96b57c68a85377e6ea8ba4c83546
2016-04-12 12:38:31 +00:00
Kirill Grouchnikov
e1684cda2b Merge "Add @TestApi method to Spinner to test whether popup is showing." 2016-04-12 12:29:08 +00:00
Shubham Ajmera
a871ab1687 Track libcore change 135ea6cd4f7ebe2f225351a1928d8a62bce5cb00
Bug: 27426743
Change-Id: I4c77de05c99b811f60f2421d1f41e62c1404a4a4
2016-04-12 10:10:25 +01:00
Makoto Onuki
1187239423 Merge "ShortcutManager: First cut of CTS" into nyc-dev am: bc20320
am: 0beb56d

* commit '0beb56d4e49f433759f7c825374c90442f2aed53':
  ShortcutManager: First cut of CTS

Change-Id: I048150bf9451e8d28dc599673321bd31f8d119a1
2016-04-11 23:30:43 +00:00
Makoto Onuki
bc20320f7f Merge "ShortcutManager: First cut of CTS" into nyc-dev 2016-04-11 23:11:41 +00:00
Makoto Onuki
5ba0d3e3a3 ShortcutManager: First cut of CTS
Bug 27548047

Change-Id: Idd7a768ea4fee44c2cf6e3bd473cea9e67f5f7cd
2016-04-11 14:48:44 -07:00
Jeff Sharkey
dd1a2a3bb8 Merge "Clean up AudioRouting API internals." into nyc-dev am: 0e2e780
am: 98646e8

* commit '98646e8e5d0ca69ece528935c74546fcac81972b':
  Clean up AudioRouting API internals.

Change-Id: Ic93a353100f85ca701ee182b179514649d0681f3
2016-04-11 20:51:22 +00:00
Hangyu Kuang
402a01ea74 Merge "media: update VP9 CodecProfileLevel" into nyc-dev am: 333c7d3
am: a20e438

* commit 'a20e438c8f987cb1610f8e0a1ae31ba3cd0affcd':
  media: update VP9 CodecProfileLevel

Change-Id: I1d5fe2735b9da4eb1c490209db5131ca43d1a95d
2016-04-11 20:40:37 +00:00
Jeff Sharkey
0e2e7806b7 Merge "Clean up AudioRouting API internals." into nyc-dev 2016-04-11 20:33:50 +00:00
Hangyu Kuang
f0ef572fd0 media: update VP9 CodecProfileLevel
Bug:27969307
Change-Id: I44f230bb691bd193c2119b399eca17da87bfbc97
2016-04-11 12:08:03 -07:00
Jeff Sharkey
ed2edc7a8e Clean up AudioRouting API internals.
Reuse existing OnRoutingChangedListener APIs and internal logic by
extending the new AudioRouting.OnRoutingChangedListener.  We use
new default methods to delegate incoming calls on the legacy
interfaces.

Fix a handful of locking bugs.

Bug: 27950070, 27952052, 27949198
Change-Id: Ie584108bcbeeab064d8e27d4984e541f31d36728
2016-04-11 13:01:55 -06:00
Greg Kaiser
4f633c7d32 Merge "ContextHubManager: Avoid bad NanoApp objects" into nyc-dev am: f4d3805
am: 1fd8534

* commit '1fd853468f4071cbdeb913954c9786d6cb6347ef':
  ContextHubManager: Avoid bad NanoApp objects

Change-Id: Id42d34e96b39771a41acad0690553aecf896dd08
2016-04-11 17:35:52 +00:00
Greg Kaiser
f4d380537a Merge "ContextHubManager: Avoid bad NanoApp objects" into nyc-dev 2016-04-11 17:23:48 +00:00
Makoto Onuki
b29ec1a7e4 Merge "Add UserHandle to ShortcutInfo, and simplify LauncherApps APIs." into nyc-dev am: 390a813
am: 9a98e46

* commit '9a98e4679a64e8293a8b74677bb6b2839dae6a31':
  Add UserHandle to ShortcutInfo, and simplify LauncherApps APIs.

Change-Id: Ifb1f6d3331af119893007b46909e0e5ffcb210fc
2016-04-11 17:01:07 +00:00
Makoto Onuki
390a81302f Merge "Add UserHandle to ShortcutInfo, and simplify LauncherApps APIs." into nyc-dev 2016-04-11 16:45:10 +00:00
Greg Kaiser
cb83bd04b7 ContextHubManager: Avoid bad NanoApp objects
We provide a preferred constructor for the user which will
always generate a serializable NanoApp object.  While we
still support the other path, we throw a specific exception
when trying to serialize a bad NanoApp object to ease
debugging.

Change-Id: I7ee610f0fce2f0dd489526e4819f66035281024b
2016-04-11 08:27:10 -07:00
Clara Bayarri
c4e4274d9e Merge "Expose the Keyboard Shortcuts Helper in Activity" into nyc-dev am: 738ab04
am: 3f19243

* commit '3f192435a964c2c24073d1befe0c07e7eb37ff47':
  Expose the Keyboard Shortcuts Helper in Activity

Change-Id: Idaf11769a1fc78cb759ab1303a82ba1d354a3076
2016-04-11 09:52:19 +00:00
Clara Bayarri
738ab04fd9 Merge "Expose the Keyboard Shortcuts Helper in Activity" into nyc-dev 2016-04-11 09:43:16 +00:00
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
Kirill Grouchnikov
fd62b35758 Add @TestApi method to Spinner to test whether popup is showing.
Change-Id: I36e7f7c8ca6a69bdced3dd830e3ae0dde4181a4e
2016-04-08 17:56:47 -04:00
Bryce Lee
196a05724d Merge "Add granular control over disabled effects." into nyc-dev 2016-04-08 20:59:10 +00:00
Makoto Onuki
abe8442951 Add UserHandle to ShortcutInfo, and simplify LauncherApps APIs.
- Also fixes the bitmap recycle bug in the service.

Fixes 28053541

Change-Id: I2b244feda0f85c60e2c15af427fcad95ad5e6da5
2016-04-08 13:28:18 -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
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