Automerger Merge Worker
9a9b087541
Merge "Merge "[Media ML] Support customization for volume keys" into rvc-dev am: cd03d90a72 am: b8184410c6" into rvc-d1-dev-plus-aosp am: 9d40364e06
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11862405
Change-Id: Ifb66061a2fea32a462a7dc85c10723f28d1db5c2
2020-06-16 04:55:38 +00:00
Automerger Merge Worker
48d7a52d5f
Merge "Merge "[Media ML] Support customization for volume keys" into rvc-dev am: cd03d90a72 am: ad8ebec2e7 am: a0c6eadca3" into rvc-qpr-dev-plus-aosp
2020-06-16 04:55:35 +00:00
TreeHugger Robot
a52570b354
Merge "[Media ML] Support customization for volume keys" into rvc-dev am: cd03d90a72 am: ad8ebec2e7 am: a0c6eadca3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11862405
Change-Id: I6dbd82cedffbe732409a778719495a9192ffcb2a
2020-06-16 04:55:24 +00:00
TreeHugger Robot
6fe8055c9d
Merge "[Media ML] Support customization for volume keys" into rvc-dev am: cd03d90a72 am: ad8ebec2e7 am: a4e7238ff5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11862405
Change-Id: I5906505229368c87c09bb05c1273483aeaa6ac94
2020-06-16 04:55:21 +00:00
Automerger Merge Worker
9d40364e06
Merge "Merge "[Media ML] Support customization for volume keys" into rvc-dev am: cd03d90a72 am: b8184410c6" into rvc-d1-dev-plus-aosp
2020-06-16 04:44:15 +00:00
TreeHugger Robot
a0c6eadca3
Merge "[Media ML] Support customization for volume keys" into rvc-dev am: cd03d90a72 am: ad8ebec2e7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11862405
Change-Id: Ie2f364f5d67093821a12cc71ffe5f9db941f65ce
2020-06-16 04:44:00 +00:00
TreeHugger Robot
b9ca8a3fd9
Merge "[Media ML] Support customization for volume keys" into rvc-dev am: cd03d90a72 am: b8184410c6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11862405
Change-Id: I7a6e1217e61466bd33fe8ba46d475c0caa896ec2
2020-06-16 04:43:59 +00:00
TreeHugger Robot
a4e7238ff5
Merge "[Media ML] Support customization for volume keys" into rvc-dev am: cd03d90a72 am: ad8ebec2e7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11862405
Change-Id: I4b17b515959678a5ffb499ec47a66b70d30bd96d
2020-06-16 04:43:50 +00:00
TreeHugger Robot
b8184410c6
Merge "[Media ML] Support customization for volume keys" into rvc-dev am: cd03d90a72
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11862405
Change-Id: Ie86ded6787f3101357591d569fcdb1960c5510a3
2020-06-16 04:34:16 +00:00
TreeHugger Robot
ad8ebec2e7
Merge "[Media ML] Support customization for volume keys" into rvc-dev am: cd03d90a72
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11862405
Change-Id: Icc81cb58daa69b063b3273c298954a642b8f687f
2020-06-16 04:34:14 +00:00
TreeHugger Robot
cd03d90a72
Merge "[Media ML] Support customization for volume keys" into rvc-dev
2020-06-16 04:23:06 +00:00
wilsonshih
5cac2a0279
Force relayout when wallpaper engine become visible.
...
After 9118c9b the surface can be destroy after the window state become
invisible, since WallpaperService copy the surface from WMS and it is
not implement with ViewRootImpl, WallpaperService#Engine should call
relayout to get new surface when client need to redraw it.
Bug: 158955956
Test: verify the wallpaper can show by launch LiveWallpaperChange with
live wallpaper and push/pull it from recents several times.
Test: atest WallpaperServiceTest ImageWallpaperTest
Change-Id: I79f97df61696eea325183e9b9057cbb10ce8cc66
2020-06-16 12:00:24 +08:00
Automerger Merge Worker
6c5cc77193
Merge "Merge "[automerger skipped] Merge "Test extra info sent to NetworkMonitor" into rvc-dev am: 8202b399da am: a4e00fbcd3 -s ours" into rvc-d1-dev-plus-aosp am: 51bfc92ee2 -s ours" into rvc-qpr-dev-plus-aosp
2020-06-16 03:58:31 +00:00
Automerger Merge Worker
494ee46776
Merge "[automerger skipped] Merge "Test extra info sent to NetworkMonitor" into rvc-dev am: 8202b399da am: a4e00fbcd3 -s ours" into rvc-d1-dev-plus-aosp am: 51bfc92ee2 -s ours
...
am skip reason: Change-Id I4f827664c528bea30cc957a0a617dd37693f4460 with SHA-1 4d2791b1a6 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11862409
Change-Id: Ia59f937086c386b22c727aef90099af62229d012
2020-06-16 03:58:24 +00:00
Automerger Merge Worker
274be42323
Merge "[automerger skipped] Merge "Test extra info sent to NetworkMonitor" into rvc-dev am: 8202b399da am: a4e00fbcd3 am: 702c4e7abb -s ours" into rvc-qpr-dev-plus-aosp
2020-06-16 03:58:23 +00:00
TreeHugger Robot
2a5a1a9660
[automerger skipped] Merge "Test extra info sent to NetworkMonitor" into rvc-dev am: 8202b399da am: a4e00fbcd3 am: 702c4e7abb -s ours
...
am skip reason: Change-Id I4f827664c528bea30cc957a0a617dd37693f4460 with SHA-1 2153861f8e is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11862409
Change-Id: I5fdebc339ea29f89fc07eb5d7843db24f27d23cd
2020-06-16 03:58:13 +00:00
TreeHugger Robot
7085cf6ac5
[automerger skipped] Merge "Test extra info sent to NetworkMonitor" into rvc-dev am: 8202b399da -s ours am: 2b89a1680d -s ours am: 67a9005500 -s ours
...
am skip reason: Change-Id I4f827664c528bea30cc957a0a617dd37693f4460 with SHA-1 2153861f8e is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11862409
Change-Id: I3e98eecb7de50eea0bb57bf62cb5201fac7c065d
2020-06-16 03:58:10 +00:00
Automerger Merge Worker
51bfc92ee2
Merge "[automerger skipped] Merge "Test extra info sent to NetworkMonitor" into rvc-dev am: 8202b399da am: a4e00fbcd3 -s ours" into rvc-d1-dev-plus-aosp
2020-06-16 03:42:40 +00:00
TreeHugger Robot
702c4e7abb
Merge "Test extra info sent to NetworkMonitor" into rvc-dev am: 8202b399da am: a4e00fbcd3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11862409
Change-Id: I78d12c6165478ddb5dfd8193534ae7c69350eeb4
2020-06-16 03:42:23 +00:00
TreeHugger Robot
efe21f3b6e
[automerger skipped] Merge "Test extra info sent to NetworkMonitor" into rvc-dev am: 8202b399da am: a4e00fbcd3 -s ours
...
am skip reason: Change-Id I4f827664c528bea30cc957a0a617dd37693f4460 with SHA-1 2153861f8e is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11862409
Change-Id: I7a0a49a16ce67ddcf86ea6ad4d7ccda9f15181e9
2020-06-16 03:42:23 +00:00
TreeHugger Robot
67a9005500
[automerger skipped] Merge "Test extra info sent to NetworkMonitor" into rvc-dev am: 8202b399da -s ours am: 2b89a1680d -s ours
...
am skip reason: Change-Id I4f827664c528bea30cc957a0a617dd37693f4460 with SHA-1 2153861f8e is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11862409
Change-Id: Iad71a237e3bac6340747e86a77c5569fea0bfb42
2020-06-16 03:42:22 +00:00
TreeHugger Robot
a4e00fbcd3
Merge "Test extra info sent to NetworkMonitor" into rvc-dev am: 8202b399da
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11862409
Change-Id: Ie8f59a561f7184bcfbbe38e99da78ce092475ff8
2020-06-16 03:28:44 +00:00
TreeHugger Robot
2b89a1680d
[automerger skipped] Merge "Test extra info sent to NetworkMonitor" into rvc-dev am: 8202b399da -s ours
...
am skip reason: Change-Id I4f827664c528bea30cc957a0a617dd37693f4460 with SHA-1 2153861f8e is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11862409
Change-Id: I63ad698bb29d3770e879f27b155a9fc656a80836
2020-06-16 03:28:39 +00:00
Feng Cao
5d6243e47a
Fix a bug to not complete the augmented autofill request when fill window is shown
...
* The bug was introduced in ag/11784240 causing the existing CTS test to
fail: android.autofillservice.cts.augmented.AugmentedLoginActivityTest
#testCancellationSignalCalled_retriggerAugmentedAutofill
* Basically when the dropdown fill window is displayed, we should not mark
the augmented autofill request as complete
Test: atest android.autofillservice.cts.augmented
Test: atest android.autofillservice.cts.inline
Bug: 158864213
Bug: 158038231
Change-Id: Ifb75189c1ba3183c99516bfb9a7053524f4bbddc
2020-06-15 20:23:17 -07:00
TreeHugger Robot
fdf91dcc7d
Merge "Ensure detached children aren't parented to new SurfaceControl" into rvc-dev am: ac3ce5c425 am: 56a844f7b7 am: 70fa6f16e8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11817537
Change-Id: I9c82b76d099ccd1955bf655ed28fc745f00aacba
2020-06-16 03:16:31 +00:00
Automerger Merge Worker
6c84521962
Merge "Merge "Ensure detached children aren't parented to new SurfaceControl" into rvc-dev am: ac3ce5c425 am: ae3ad24751" into rvc-d1-dev-plus-aosp am: a5908b9df1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11817537
Change-Id: I2e9da66bcd1078e3ac2acd32a2691c2af4634f88
2020-06-16 03:16:18 +00:00
TreeHugger Robot
aed773b819
Merge "Ensure detached children aren't parented to new SurfaceControl" into rvc-dev am: ac3ce5c425 am: ae3ad24751 am: 48520dea37
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11817537
Change-Id: I1df46400795b25531026cfd9589c3f2afdc852d3
2020-06-16 03:16:02 +00:00
Automerger Merge Worker
5c46fd1e5b
Merge "Merge "Send empty response to IME when autofill session is destroyed" into rvc-dev am: 756740d9f4 am: 8615057a06 am: 253d093282" into rvc-qpr-dev-plus-aosp
2020-06-16 03:15:57 +00:00
Automerger Merge Worker
b2456ebd90
Merge "Merge "Send empty response to IME when autofill session is destroyed" into rvc-dev am: 756740d9f4 am: 617c3eae5e am: 5299165188" into rvc-qpr-dev-plus-aosp
2020-06-16 03:15:55 +00:00
TreeHugger Robot
1bb82b9e46
Merge "Send empty response to IME when autofill session is destroyed" into rvc-dev am: 756740d9f4 am: 8615057a06 am: 253d093282
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11825554
Change-Id: I865bd13abe7a1df74eac14fad7cbebf0c195a8e3
2020-06-16 03:15:51 +00:00
TreeHugger Robot
54f3c0027a
Merge "Send empty response to IME when autofill session is destroyed" into rvc-dev am: 756740d9f4 am: 617c3eae5e am: e801f6329b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11825554
Change-Id: I0d8d69e5fc3119fef0863b5506246f78458d1c64
2020-06-16 03:15:40 +00:00
TreeHugger Robot
00fdeec670
Merge "Send empty response to IME when autofill session is destroyed" into rvc-dev am: 756740d9f4 am: 617c3eae5e am: 5299165188
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11825554
Change-Id: Icdd3cfc4f2071a619a7b67e6c8457549d5031c94
2020-06-16 03:15:39 +00:00
TreeHugger Robot
8202b399da
Merge "Test extra info sent to NetworkMonitor" into rvc-dev
2020-06-16 03:13:01 +00:00
TreeHugger Robot
70fa6f16e8
Merge "Ensure detached children aren't parented to new SurfaceControl" into rvc-dev am: ac3ce5c425 am: 56a844f7b7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11817537
Change-Id: Ie9a0ce3e1d7a2f9f70ed0e66ce3ff6d4e3857c94
2020-06-16 03:05:18 +00:00
Automerger Merge Worker
a5908b9df1
Merge "Merge "Ensure detached children aren't parented to new SurfaceControl" into rvc-dev am: ac3ce5c425 am: ae3ad24751" into rvc-d1-dev-plus-aosp
2020-06-16 03:05:16 +00:00
TreeHugger Robot
48520dea37
Merge "Ensure detached children aren't parented to new SurfaceControl" into rvc-dev am: ac3ce5c425 am: ae3ad24751
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11817537
Change-Id: Ide0906020f10c23011c8d71fd0bbdeb7bf2b301b
2020-06-16 03:05:12 +00:00
TreeHugger Robot
11444c0d01
Merge "Ensure detached children aren't parented to new SurfaceControl" into rvc-dev am: ac3ce5c425 am: ae3ad24751
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11817537
Change-Id: Ie53c2123322fa20e74cd8bcd07109a89cc77907b
2020-06-16 03:05:01 +00:00
TreeHugger Robot
253d093282
Merge "Send empty response to IME when autofill session is destroyed" into rvc-dev am: 756740d9f4 am: 8615057a06
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11825554
Change-Id: I035618a3f1d875b00cdccc8705cad18534155e12
2020-06-16 03:04:59 +00:00
TreeHugger Robot
5299165188
Merge "Send empty response to IME when autofill session is destroyed" into rvc-dev am: 756740d9f4 am: 617c3eae5e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11825554
Change-Id: Icb8c59061500f40b0bedb6a3c982b53b0ed240c1
2020-06-16 03:04:59 +00:00
TreeHugger Robot
e801f6329b
Merge "Send empty response to IME when autofill session is destroyed" into rvc-dev am: 756740d9f4 am: 617c3eae5e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11825554
Change-Id: I7b19725303b7ce80c60cf985bf225d6246b8a5c4
2020-06-16 03:04:41 +00:00
Automerger Merge Worker
ba7d5bb46e
Merge "Merge "Add tron metrics to track iorap." into rvc-dev am: f40975ee76 am: 17eca29097" into rvc-d1-dev-plus-aosp am: 65dce9a9ac
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11833622
Change-Id: I9bc51931f8542c64d5d452f7240ec742913b3709
2020-06-16 02:58:43 +00:00
TreeHugger Robot
ae3ad24751
Merge "Ensure detached children aren't parented to new SurfaceControl" into rvc-dev am: ac3ce5c425
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11817537
Change-Id: I658caccf155447f65731b4433c399a8894d9ad3b
2020-06-16 02:58:34 +00:00
TreeHugger Robot
56a844f7b7
Merge "Ensure detached children aren't parented to new SurfaceControl" into rvc-dev am: ac3ce5c425
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11817537
Change-Id: I271edcea4601cfee5bc507b250d6e7519acebf77
2020-06-16 02:58:32 +00:00
TreeHugger Robot
67a4d3d095
Merge "Add tron metrics to track iorap." into rvc-dev am: f40975ee76 am: 1c53e8cfa4 am: 74459cd347
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11833622
Change-Id: Ie491c16ef55537b90731f15690d340c01ad016a4
2020-06-16 02:58:27 +00:00
TreeHugger Robot
8615057a06
Merge "Send empty response to IME when autofill session is destroyed" into rvc-dev am: 756740d9f4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11825554
Change-Id: Iba5921069f468b8a2b72665360316eb7f807df75
2020-06-16 02:58:20 +00:00
TreeHugger Robot
617c3eae5e
Merge "Send empty response to IME when autofill session is destroyed" into rvc-dev am: 756740d9f4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11825554
Change-Id: I5935de100087833a3bfdbda2e1a5ed14d3976897
2020-06-16 02:58:18 +00:00
TreeHugger Robot
4441700f86
Merge "Add tron metrics to track iorap." into rvc-dev am: f40975ee76 am: 1c53e8cfa4 am: cd8eece1c1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11833622
Change-Id: I99aee6f0d6e0c10d7592dadd224164246e7ce5d0
2020-06-16 02:57:58 +00:00
Evan Rosky
889f49683f
Use actual resizability for split-screen operations
...
Split-screen and activity-start were relying on resizeMode,
but that is what the activity requests vs how the system
actually treats a given task/activity. This caused some
inconsistencies in how non-resizable things were handled
when the developer option to force resizability was turned
on.
Also needed to fix an issue where non-leaf tasks would
get stuck with an out-dated intent. In particular, this
happened with the root HOME task which meant its
resizeMode could never change from that of FallbackHome.
Bug: 158514252
Test: enable force resizable in dev options and then launch
camera into secondary split.
Change-Id: If06d047813315f39894bead19d2cbe0c9444f254
2020-06-15 19:57:55 -07:00
TreeHugger Robot
ac3ce5c425
Merge "Ensure detached children aren't parented to new SurfaceControl" into rvc-dev
2020-06-16 02:56:50 +00:00
TreeHugger Robot
756740d9f4
Merge "Send empty response to IME when autofill session is destroyed" into rvc-dev
2020-06-16 02:47:47 +00:00