Automerger Merge Worker
f92bb56b1e
Merge "Merge "Add experience for shortcut-less convos" into rvc-dev am: bc78548368 am: a1343ba28c" into rvc-d1-dev-plus-aosp am: 94904932de am: b795cc0707
...
Change-Id: Ibc47bb68cc827b466e1843caca899603892833a0
2020-04-28 14:20:50 +00:00
TreeHugger Robot
a1343ba28c
Merge "Add experience for shortcut-less convos" into rvc-dev am: bc78548368
...
Change-Id: I5082e8c7b34c956c8fb06d621dadc647f3841f0d
2020-04-28 14:02:27 +00:00
Julia Reynolds
8582df5cc7
Add experience for shortcut-less convos
...
- no conversation specific controls
- no 'bubble this' button
- turn off interim placeholder channels
- fix msg tracking - only shortcut-less notifs matter
Test: atest
Bug: 154814754
Change-Id: Ia04ce496d4e7b2f353c71865f338b5229192c395
2020-04-28 12:11:47 +00:00
TreeHugger Robot
713e9bdb88
Merge "Support WRAP_CONTENT in InlineSuggestion#inflate" into rvc-dev am: 5e9aed81d0 am: 820cf90774 am: be1ec62c81 am: ad5f34069a
...
Change-Id: I021c1d5c7adafc1590bba0a1ec431051b7b3883e
2020-04-28 00:40:43 +00:00
TreeHugger Robot
820cf90774
Merge "Support WRAP_CONTENT in InlineSuggestion#inflate" into rvc-dev am: 5e9aed81d0
...
Change-Id: I5c6fe8bdbe744e1ecdadfacb9f57b7b374d65ee4
2020-04-28 00:05:07 +00:00
Feng Cao
bd26abbc5b
Support WRAP_CONTENT in InlineSuggestion#inflate
...
Test: atest android.autofillservice.cts.inline
Bug: 154887895
Change-Id: Ie420bd40e8f0fb7d6e6b1e47ed0f41dc3f85b25e
2020-04-27 15:12:14 -07:00
TYM Tsai
41447be309
Merge "Filter the content of the Bundles used as extras and styling APIs" into rvc-dev am: 4ddfdaf641 am: 5c913aeacc am: 6cce28ebbc am: 009fb7ec44
...
Change-Id: I4d317f36033a59baf9001f7017ffd3beffc20c2b
2020-04-24 09:49:21 +00:00
TYM Tsai
5c913aeacc
Merge "Filter the content of the Bundles used as extras and styling APIs" into rvc-dev am: 4ddfdaf641
...
Change-Id: I6bf4e92eeac9bcaece4cb5501f644304f3e45fee
2020-04-24 08:56:48 +00:00
TYM Tsai
850c8129e6
Filter the content of the Bundles used as extras and styling APIs
...
Adds filter to prevent passing binder objects in the extras and styling
APIs for inline suggestions. Avoids these to be used to send over remote
objects for Autofill provider and IME to communicate through private APIs
bypassing the OS.
Bug: 152316540
Test: atest CtsAutoFillServiceTestCases
Test: atest InlineSuggestionsRequestTest
Change-Id: I00940a845ed0e2546cbe09fa36e2439869c2f783
2020-04-22 14:41:07 +08:00
Julia Reynolds
27bee7bfc5
Merge "Update default for conversations in DND" into rvc-dev am: 03d5c91379
...
Change-Id: Ia990e8ae67baced456f9a55f6018967d32080319
2020-04-21 10:54:39 +00:00
TreeHugger Robot
fa422e8d8d
Merge "Cleaning up resources on mount destruction." into rvc-dev am: 4e16915321
...
Change-Id: Iec575caccad04d0d70f380ccecb7083893b31276
2020-04-21 10:03:45 +00:00
Julia Reynolds
32585a841f
Merge "Update default for conversations in DND" into rvc-dev am: 03d5c91379 am: 896d10366d am: 48c0abe90d am: 6cbd134da4
...
Change-Id: I4764158203cb2fc11c587145b949814a6c905b62
2020-04-20 20:44:16 +00:00
Julia Reynolds
48c0abe90d
Merge "Update default for conversations in DND" into rvc-dev am: 03d5c91379 am: 896d10366d
...
Change-Id: I0126928904258ddd57d038664ed17d1dc60d160a
2020-04-20 19:53:10 +00:00
Julia Reynolds
96c9c4f967
Update default for conversations in DND
...
Including a one time reset of dogfooders/dev preview users
Test: manual - value is reset on first boot
Test: manual - change value, reboot, value is maintained
Fixes: 154234926
Change-Id: I5e4b338d6d7cc30dec1b12d31c3f1461c6f664cc
2020-04-20 13:52:53 -04:00
Nicholas Ambur
b850ad1f19
Merge "add KeyphraseEnrollmentInfo to TestApi" into rvc-dev am: 01b4d5cb13
...
Change-Id: I249a35d9bff1465941d27a490eeb18f722d389cd
2020-04-20 00:00:21 +00:00
TreeHugger Robot
25cbbc2719
Merge "Cleaning up resources on mount destruction." into rvc-dev am: 4e16915321 am: db63e03081 am: d5b6570ac2 am: 45695bed12
...
Change-Id: I572348eae960349dc9b17651f946013ad664d7dd
2020-04-18 07:47:36 +00:00
TreeHugger Robot
d5b6570ac2
Merge "Cleaning up resources on mount destruction." into rvc-dev am: 4e16915321 am: db63e03081
...
Change-Id: I9007bdfe1791d0366bcda1a39159781379f29bc4
2020-04-18 07:06:47 +00:00
TreeHugger Robot
4e16915321
Merge "Cleaning up resources on mount destruction." into rvc-dev
2020-04-18 06:35:35 +00:00
Alex Buynytskyy
9a54579ac5
Cleaning up resources on mount destruction.
...
DataLoaderStub's lifetime is controlled externally, but we want to
release resources ASAP.
Bug: b/153874006
Test: atest PackageManagerShellCommandTest PackageManagerShellCommandIncrementalTest IncrementalServiceTest
Change-Id: I34035f36d1fe4ed0e4916014d859feb7fe2c0a09
2020-04-17 22:07:10 -07:00
Nicholas Ambur
61c8760748
Merge "add KeyphraseEnrollmentInfo to TestApi" into rvc-dev am: 01b4d5cb13 am: ac42a7c999
...
Change-Id: I8ba49630cc89cda95ba359b8c06745e0231ca527
2020-04-18 02:51:57 +00:00
Nicholas Ambur
d3c1f27b0c
add KeyphraseEnrollmentInfo to TestApi
...
KeyphraseEnrollmentInfo is used for testing the system enrollment
application support within GTS.
Bug: 153264697
Test: gts-tradefed run gts-dev -m GtsAssistIntentTestCases \
-t com.google.android.assist.gts.KeyphraseModelManagerTest# \
testAllSystemKeyphrasesAndLocales
Change-Id: I66558cf849f2815f2c917d128f9f9cc0673750ef
Merged-In: I66558cf849f2815f2c917d128f9f9cc0673750ef
2020-04-17 22:12:13 +00:00
Nicholas Ambur
b766f2d8bf
Merge "add KeyphraseEnrollmentInfo to TestApi"
2020-04-17 22:04:29 +00:00
Nicholas Ambur
d94f1f7c3c
add KeyphraseEnrollmentInfo to TestApi
...
KeyphraseEnrollmentInfo is used for testing the system enrollment
application support within GTS.
Bug: 153264697
Test: gts-tradefed run gts-dev -m GtsAssistIntentTestCases \
-t com.google.android.assist.gts.KeyphraseModelManagerTest# \
testAllSystemKeyphrasesAndLocales
Change-Id: I66558cf849f2815f2c917d128f9f9cc0673750ef
2020-04-16 22:02:20 -07:00
TreeHugger Robot
902eb5c82a
Merge "Remove android.view.inline deprecated API." into rvc-dev am: 9f11dd4b64 am: e90910c187 am: e1f3b61a52 am: e211621458
...
Change-Id: I446525769ce2f402761d7b087c886794be56c3bd
2020-04-16 02:17:57 +00:00
TreeHugger Robot
e1f3b61a52
Merge "Remove android.view.inline deprecated API." into rvc-dev am: 9f11dd4b64 am: e90910c187
...
Change-Id: I0ac83355ba04c9ef9ef2f9c887294c36f0e273a9
2020-04-16 01:48:09 +00:00
TreeHugger Robot
55ae33c6e6
Merge "Remove android.view.inline deprecated API." into rvc-dev am: 9f11dd4b64
...
Change-Id: Ib03f26c539fb48876d451ac275e788857cdbf0f7
2020-04-16 01:26:35 +00:00
Galia Peycheva
1e076965bf
Merge "Remove usage of low profile in DreamService" into rvc-dev am: 652a8a65f3 am: 414784e729 am: 19899ef9ac am: bd59e5a95b
...
Change-Id: Ic6601f139df4bc71a7924597e05ae5032661878e
2020-04-16 00:36:40 +00:00
TreeHugger Robot
03565ac7f2
Merge "The notification archive should follow history setting" into rvc-dev am: 64fb27fcdc am: afeda30ef0 am: 4534065020 am: f718857fb5 am: 6bbd816810
...
Change-Id: I18b8d1935b3c756d4c66cd3f93636c4a2c12eeab
2020-04-16 00:03:03 +00:00
Adam He
3f8cdb51b4
Remove android.view.inline deprecated API.
...
Bug: 152912563
Test: atest android.autofillservice.cts.inline
Change-Id: I95f3b1281e48c9319e96eabc53e81d524bf720ff
2020-04-15 16:31:21 -07:00
Galia Peycheva
414784e729
Merge "Remove usage of low profile in DreamService" into rvc-dev am: 652a8a65f3
...
Change-Id: I23b87cefdba4d2b8984f01ffcbbb2ac8191f0644
2020-04-15 20:51:38 +00:00
Galia Peycheva
652a8a65f3
Merge "Remove usage of low profile in DreamService" into rvc-dev
2020-04-15 20:35:00 +00:00
Galia Peycheva
4d3aaf6980
Remove usage of low profile in DreamService
...
The low profile in DreamService was used to hide the status bar and
navigation bar. Now this is done by
WindowInsetController.hide(systemBars()) in DreamActivity.
Bug: 151749301
Test: m && flash && verify that system bars don't show up
Change-Id: I8fc9ca67262e92422afb472ccd76ec561c90f66d
2020-04-15 20:01:28 +02:00
TreeHugger Robot
afeda30ef0
Merge "The notification archive should follow history setting" into rvc-dev am: 64fb27fcdc
...
Change-Id: Iea2f5a48bf930d3a4505a583e7962a3e94fd0c36
2020-04-15 17:41:53 +00:00
Julia Reynolds
b5535c6faa
The notification archive should follow history setting
...
Test: atest
Fixes: 153677280
Change-Id: I9b2ae1ecd1cc8b42ab715ee033879f295949a9ba
2020-04-15 15:29:32 +00:00
Galia Peycheva
7c4d0f5963
Merge "Fix DreamService not finishing correctly" into rvc-dev am: e7eee891b4 am: e66d812819 am: 1c9acde6cc am: 6ce18f4cbe
...
Change-Id: Ifa5a4e63efd4c7b425b7efd36719f8b3bc80f9b4
2020-04-14 18:27:18 +00:00
Galia Peycheva
e66d812819
Merge "Fix DreamService not finishing correctly" into rvc-dev am: e7eee891b4
...
Change-Id: Ia9c5f5254029d2058e1ddb6cb55b077d7d955f62
2020-04-14 17:22:19 +00:00
Galia Peycheva
e7eee891b4
Merge "Fix DreamService not finishing correctly" into rvc-dev
2020-04-14 17:11:45 +00:00
Galia Peycheva
95b12348eb
Fix DreamService not finishing correctly
...
CL assigns null to DreamService.mActivity when the DecorView of the
main window is detached (in onViewDetachedFromWindow()). This is also
when the Window is detached, so at that point the DreamService doesn't
care about the DreamActivity.
Fix: 152994058
Test: atest DreamManagerServiceTests
Change-Id: I716f443b2876a2db57df999a551eee31e98ab4f1
2020-04-14 16:42:10 +02:00
Joanne Chung
5ba1ee6c6e
Merge "Pass augmented client state to the event history." into rvc-dev am: ba52b860f7 am: 8b1c72ab5d am: 3856799ee7 am: 18cbd940da
...
Change-Id: I73b3304bd1ecc2d01f8b286d9015258e32069144
2020-04-14 08:49:25 +00:00
Joanne Chung
8b1c72ab5d
Merge "Pass augmented client state to the event history." into rvc-dev am: ba52b860f7
...
Change-Id: Id1fbeda4f2b56cd8d8ee9d43ee67deb38d847393
2020-04-14 07:30:56 +00:00
Joanne Chung
ba52b860f7
Merge "Pass augmented client state to the event history." into rvc-dev
2020-04-14 07:16:02 +00:00
Yurii Zubrytskyi
6c4f3861ef
[incfs] Fix a leaked pending_reads FD am: 4e21986e59 am: 3efaf9879f am: d411f6756f am: 005c35a63f
...
Change-Id: I5820c39052afa7610613f1773621c405c310f982
2020-04-10 16:15:02 +00:00
Joanne Chung
5edb1aed08
Pass augmented client state to the event history.
...
Bug: 153030079
Test: manual
Test: atest android.autofillservice.cts.inline.\
InlineAugmentedLoginActivityTest
Change-Id: Ida14605296b9dcffe5ee55e0fb4612350d1629af
2020-04-10 23:08:21 +08:00
Yurii Zubrytskyi
3efaf9879f
[incfs] Fix a leaked pending_reads FD am: 4e21986e59
...
Change-Id: I726bf0ed15f144af87893f8b86b464c0d6bf6581
2020-04-10 15:05:41 +00:00
Yurii Zubrytskyi
4e21986e59
[incfs] Fix a leaked pending_reads FD
...
Bug: 153670585
Test: adb install/uninstall a dozen times
Change-Id: Iac05b5dc3792e55c2f103ac08bdd734b3b398882
2020-04-10 14:49:31 +00:00
TreeHugger Robot
69be4f3e3f
Merge "Pass inline suggestions renderer info Bundle to Frameworks and IME" into rvc-dev am: c0404ff5e5 am: f0694ae747 am: bceeeb4e5b am: 3e4073c1c4
...
Change-Id: Ic80368307afc1d002e5b8c36089202c270b938be
2020-04-10 03:52:08 +00:00
TreeHugger Robot
f0694ae747
Merge "Pass inline suggestions renderer info Bundle to Frameworks and IME" into rvc-dev am: c0404ff5e5
...
Change-Id: Id87ff55077f4bad04e06d10b324339cda9c54904
2020-04-10 02:39:56 +00:00
TreeHugger Robot
c0404ff5e5
Merge "Pass inline suggestions renderer info Bundle to Frameworks and IME" into rvc-dev
2020-04-10 02:19:23 +00:00
Sergey Volnov
2080bf02c3
Merge "Fix Content Capture Data Share" into rvc-dev am: 51ecd453b3 am: 520aa4ce18 am: e917edaa09 am: ba7b0e67fe
...
Change-Id: I96e28029b865671877ebd80baffa69bff99a47a0
2020-04-09 23:36:10 +00:00
Sergey Volnov
520aa4ce18
Merge "Fix Content Capture Data Share" into rvc-dev am: 51ecd453b3
...
Change-Id: Ieed6a7224d8a0a3818e54c4d5f0596aa70bc79f0
2020-04-09 22:41:08 +00:00