Julia Reynolds
1ab0f123bb
Merge "Also use the notification's sound for the misc channel" into oc-dev am: ed8f49efdc
...
am: f6ca4cfcd2
Change-Id: I195ac4a4006cfc746b784f4f99d6fe42c93e40af
2017-04-17 16:42:07 +00:00
Julia Reynolds
f6ca4cfcd2
Merge "Also use the notification's sound for the misc channel" into oc-dev
...
am: ed8f49efdc
Change-Id: I268e2702a6fbe714276f38581493ef2a089007e8
2017-04-17 16:33:11 +00:00
TreeHugger Robot
ed8f49efdc
Merge "Also use the notification's sound for the misc channel" into oc-dev
2017-04-17 16:23:55 +00:00
Julia Reynolds
39e00e1203
Merge "Remove @removed method" into oc-dev am: bbcf5fba1c
...
am: 211d99d1b9
Change-Id: I9400d1f49af2e35771d402f2879c85e29e4604f0
2017-04-17 15:17:48 +00:00
Julia Reynolds
211d99d1b9
Merge "Remove @removed method" into oc-dev
...
am: bbcf5fba1c
Change-Id: Iae9bb928a90d172dfe74e9308a6d8283df734dc6
2017-04-17 15:09:24 +00:00
TreeHugger Robot
bbcf5fba1c
Merge "Remove @removed method" into oc-dev
2017-04-17 15:01:54 +00:00
Julia Reynolds
b9e712ebde
Also use the notification's sound for the misc channel
...
Even if it's nonexistent.
Test: runtest systemui-notification
Change-Id: I1167fdf10b776460de696657dd49ab6f2be85753
Fixes: 37414045
2017-04-17 14:33:30 +00:00
Todd Kennedy
56f715160e
Merge "expose the instant app installer component" into oc-dev am: 676590d060
...
am: 8d0dacb5b1
Change-Id: Id1df099740c6e108878c8f10aacceb59b42b0041
2017-04-17 14:32:38 +00:00
Todd Kennedy
8d0dacb5b1
Merge "expose the instant app installer component" into oc-dev
...
am: 676590d060
Change-Id: I48c05c84c2afba4bf68dfd42b834d8e6958f6744
2017-04-17 14:22:35 +00:00
TreeHugger Robot
676590d060
Merge "expose the instant app installer component" into oc-dev
2017-04-17 14:17:27 +00:00
Hugo Benichi
919f128a16
ConnectivityManager: unify prety printing of callback types.
...
And also remove some small code duplication (checkNotNull).
Test: built, flashed, runtest frameworks-net
Change-Id: Id6c13bca9d12f70b88806032e0a4fa198efbedc6
2017-04-17 08:50:58 +09:00
Stephen Chen
4c36c8a381
Merge "Remove ScoredNetwork.BADGING constants." into oc-dev am: e587591c5a
...
am: 45a1fa12c0
Change-Id: Ibade5d0264b49cc2e3a5f28af4d520ebff5b0c40
2017-04-15 09:17:51 +00:00
Stephen Chen
45a1fa12c0
Merge "Remove ScoredNetwork.BADGING constants." into oc-dev
...
am: e587591c5a
Change-Id: I7546e77a0a591ce25b2c771c30b4506d5666cc3f
2017-04-15 09:13:41 +00:00
TreeHugger Robot
e587591c5a
Merge "Remove ScoredNetwork.BADGING constants." into oc-dev
2017-04-15 09:04:35 +00:00
Jorim Jaggi
626eb77c16
Merge "Wallpaper color extraction API stub" into oc-dev am: 6acf7a7b45
...
am: 9b24dd3186
Change-Id: Iae905316d4a489de425d0dd8da1b0cf35c559f82
2017-04-15 05:02:07 +00:00
Jorim Jaggi
9b24dd3186
Merge "Wallpaper color extraction API stub" into oc-dev
...
am: 6acf7a7b45
Change-Id: I6d4e70f45b60fc76e017a982f70a2a7b14b3a3a9
2017-04-15 04:56:51 +00:00
Jorim Jaggi
6acf7a7b45
Merge "Wallpaper color extraction API stub" into oc-dev
2017-04-15 04:52:24 +00:00
Eugene Susla
1c6b5765bb
Merge "API for notification listener for Companioon apps" into oc-dev am: 0d88904744
...
am: 0fb1104b25
Change-Id: I33326544bd1eef9abc900ea13cb2fdf32ad06cbe
2017-04-15 04:28:02 +00:00
Eugene Susla
0fb1104b25
Merge "API for notification listener for Companioon apps" into oc-dev
...
am: 0d88904744
Change-Id: Ie6093be3e7699481473eeb597bc4d604728330a2
2017-04-15 04:22:48 +00:00
TreeHugger Robot
0d88904744
Merge "API for notification listener for Companioon apps" into oc-dev
2017-04-15 04:15:38 +00:00
Svetoslav Ganov
6359d85658
Merge "Add support for multiple fill contexts" into oc-dev am: 41200eac71
...
am: 721b28f029
Change-Id: I1e3da29514943c1e7476db8bc6a1cbba46b7a116
2017-04-15 03:37:56 +00:00
Svetoslav Ganov
721b28f029
Merge "Add support for multiple fill contexts" into oc-dev
...
am: 41200eac71
Change-Id: I9a66bc2d97efbc19fd0cbfd57dfb13323e3ab31a
2017-04-15 03:33:02 +00:00
Svetoslav Ganov
41200eac71
Merge "Add support for multiple fill contexts" into oc-dev
2017-04-15 03:29:13 +00:00
TreeHugger Robot
d98f26e4f3
Merge changes from topics 'network_specifier', 'networkspecifier' into oc-dev
...
* changes:
[CM] Unhide the NetworkSpecifier as object API
Make the NetworkSpecifier a class instead of a string.
Add test coverage for NetworkSpecifiers.
2017-04-15 02:16:14 +00:00
Eugene Susla
cf00adebec
API for notification listener for Companioon apps
...
Test: 1. Trigger the confitrmation dialog.
Ensure it looks exactly like the one from settings.
2. Call an API without associating the appa first
Ensure exception is thrown with a message mentioning the need to associate 1st
Change-Id: I94d4116e1988db869ed445ae3fd018c50590e3f4
2017-04-14 19:01:53 -07:00
Yohei Yukawa
03a4f5a225
Merge "Support flagNoPersonalizedLearning in layout XML" into oc-dev am: e61d56fb70
...
am: 7096e0e076
Change-Id: I8138d58c3fade77ea2311faa728224d0199ae3f6
2017-04-15 01:59:05 +00:00
Yohei Yukawa
7096e0e076
Merge "Support flagNoPersonalizedLearning in layout XML" into oc-dev
...
am: e61d56fb70
Change-Id: If566134ba9f8ac40cf73a92745b45262681531c9
2017-04-15 01:51:55 +00:00
Amith Yamasani
927232ebe6
Merge "BLE scan API using PendingIntent" into oc-dev am: 7859022e8e
...
am: 3eca1577fe
Change-Id: I226c5a770d41e3d096658da3148a4089fa3a29f3
2017-04-15 01:47:05 +00:00
TreeHugger Robot
e61d56fb70
Merge "Support flagNoPersonalizedLearning in layout XML" into oc-dev
2017-04-15 01:44:37 +00:00
Amith Yamasani
3eca1577fe
Merge "BLE scan API using PendingIntent" into oc-dev
...
am: 7859022e8e
Change-Id: Ic694cf7dae7e7c151155787da5b079699cec93ed
2017-04-15 01:41:29 +00:00
TreeHugger Robot
7859022e8e
Merge "BLE scan API using PendingIntent" into oc-dev
2017-04-15 01:34:08 +00:00
Lucas Dupin
c40608c041
Wallpaper color extraction API stub
...
Now it's possible to listen to changes on wallpaper colors by
registering a listener on WallpaperManager. It's also possible
to get the current wallpaper text color hints.
Bug: 36856508
Test: compilation
Change-Id: I5102cb7be9a4af60b85fc8913154a79dfe5c21a0
2017-04-14 18:33:08 -07:00
Dianne Hackborn
9ffd026cac
Merge "Introduce a new JobServiceEngine class." into oc-dev am: aaeb512331
...
am: 09d3418582
Change-Id: Id5a22d0d77f76cfeb85048dcc9e02edc5773e57d
2017-04-15 01:27:26 +00:00
Philip P. Moltmann
64429fe511
Merge "Remove autofillMode attribute" into oc-dev am: a05f1fdd93
...
am: a624433bf0
Change-Id: Idd7b711a67378287eb5a6da3374f2d84e4710a8c
2017-04-15 01:22:16 +00:00
Sudheer Shanka
c5827c0a1a
Merge "Add new api Activity.getStartInitiatedTime." into oc-dev am: 2359f016e2
...
am: 225e594388
Change-Id: I64b956ebf369aa19e42920d71fdcac7713ce2c32
2017-04-15 01:18:27 +00:00
Amith Yamasani
ded55c6ed7
Merge "MASTER_CLEAR action should not be public" into oc-dev am: baf1d7036e
...
am: 6c608ebafb
Change-Id: I76776f7f44a855bde12d6967ef4778523ae89f7a
2017-04-15 01:17:16 +00:00
Dianne Hackborn
09d3418582
Merge "Introduce a new JobServiceEngine class." into oc-dev
...
am: aaeb512331
Change-Id: I68e306a970096cdd7d65b13865f70081679759ec
2017-04-15 01:02:31 +00:00
Philip P. Moltmann
a624433bf0
Merge "Remove autofillMode attribute" into oc-dev
...
am: a05f1fdd93
Change-Id: Ib5a661b27a23e7dbaa277a3d3ea1d85a4ab7ba72
2017-04-15 00:56:44 +00:00
Dianne Hackborn
aaeb512331
Merge "Introduce a new JobServiceEngine class." into oc-dev
2017-04-15 00:55:55 +00:00
TreeHugger Robot
a05f1fdd93
Merge "Remove autofillMode attribute" into oc-dev
2017-04-15 00:50:51 +00:00
Stephen Chen
d831be95fb
Remove ScoredNetwork.BADGING constants.
...
Bug: 35323372
Bug: 35114358
Test: make, runtest --path
frameworks/base/core/tests/coretests/src/android/net/ScoredNetworkTest.java
Change-Id: I9640e374abe428235d94e0407d9d21f390550d2f
2017-04-15 00:40:58 +00:00
Svet Ganov
013efe173e
Add support for multiple fill contexts
...
When saving data filled by the user the platform provides to
an autofill provider the state of the UI allowing the provider
to interpret this state and store relevant information.
A limitation of the current design is that the fill provider
needs to interpret the screen content twice, once handling a
fill request and once handling a save request. To address this
we are introducing a id for each fill request allowing the
autofill provider to associate arbitrary state with each fill
request and store it in the client data bundle later passed
to save.
Another limitation of the current design is that if the screen
changes dynamically while the user interacts with the app the
UI state passed on save represents a static snapshot, therefore
it is not possible to the autofill provider to determine the
context in which the data in the UI was filled. We could
keep the views and have deltas for views being removed/added
/moved/changed but this is not enough as the fill provider
needs to know not only what changed but what changed for every
fill request and in one session there could be multiple fill
requests. To address this we provide a list of fill contexts
on save each of which has the id of the corresponding fill
request. This allows the fill provider to know the exact context
in which the data was popuplated and also use its custom client
state for this fill request if desired.
This change deprecates the old APIs and the new ones delegate
to the old ones. Once the clients migrate to the new APIs we
will remove the old ones.
Test: all autofill CTS tests pass
Change-Id: Idcebcc671aa3c078a305d8c358e225274fccc588
2017-04-14 17:37:31 -07:00
Makoto Onuki
58105199f5
resolve merge conflicts of 25e893c7d5d3 to master
...
Test: build
Change-Id: I43d3eb486d8a6600cfc793d6324b8fe23a241f0f
2017-04-14 17:19:17 -07:00
Sudheer Shanka
225e594388
Merge "Add new api Activity.getStartInitiatedTime." into oc-dev
...
am: 2359f016e2
Change-Id: I8a2ab94f67894736188fd62df8503dfa637ad9ed
2017-04-15 00:17:26 +00:00
Sudheer Shanka
2359f016e2
Merge "Add new api Activity.getStartInitiatedTime." into oc-dev
2017-04-15 00:09:32 +00:00
Svetoslav Ganov
dfcfee7a58
Merge "[DO NOT MERGE] Fix associations serialization optimization bug" into oc-dev am: 21da54587b
...
am: 3b3d9f8415
Change-Id: If448d00811124f5a12d9cae166e2c81a83d13f02
2017-04-15 00:02:01 +00:00
Roozbeh Pournader
59e987e922
Merge "Support overriding display locale for SuggestedLocaleAdapter" into oc-dev am: 2a05c5edb7
...
am: 2ad47527f8
Change-Id: Ib0639bc5e7b5e761d800b3e87915b59cd8523bb0
2017-04-15 00:00:36 +00:00
Amith Yamasani
6c608ebafb
Merge "MASTER_CLEAR action should not be public" into oc-dev
...
am: baf1d7036e
Change-Id: I361e8369ec16da7d032680530223463228921616
2017-04-14 23:57:05 +00:00
TreeHugger Robot
baf1d7036e
Merge "MASTER_CLEAR action should not be public" into oc-dev
2017-04-14 23:50:26 +00:00
Makoto Onuki
25e893c7d5
Merge "Fix the wrong IMPORTANCE_ values." into oc-dev
...
am: 5f085792f6
Change-Id: I263f5cd22bf45a0b7f2f8599d28807e6464a5c2c
2017-04-14 23:39:03 +00:00