Automerger Merge Worker
9bc775193f
Merge "Merge "Don't export HeapDumpProvider." into rvc-dev am: 3b6512d824 am: 771ea87c88" into sc-dev am: d41a4940cf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14901700
Change-Id: I1830947c4ef004813bb970586b387fde4655383d
2021-06-29 19:07:15 +00:00
TreeHugger Robot
4d45c0b4bf
Merge "Don't export HeapDumpProvider." into rvc-dev am: 3b6512d824 am: 4e34795938 am: bb031b58a9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14901700
Change-Id: I7b1929519d15eba9c14182006e7df881095fb590
2021-06-29 19:06:59 +00:00
TreeHugger Robot
7508b4f2f7
Merge "Start the web help page in the correct user" into sc-dev am: a8fd69468a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15110194
Change-Id: Iaec503fc39465e11fcdf035cc1ebda80df174059
2021-06-29 19:06:46 +00:00
Fabian Kozynski
fd7b9f0543
Merge "Change tile states strings to constants" into sc-dev am: e9d4150cd4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15144191
Change-Id: I61e417c118324fe86f965d8087e9509d29d09e93
2021-06-29 19:05:42 +00:00
Kevin Chyn
3c25e77696
Merge "Update intent for requesting parental consent" into sc-dev am: 1798ddbcd6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15132460
Change-Id: I79ca4502f1c74f7ffe369836ad61fe2081c5bd1f
2021-06-29 19:04:21 +00:00
Automerger Merge Worker
d41a4940cf
Merge "Merge "Don't export HeapDumpProvider." into rvc-dev am: 3b6512d824 am: 771ea87c88" into sc-dev
2021-06-29 19:04:11 +00:00
TreeHugger Robot
7bd6f0db94
Merge "Don't export HeapDumpProvider." into rvc-dev am: 3b6512d824 am: 771ea87c88
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14901700
Change-Id: I7c9e07510333883da8febd013768f4b489467931
2021-06-29 19:03:48 +00:00
TreeHugger Robot
bb031b58a9
Merge "Don't export HeapDumpProvider." into rvc-dev am: 3b6512d824 am: 4e34795938
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14901700
Change-Id: I6f49cd94d49c4b7c9bf5852c2c9c8b5334b71dfb
2021-06-29 19:03:21 +00:00
TreeHugger Robot
a8fd69468a
Merge "Start the web help page in the correct user" into sc-dev
2021-06-29 18:55:24 +00:00
Fabian Kozynski
e9d4150cd4
Merge "Change tile states strings to constants" into sc-dev
2021-06-29 18:43:16 +00:00
Kevin Chyn
1798ddbcd6
Merge "Update intent for requesting parental consent" into sc-dev
2021-06-29 18:42:07 +00:00
Mady Mellor
cc312e1054
Merge "Ensure the bubble expanded view aligns with the pointer" into sc-v2-dev
2021-06-29 18:35:12 +00:00
TreeHugger Robot
771ea87c88
Merge "Don't export HeapDumpProvider." into rvc-dev am: 3b6512d824
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14901700
Change-Id: I05043f99e937478e9de915525f66f3bc7b80a11b
2021-06-29 18:34:16 +00:00
TreeHugger Robot
4e34795938
Merge "Don't export HeapDumpProvider." into rvc-dev am: 3b6512d824
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14901700
Change-Id: I13aee3c5fd3737a845155a770c704d2410f34d27
2021-06-29 18:34:13 +00:00
TreeHugger Robot
3b6512d824
Merge "Don't export HeapDumpProvider." into rvc-dev
2021-06-29 18:17:58 +00:00
TreeHugger Robot
7f4daba807
Merge "Persist remote input image attachment across layouts" into sc-dev am: 931584a921
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15128149
Change-Id: I13aa2f277a5aa5bd235d7dccec9c981737b2cda1
2021-06-29 18:04:09 +00:00
TreeHugger Robot
931584a921
Merge "Persist remote input image attachment across layouts" into sc-dev
2021-06-29 18:00:38 +00:00
Patrick Baumann
820f03bb09
Merge "Fix uninstall system updates disabling stub for single user" into sc-dev am: 71d19aed18
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15115190
Change-Id: Id3bb0a8a960bab3cd47b2d3f7d37a2e7f80e40ab
2021-06-29 17:56:19 +00:00
Josh Tsuji
9fb80b59ef
Merge "Play sounds only once, on keyguard exit." into sc-dev am: f0221c0079
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15131654
Change-Id: Ic8910e0f576d106afb3c04a161fc3f82035583ae
2021-06-29 17:55:54 +00:00
Josh Tsuji
a55728ebb0
Merge "Use a linear interpolator for screen off, since the reveal effects already interpolate the reveal amount internally." into sc-dev am: e2dc0091d7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15131934
Change-Id: I7220d4ecf1f7c4c556f13fca28ae1ffccbad8fb1
2021-06-29 17:55:46 +00:00
Selim Cinek
11bff3acfb
Merge "Fixed an issue where the phone would be stuck pulseExpanding" into sc-dev am: 17a6678d78
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15110200
Change-Id: I25a5de95acc7408e9a9962c40e04ca94cd36c709
2021-06-29 17:55:41 +00:00
Caitlin Cassidy
0c86fa2866
Merge "[Ongoing Call Chip] Call Chronometer#stop to prevent leaks." into sc-dev am: 8a57c76a35
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15084010
Change-Id: Ieadb1b0bff2704c58a5c1e3889421ffe411176ff
2021-06-29 17:54:57 +00:00
Patrick Baumann
71d19aed18
Merge "Fix uninstall system updates disabling stub for single user" into sc-dev
2021-06-29 17:49:25 +00:00
Josh Tsuji
f0221c0079
Merge "Play sounds only once, on keyguard exit." into sc-dev
2021-06-29 17:45:46 +00:00
Josh Tsuji
e2dc0091d7
Merge "Use a linear interpolator for screen off, since the reveal effects already interpolate the reveal amount internally." into sc-dev
2021-06-29 17:45:31 +00:00
Selim Cinek
17a6678d78
Merge "Fixed an issue where the phone would be stuck pulseExpanding" into sc-dev
2021-06-29 17:43:59 +00:00
Caitlin Cassidy
8a57c76a35
Merge "[Ongoing Call Chip] Call Chronometer#stop to prevent leaks." into sc-dev
2021-06-29 17:42:38 +00:00
Beverly Tai
24a9307895
Merge "Update co-ex error logic" into sc-dev am: 1593d6a817
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15112555
Change-Id: Ic30d43b5979a136a9e28335708f4fd71f0412365
2021-06-29 17:37:08 +00:00
Ady Abraham
6ca701154d
Merge "WM: add missing plumbing for preferredMaxDisplayRefreshRate" into sc-dev am: 8dff5292c5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15133561
Change-Id: I4b43fb463fdba48ef3bf5dfaf0bc20b8e71a2383
2021-06-29 17:36:51 +00:00
Beverly Tai
1593d6a817
Merge "Update co-ex error logic" into sc-dev
2021-06-29 17:27:18 +00:00
Ady Abraham
8dff5292c5
Merge "WM: add missing plumbing for preferredMaxDisplayRefreshRate" into sc-dev
2021-06-29 17:19:49 +00:00
TreeHugger Robot
660f78ebf8
Merge "Give Shell the NOTIFY_PENDING_SYSTEM_UPDATE permission" into sc-dev am: 69a0939764
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15107816
Change-Id: If6acdea694ed3ba9972ec1bccd05b514a42125c3
2021-06-29 17:03:52 +00:00
Vadim Caen
9232a56d6d
Merge "Apply the mask to all splashscreen forground icons" into sc-dev am: 4f25b8822e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15054861
Change-Id: I49e697debab09716e3b9bdc9b91a104e0afb3401
2021-06-29 17:03:37 +00:00
TreeHugger Robot
69a0939764
Merge "Give Shell the NOTIFY_PENDING_SYSTEM_UPDATE permission" into sc-dev
2021-06-29 16:57:01 +00:00
Vadim Caen
4f25b8822e
Merge "Apply the mask to all splashscreen forground icons" into sc-dev
2021-06-29 16:52:57 +00:00
Mady Mellor
cd2eed4f1e
Ensure the bubble expanded view aligns with the pointer
...
We currently top-align the expanded view when bubbles are
shown vertically on left / right edges of the screen. If the height
of the bubble is small, the pointer might be disconnected from
it depending on the bubble's position in the list (e.g. small top
aligned view whereas bubble is last in the list so pointer is at
bottom of the screen).
This change fixes the problem by:
- if the view is < max then center it on the pointer
- if it can't be centered on the pointer align with top or bottom
depending on the bubble position
- does this by moving a bunch of calculations into BubblePositioner
and making adjustments to them depending on the situation.
Test: manual: Using bubbles test app you can adjust the height, on
a phone in landscape & also on tablet verify:
- the expanded view can center on a bubble
- the view top aligns if bubble is closer to the top
- the view bottom aligns if bubble closer to the bottom
- that the pointer always intersects with the expanded
view & the view doesn't ever overlap with system bars
Bug: 190560927
Change-Id: I599b97d6ccb08fa385655ce532c0f6cdbe1d1175
2021-06-29 16:42:58 +00:00
Fabian Kozynski
bb20579fcc
Change tile states strings to constants
...
References don't get marked for translations, so the default have to be
constant strings.
Test: manual
Bug: 188915634
Change-Id: I99b81ef713331202b9e580a375168d472e9c21f5
2021-06-29 12:17:54 -04:00
TreeHugger Robot
0efe115c7e
Merge "Specify the wallpaper blast wrapper is a wallpaper window" into sc-dev am: 0954cfe651
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15132873
Change-Id: Ib6e73dc66e5ea34228d86860e4ddc983c1ea8431
2021-06-29 16:14:13 +00:00
TreeHugger Robot
0954cfe651
Merge "Specify the wallpaper blast wrapper is a wallpaper window" into sc-dev
2021-06-29 16:12:22 +00:00
Orion Hodson
f4c1648528
Merge changes from topic "system-server-images" into sc-dev am: 8e8cb4cb1f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15114536
Change-Id: I1fef6fc2df1d99871d1d58f1fbe6414b93655751
2021-06-29 16:11:12 +00:00
Orion Hodson
44a1cece34
Revert^2 "Zygote: Load system server code early" am: 91c4f415e3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15107813
Change-Id: I7521056726af2c39456f351111ab27e969ba8cb3
2021-06-29 16:11:10 +00:00
Orion Hodson
8e8cb4cb1f
Merge changes from topic "system-server-images" into sc-dev
...
* changes:
Fix JNI error
Revert^2 "Zygote: Load system server code early"
2021-06-29 16:05:36 +00:00
TreeHugger Robot
8402c53b36
Merge "Fix links in setRequireUserAction docs" into sc-dev am: f43a7b8d5c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14921913
Change-Id: I8f826aacb32af58c3a44ecf0f218cf2d779fa950
2021-06-29 16:02:38 +00:00
Ady Abraham
71550bf846
Merge "DisplayModeService: check for null before accessing display mode" into sc-dev am: 7fc7f6bcb6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15133562
Change-Id: Ib6b76231976973afb1f584848893e3071b583492
2021-06-29 16:01:55 +00:00
Paul Duffin
80dc8d6867
Merge "Move statsd related hidden API flag file entries to packages/modules/Statsd" into sc-dev am: b0770ecb76
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15107824
Change-Id: I6864d091fa2acbc81331b845130211f625c176c9
2021-06-29 16:01:39 +00:00
TreeHugger Robot
f43a7b8d5c
Merge "Fix links in setRequireUserAction docs" into sc-dev
2021-06-29 15:56:16 +00:00
Ady Abraham
7fc7f6bcb6
Merge "DisplayModeService: check for null before accessing display mode" into sc-dev
2021-06-29 15:52:12 +00:00
Ady Abraham
6b3ab574d8
WM: add missing plumbing for preferredMaxDisplayRefreshRate
...
Bug: 183226498
Bug: 192354367
Test: wmtests
Change-Id: I0fc43ff3820a173980cfd689020127548319e559
2021-06-29 15:51:40 +00:00
Ady Abraham
0a65f0efbf
DisplayModeService: check for null before accessing display mode
...
Bug: 170502573
Bug: 192354057
Test: systemui votes for a preferredRefreshRate that is not supported
by the device
Change-Id: I36fed8e4c9d4c2990d2bc5247f6fb580af551220
2021-06-29 15:47:36 +00:00
Paul Duffin
b0770ecb76
Merge "Move statsd related hidden API flag file entries to packages/modules/Statsd" into sc-dev
2021-06-29 15:45:46 +00:00