Fiona Campbell
c19c6d4b3c
Merge "Make setBrightnessConfigurationForUser locked" into sc-v2-dev
2021-11-12 17:10:15 +00:00
Jordan Demeulenaere
64c7c7150f
Merge "Fix regression when launching the media output dialog" into sc-v2-dev
2021-11-12 15:30:11 +00:00
TreeHugger Robot
55d2c4c1aa
Merge "Check for the vibrate notification key on delayed vibrations" into sc-v2-dev
2021-11-12 13:58:20 +00:00
Jordan Demeulenaere
79bd0cafdd
Fix regression when launching the media output dialog
...
This CL fixes a regression that was caused by ag/16191211: when opening
the media output dialog, we would animate from the media dialog content
instead of its parent (that has the dialog background).
This CL changes that by detecting that the view we are launching from is
actually the content of a dialog that was animated using
DialogLaunchAnimator, and animates its parent to also animate the
background.
See b/200781817#comment8 for before/after videos.
Bug: 200781817
Test: Manual
Change-Id: I20cf8bdff8b6d29e9aa458f96d65851a0298f98d
2021-11-12 14:32:27 +01:00
Jordan Demeulenaere
d7b0a36294
Merge "Temporary fix DialogLaunchAnimatorTest#testShowDialogFromView" into sc-v2-dev
2021-11-12 10:40:19 +00:00
Lais Andrade
6bd7a9c728
Check for the vibrate notification key on delayed vibrations
...
Notifications played with sound have a delayed vibration, in order to
match the vibration and sound effects. If the effects are cleared before
the vibration starts, or a new one takes its place, then the vibration
hould be cancelled because it no longer will be tracked by the
NotificationManagerService.mVibrateNotificationKey.
This can cause repeating vibrations, like incoming calls, to start and
continue vibrating even after the notification was handled, (if the user
opens the notification panel before it actually starts vibrating, for
example).
Fix: 202752953
Test: NotificationManagerServiceTest
Change-Id: If3ed4a741e78058a321691acebe735c735542f16
Merged-In: If3ed4a741e78058a321691acebe735c735542f16
(cherry picked from commit 2bf7f52086 )
2021-11-12 10:29:53 +00:00
Jordan Demeulenaere
273dc06373
Temporary fix DialogLaunchAnimatorTest#testShowDialogFromView
...
This is a temporary fix to make #testShowDialogFromView pass on
git_master/cf_x86_64_phone-userdebug.
Bug: 204589809
Bug: 204561691
Test: https://android-build.googleplex.com/builds/abtd/run/L96200000951897805
Change-Id: I28fe649fde6a107ee939ae8e85090972899f5d17
2021-11-12 10:05:33 +01:00
Fedor Kudasov
2d7f52505e
Merge "Add @Nullable annotations to Task fields" into sc-v2-dev
2021-11-12 08:18:32 +00:00
TreeHugger Robot
e171c540da
Merge "Consider the lock-task mode while using FLAG_ACTIVITY_TASK_ON_HOME" into sc-v2-dev
2021-11-12 06:13:06 +00:00
Jeff Chang
d41841f469
Consider the lock-task mode while using FLAG_ACTIVITY_TASK_ON_HOME
...
The flag will cause a newly launching task to be placed on top of the
current home activity task but it did ignore the lock-task mode
mechansim.
This CL checks the home task whether violated with lock-task mode when
startActivity with task-on-home flag.
Bug: 202980858
Test: atest TaskTests#testReturnsToHomeRootTask
atest ActivityVisibilityTests#testLaunchTaskOnHome
Change-Id: I521b9e4fc32648263afb70de3342dbb5f3583330
2021-11-12 12:10:11 +08:00
Siarhei Vishniakou
e8e382c03f
[automerger skipped] Only allow trusted overlays to specify FLAG_SLIPPERY am: 07e7aaff29 am: c7052c9c79 -s ours am: bb535c95d2 -s ours am: 734bde2baa -s ours
...
am skip reason: Merged-In Ia30f1c38d5ddb351c90b748ea76448a76a9dde7b with SHA-1 07e7aaff29 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16241253
Change-Id: I4bc5393e1d1a0e57746f4ad4715d41a6351bc843
2021-11-12 01:51:07 +00:00
Siarhei Vishniakou
734bde2baa
[automerger skipped] Only allow trusted overlays to specify FLAG_SLIPPERY am: 07e7aaff29 am: c7052c9c79 -s ours am: bb535c95d2 -s ours
...
am skip reason: Merged-In Ia30f1c38d5ddb351c90b748ea76448a76a9dde7b with SHA-1 07e7aaff29 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16241253
Change-Id: Ie76b4547496cb0d6da58f7dca1b2a6d410af0730
2021-11-12 01:32:59 +00:00
Siarhei Vishniakou
bb535c95d2
[automerger skipped] Only allow trusted overlays to specify FLAG_SLIPPERY am: 07e7aaff29 am: c7052c9c79 -s ours
...
am skip reason: Merged-In Ia30f1c38d5ddb351c90b748ea76448a76a9dde7b with SHA-1 07e7aaff29 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16241253
Change-Id: I973210801594085c5d890a558cbb7b403b47f86f
2021-11-12 01:15:23 +00:00
Joe Bolinger
2ab2685cca
Merge "Allow fields in biometric prompt to span multiple lines." into sc-v2-dev
2021-11-11 23:24:11 +00:00
Siarhei Vishniakou
c7052c9c79
Only allow trusted overlays to specify FLAG_SLIPPERY am: 07e7aaff29
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16190719
Change-Id: If208e3c8b5a9d43034b4764d678a1a33ea2729c6
Merged-In: Ia30f1c38d5ddb351c90b748ea76448a76a9dde7b
Bug: 157929241
Bug: 205996845
2021-11-11 23:09:51 +00:00
TreeHugger Robot
8b5c93d9ea
Merge "Check if the view can be recycled if viewId is set" into sc-v2-dev
2021-11-11 23:02:46 +00:00
Fedor Kudasov
716597f726
Add @Nullable annotations to Task fields
...
Bug: 205828770
Test: m SystemUI-core
Change-Id: I80194b9959b9be3b87d2f074557f4e79f164ceca
(cherry picked from commit 11ae0987c2 )
2021-11-11 21:54:29 +00:00
TreeHugger Robot
715c488a9c
Merge "Add a bold-text version for the keyguard clock" into sc-v2-dev
2021-11-11 21:16:58 +00:00
TreeHugger Robot
4d6947e323
Merge "Update Assistant entry points on navigation mode change" into sc-v2-dev
2021-11-11 20:55:20 +00:00
Jay Aliomer
b9902adf15
Merge "Update local wallpaper colors when areas added and fix stale clock" into sc-v2-dev
2021-11-11 20:47:01 +00:00
Varun Shah
7860a015f2
[automerger skipped] Merge "Update deletion conditions for a package's UsageStats." into rvc-dev am: 06c5973697 am: 68431cf82f -s ours am: 1359468d3e -s ours am: d7bf62b0a3 -s ours
...
am skip reason: Merged-In I94a8e3dfca8ef4c7616f77944d61726e06043b85 with SHA-1 157fbcfbe4 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16222704
Change-Id: I46f577ce816bdf0763cbf337506bd837bea01689
2021-11-11 20:36:11 +00:00
Varun Shah
d7bf62b0a3
[automerger skipped] Merge "Update deletion conditions for a package's UsageStats." into rvc-dev am: 06c5973697 am: 68431cf82f -s ours am: 1359468d3e -s ours
...
am skip reason: Merged-In I94a8e3dfca8ef4c7616f77944d61726e06043b85 with SHA-1 157fbcfbe4 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16222704
Change-Id: I78109bb51415239b950eb30e33eb36f7b7bc3f26
2021-11-11 20:15:42 +00:00
TreeHugger Robot
394883c093
[automerger skipped] Merge "Mark screen decorations as trusted overlays" into rvc-dev am: bb3f22df9a am: b075e50ad5 -s ours am: 86e8070289 -s ours am: a0812043a0 -s ours
...
am skip reason: Merged-In Ib276764edcf1acffe94e3db7397fd23aaaa5dbaa with SHA-1 620ee47b2a is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16222361
Change-Id: I6ed1a80ca737949174579b0559292a7326cd41e2
2021-11-11 19:59:27 +00:00
Winson Chung
73abbf7ac1
Merge changes from topic "trusted_overlay_backport" into rvc-dev am: 58c437f18c am: f986999eec am: 24304ff554 am: 034a56dab2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15975850
Change-Id: Ibd2ff0a3a4f326cd01c9526eb8b1b6ea6fce9d8e
2021-11-11 19:59:16 +00:00
Winson Chung
3ed9854390
[automerger skipped] DO NOT MERGE: Revert "Map TYPE_TRUSTED_APPLICATION_OVERLAY to system window type for A11y" am: 0cf0d420e1 am: 349eb4dff7 -s ours am: 920515f493 -s ours am: 80116efe63 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15975850
Change-Id: I4c514998c3f43b0b9aa0755ac504ef0aab38debc
2021-11-11 19:59:13 +00:00
Winson Chung
89c30c5771
[automerger skipped] Add mechanism for a task's windows to be trusted overlays am: 47fb132ef2 am: c9869e0d9c -s ours am: ea9b0fc9d6 -s ours am: 106bf08b5e -s ours
...
am skip reason: Merged-In I170cb5a7d22ef569eb36de21cc0bcbef60dd385e with SHA-1 47fb132ef2 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15975849
Change-Id: I5a4e7424261f84bffa16ad57eef602504db40b13
2021-11-11 19:59:11 +00:00
Winson Chung
578ccae783
[automerger skipped] Merge "DO NOT MERGE: Revert "Map TYPE_TRUSTED_APPLICATION_OVERLAY to system window type for A11y"" into rvc-qpr-dev am: 3d570b73d3 -s ours am: 3c33bfd12e -s ours am: f10720e3bf -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16230862
Change-Id: Id31af0621c81035e749285c8cbe6ff24a6488c12
2021-11-11 19:58:59 +00:00
Chris Ye
13a05d48f8
[automerger skipped] Change InputWindowInfo::isTrustedOverlay() to be permission and flag based am: 716333761d am: 0ee0d7f55e -s ours am: bf60d8af3c -s ours am: 322951b4e8 -s ours
...
am skip reason: Merged-In I70151697cc01e8427129f951f0ebadc4805b2d56 with SHA-1 716333761d is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16224221
Change-Id: I4bce3862e003b18c87e87049d8ec01c1d2ab2d19
2021-11-11 19:58:49 +00:00
TreeHugger Robot
959e486d66
Merge "Change OVERRIDE_MIN_ASPECT_RATIO_PORTRAIT_ONLY to be enabled since Sv2" into sc-v2-dev
2021-11-11 19:57:21 +00:00
TreeHugger Robot
a6f7644ef0
Merge "Don't allow background apps to change theme" into sc-v2-dev
2021-11-11 19:56:46 +00:00
Varun Shah
1359468d3e
[automerger skipped] Merge "Update deletion conditions for a package's UsageStats." into rvc-dev am: 06c5973697 am: 68431cf82f -s ours
...
am skip reason: Merged-In I94a8e3dfca8ef4c7616f77944d61726e06043b85 with SHA-1 157fbcfbe4 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16222704
Change-Id: Id1c78a33e62ea64ff5391a09ba3dd54dac8598fc
2021-11-11 19:48:40 +00:00
TreeHugger Robot
a0812043a0
[automerger skipped] Merge "Mark screen decorations as trusted overlays" into rvc-dev am: bb3f22df9a am: b075e50ad5 -s ours am: 86e8070289 -s ours
...
am skip reason: Merged-In Ib276764edcf1acffe94e3db7397fd23aaaa5dbaa with SHA-1 620ee47b2a is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16222361
Change-Id: Ic3c020b7b53843c271424c0756686468940fc753
2021-11-11 19:41:38 +00:00
Winson Chung
034a56dab2
Merge changes from topic "trusted_overlay_backport" into rvc-dev am: 58c437f18c am: f986999eec am: 24304ff554
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15975850
Change-Id: I6dedcabd8fe30ed0052da540ce1e56dea1476410
2021-11-11 19:41:26 +00:00
Winson Chung
80116efe63
[automerger skipped] DO NOT MERGE: Revert "Map TYPE_TRUSTED_APPLICATION_OVERLAY to system window type for A11y" am: 0cf0d420e1 am: 349eb4dff7 -s ours am: 920515f493 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15975850
Change-Id: I2bdfef99f1c483a1c11e78707c514c26142de9e8
2021-11-11 19:41:19 +00:00
Winson Chung
106bf08b5e
[automerger skipped] Add mechanism for a task's windows to be trusted overlays am: 47fb132ef2 am: c9869e0d9c -s ours am: ea9b0fc9d6 -s ours
...
am skip reason: Merged-In I170cb5a7d22ef569eb36de21cc0bcbef60dd385e with SHA-1 47fb132ef2 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15975849
Change-Id: I3e3e46f92abc42bbd5d85e722b6ea1033438676d
2021-11-11 19:41:18 +00:00
Winson Chung
f10720e3bf
[automerger skipped] Merge "DO NOT MERGE: Revert "Map TYPE_TRUSTED_APPLICATION_OVERLAY to system window type for A11y"" into rvc-qpr-dev am: 3d570b73d3 -s ours am: 3c33bfd12e -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16230862
Change-Id: I84cc9c87c4a3fcf5fc85803985056612571e3459
2021-11-11 19:40:57 +00:00
Chris Ye
322951b4e8
[automerger skipped] Change InputWindowInfo::isTrustedOverlay() to be permission and flag based am: 716333761d am: 0ee0d7f55e -s ours am: bf60d8af3c -s ours
...
am skip reason: Merged-In I70151697cc01e8427129f951f0ebadc4805b2d56 with SHA-1 716333761d is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16224221
Change-Id: Icb423a3ec2db3b723c04d813e71463ae53365270
2021-11-11 19:40:51 +00:00
TreeHugger Robot
ae0f5315ad
Merge "Adds new configs to support 5g+4g opportunistic switching." into sc-v2-dev
2021-11-11 19:32:45 +00:00
TreeHugger Robot
86e8070289
[automerger skipped] Merge "Mark screen decorations as trusted overlays" into rvc-dev am: bb3f22df9a am: b075e50ad5 -s ours
...
am skip reason: Merged-In Ib276764edcf1acffe94e3db7397fd23aaaa5dbaa with SHA-1 620ee47b2a is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16222361
Change-Id: I2fa7fea30e892495b874ece02d3ed73b7b235b6e
2021-11-11 19:24:18 +00:00
Winson Chung
24304ff554
Merge changes from topic "trusted_overlay_backport" into rvc-dev am: 58c437f18c am: f986999eec
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15975850
Change-Id: Ib8c1874882dd1b578c9301958b22c2fbc2994081
2021-11-11 19:23:48 +00:00
Winson Chung
920515f493
[automerger skipped] DO NOT MERGE: Revert "Map TYPE_TRUSTED_APPLICATION_OVERLAY to system window type for A11y" am: 0cf0d420e1 am: 349eb4dff7 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15975850
Change-Id: Iccb3be9996467876b1b9486c606dcff54f7d3d29
2021-11-11 19:23:27 +00:00
Winson Chung
ea9b0fc9d6
[automerger skipped] Add mechanism for a task's windows to be trusted overlays am: 47fb132ef2 am: c9869e0d9c -s ours
...
am skip reason: Merged-In I170cb5a7d22ef569eb36de21cc0bcbef60dd385e with SHA-1 47fb132ef2 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15975849
Change-Id: I69cb6296f58953ec93f1dd3877ffbdc881b2efdf
2021-11-11 19:23:04 +00:00
Winson Chung
3c33bfd12e
[automerger skipped] Merge "DO NOT MERGE: Revert "Map TYPE_TRUSTED_APPLICATION_OVERLAY to system window type for A11y"" into rvc-qpr-dev am: 3d570b73d3 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16230862
Change-Id: I56955e85820b0455e4928d5830b18e02b978f768
2021-11-11 19:22:13 +00:00
Chris Ye
bf60d8af3c
[automerger skipped] Change InputWindowInfo::isTrustedOverlay() to be permission and flag based am: 716333761d am: 0ee0d7f55e -s ours
...
am skip reason: Merged-In I70151697cc01e8427129f951f0ebadc4805b2d56 with SHA-1 716333761d is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16224221
Change-Id: Iafead68ffbad240cb4a99bf63bba336857cf2772
2021-11-11 19:21:47 +00:00
Varun Shah
68431cf82f
Merge "Update deletion conditions for a package's UsageStats." into rvc-dev am: 06c5973697
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16222704
Change-Id: I8d86dd21a78900698780d3e0bd2fc82eb745ff23
2021-11-11 19:15:50 +00:00
Beverly
392d8686a9
Add a bold-text version for the keyguard clock
...
Test: manual (Settings > A11y > Text and display > Bold text)
Test: atest AnimatableClockControllerTest
Fixes: 201034059
Change-Id: I656afac3ee22e79a0bf218803699ab5182c34c66
2021-11-11 14:01:39 -05:00
TreeHugger Robot
b075e50ad5
Merge "Mark screen decorations as trusted overlays" into rvc-dev am: bb3f22df9a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16222361
Change-Id: I944c3edf537f4bfcd393df4da8e5357f5597a141
2021-11-11 19:00:35 +00:00
Winson Chung
f986999eec
Merge changes from topic "trusted_overlay_backport" into rvc-dev am: 58c437f18c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15975850
Change-Id: I04d158903da2864a93ab17fba9d5309804ecce14
2021-11-11 19:00:12 +00:00
Winson Chung
349eb4dff7
DO NOT MERGE: Revert "Map TYPE_TRUSTED_APPLICATION_OVERLAY to system window type for A11y" am: 0cf0d420e1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15975850
Change-Id: I42f2ec606dca66f088fcc441a675db1e7645bc07
2021-11-11 19:00:09 +00:00
Winson Chung
c9869e0d9c
Add mechanism for a task's windows to be trusted overlays am: 47fb132ef2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15975849
Change-Id: Ia323593ceba41580d88b6d058ae0bfc8c92dce3f
2021-11-11 19:00:04 +00:00