Ats Jenk
fac53656ed
Merge "Clean up desktop mode logging" into tm-qpr-dev
2022-10-27 16:27:57 +00:00
Lais Andrade
d250dd0eb6
Merge "Fix cancelSynced cleanup: stop the vibrator." into tm-qpr-dev
2022-10-27 16:20:10 +00:00
Justin Weir
f8b00cb578
Merge "Merge PanelEventsEmitter into ShadeExpansionStateManager" into tm-qpr-dev
2022-10-27 15:11:11 +00:00
Fabian Kozynski
9b45e65e7c
Merge "Fix touches in Large screen header" into tm-qpr-dev
2022-10-27 14:28:09 +00:00
Dave Mankoff
889ad98d78
Merge "Restart SystemUI on DeviceConfig changes." into tm-qpr-dev
2022-10-27 13:03:21 +00:00
Simon Bowden
c6438e9059
Fix cancelSynced cleanup: stop the vibrator.
...
Currently, the VibratorController is not updated when a synced vibration
is cancelled. Consequently, it stays "isVibrating" when the vibration is
finished. This is fixed by doing the same steps cancellation of individual
steps failure for the triggerSynced failure too.
Add new tests to ensure that vibrators have stopped vibrating, and to
stop the looper thread (this is how the issue was found).
Bug: 244428021
Test: atest
Change-Id: I67ffeb170ce28e1f65227079185f1cda75636a14
Merged-In: I67ffeb170ce28e1f65227079185f1cda75636a14
(cherry picked from commit fb2fc1f0c7 )
2022-10-27 12:45:04 +00:00
Justin Weir
ba0c161e2f
Merge PanelEventsEmitter into ShadeExpansionStateManager
...
The purpose is to further consolidate and standardize how changes
in the shade state are propogated throughout the system. The change
renames NotifPanelEvents, merges the PanelEventsEmmitter impl into
ShadeExpansionStateManager, and deletes the FakeNotifPanelEvents impl,
which is unnecessary given the simplicity of ShadeExpansionStateManager.
Bug: 254512692
Test: atest and manual verification
Change-Id: I4d3e580eb2e8838b84b32fd1f1cdb05098db49ff
2022-10-27 11:47:12 +00:00
TreeHugger Robot
3c10ee01a9
[automerger skipped] Merge "RESTRICT AUTOMERGE Revert "Revert "RESTRICT AUTOMERGE Validate permission tree size..."" into qt-dev am: 88a76a8cfc am: 51f0eecfc3 -s ours am: 2125a7622f -s ours am: 2aeb80fbc7 -s ours am: e2825dc6a8 -s ours am: e6ebbe4a6c -s ours am: 8785f38f59 -s ours am: 316e893370 -s ours am: a3aa60f098 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20291140
Change-Id: I241bcbe5481311faf8e16657645449a5b5bdb95f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-27 07:26:19 +00:00
Nate Myren
d7cd396da8
[automerger skipped] RESTRICT AUTOMERGE Revert "Revert "RESTRICT AUTOMERGE Validate permission tree size..." am: 4e83e59b27 am: 4734edc494 -s ours am: 33e8d3d736 -s ours am: 3b64b27aab -s ours am: 1b7f3fbccc -s ours am: ebfb6f4e10 -s ours am: ff8e1840fc -s ours am: 2bbb7165e2 -s ours am: 1ce9529482 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20291140
Change-Id: Id2a28840adb41202bf25e91a3b237e88dd09376a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-27 07:26:05 +00:00
TreeHugger Robot
a3aa60f098
[automerger skipped] Merge "RESTRICT AUTOMERGE Revert "Revert "RESTRICT AUTOMERGE Validate permission tree size..."" into qt-dev am: 88a76a8cfc am: 51f0eecfc3 -s ours am: 2125a7622f -s ours am: 2aeb80fbc7 -s ours am: e2825dc6a8 -s ours am: e6ebbe4a6c -s ours am: 8785f38f59 -s ours am: 316e893370 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20291140
Change-Id: I23745d555e0dfe09ccf92d23ae971abe704fac9e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-27 06:53:30 +00:00
Nate Myren
1ce9529482
[automerger skipped] RESTRICT AUTOMERGE Revert "Revert "RESTRICT AUTOMERGE Validate permission tree size..." am: 4e83e59b27 am: 4734edc494 -s ours am: 33e8d3d736 -s ours am: 3b64b27aab -s ours am: 1b7f3fbccc -s ours am: ebfb6f4e10 -s ours am: ff8e1840fc -s ours am: 2bbb7165e2 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20291140
Change-Id: Ie4db7e75952395fd68ca50f3f95aa411a5afedef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-27 06:53:26 +00:00
TreeHugger Robot
316e893370
[automerger skipped] Merge "RESTRICT AUTOMERGE Revert "Revert "RESTRICT AUTOMERGE Validate permission tree size..."" into qt-dev am: 88a76a8cfc am: 51f0eecfc3 -s ours am: 2125a7622f -s ours am: 2aeb80fbc7 -s ours am: e2825dc6a8 -s ours am: e6ebbe4a6c -s ours am: 8785f38f59 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20291140
Change-Id: I93914a2f166deaee98524247f6a8abf55db5e5ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-27 06:15:48 +00:00
Nate Myren
2bbb7165e2
[automerger skipped] RESTRICT AUTOMERGE Revert "Revert "RESTRICT AUTOMERGE Validate permission tree size..." am: 4e83e59b27 am: 4734edc494 -s ours am: 33e8d3d736 -s ours am: 3b64b27aab -s ours am: 1b7f3fbccc -s ours am: ebfb6f4e10 -s ours am: ff8e1840fc -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20291140
Change-Id: I8fbd3d11210d94d3290945d93c24408d87509802
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-27 06:15:19 +00:00
TreeHugger Robot
8785f38f59
[automerger skipped] Merge "RESTRICT AUTOMERGE Revert "Revert "RESTRICT AUTOMERGE Validate permission tree size..."" into qt-dev am: 88a76a8cfc am: 51f0eecfc3 -s ours am: 2125a7622f -s ours am: 2aeb80fbc7 -s ours am: e2825dc6a8 -s ours am: e6ebbe4a6c -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20291140
Change-Id: I5d6d20b3611103aa153f622c963d5c885c882119
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-27 05:45:49 +00:00
Nate Myren
ff8e1840fc
[automerger skipped] RESTRICT AUTOMERGE Revert "Revert "RESTRICT AUTOMERGE Validate permission tree size..." am: 4e83e59b27 am: 4734edc494 -s ours am: 33e8d3d736 -s ours am: 3b64b27aab -s ours am: 1b7f3fbccc -s ours am: ebfb6f4e10 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20291140
Change-Id: I62417180f17ac68425b2dea457a0987fe7cec332
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-27 05:45:35 +00:00
TreeHugger Robot
e6ebbe4a6c
[automerger skipped] Merge "RESTRICT AUTOMERGE Revert "Revert "RESTRICT AUTOMERGE Validate permission tree size..."" into qt-dev am: 88a76a8cfc am: 51f0eecfc3 -s ours am: 2125a7622f -s ours am: 2aeb80fbc7 -s ours am: e2825dc6a8 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20291140
Change-Id: I1aaaea547c4ddd2521422ca1573a4a091b522f1b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-27 05:11:12 +00:00
Nate Myren
ebfb6f4e10
[automerger skipped] RESTRICT AUTOMERGE Revert "Revert "RESTRICT AUTOMERGE Validate permission tree size..." am: 4e83e59b27 am: 4734edc494 -s ours am: 33e8d3d736 -s ours am: 3b64b27aab -s ours am: 1b7f3fbccc -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20291140
Change-Id: I370f22b20670389c85416cedecf009cf251d3aaf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-27 05:11:10 +00:00
TreeHugger Robot
e2825dc6a8
[automerger skipped] Merge "RESTRICT AUTOMERGE Revert "Revert "RESTRICT AUTOMERGE Validate permission tree size..."" into qt-dev am: 88a76a8cfc am: 51f0eecfc3 -s ours am: 2125a7622f -s ours am: 2aeb80fbc7 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20291140
Change-Id: I2f00eac6d638de0890a489ea9273b3cf32b907db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-27 04:37:29 +00:00
Nate Myren
1b7f3fbccc
[automerger skipped] RESTRICT AUTOMERGE Revert "Revert "RESTRICT AUTOMERGE Validate permission tree size..." am: 4e83e59b27 am: 4734edc494 -s ours am: 33e8d3d736 -s ours am: 3b64b27aab -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20291140
Change-Id: I83cab0216bce100fb0bf8451d9549c9c1481a944
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-27 04:37:06 +00:00
TreeHugger Robot
2aeb80fbc7
[automerger skipped] Merge "RESTRICT AUTOMERGE Revert "Revert "RESTRICT AUTOMERGE Validate permission tree size..."" into qt-dev am: 88a76a8cfc am: 51f0eecfc3 -s ours am: 2125a7622f -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20291140
Change-Id: If87cef5f5050d661f0e4fe656cfa86bb4733a457
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-27 04:02:51 +00:00
Nate Myren
3b64b27aab
[automerger skipped] RESTRICT AUTOMERGE Revert "Revert "RESTRICT AUTOMERGE Validate permission tree size..." am: 4e83e59b27 am: 4734edc494 -s ours am: 33e8d3d736 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20291140
Change-Id: I2948ce87ee06912ac47371b40d816c2e65a0a22f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-27 04:02:38 +00:00
Jerry Chang
b8a27eb601
Merge "Add fallback logic to cancel entering split screen" into tm-qpr-dev
2022-10-27 03:55:19 +00:00
TreeHugger Robot
2125a7622f
[automerger skipped] Merge "RESTRICT AUTOMERGE Revert "Revert "RESTRICT AUTOMERGE Validate permission tree size..."" into qt-dev am: 88a76a8cfc am: 51f0eecfc3 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20291140
Change-Id: I8b5502e6a79501bb811088a3da9c28723ba0a869
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-27 03:29:14 +00:00
Nate Myren
33e8d3d736
[automerger skipped] RESTRICT AUTOMERGE Revert "Revert "RESTRICT AUTOMERGE Validate permission tree size..." am: 4e83e59b27 am: 4734edc494 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20291140
Change-Id: I7035cfd7d3533effbd4c3e7cf63776cdafa8be72
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-27 03:28:51 +00:00
TreeHugger Robot
51f0eecfc3
Merge "RESTRICT AUTOMERGE Revert "Revert "RESTRICT AUTOMERGE Validate permission tree size..."" into qt-dev am: 88a76a8cfc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20291140
Change-Id: I7239c1b42f0172e53b039383e3d46203be55dd34
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-27 02:58:09 +00:00
Nate Myren
4734edc494
RESTRICT AUTOMERGE Revert "Revert "RESTRICT AUTOMERGE Validate permission tree size..." am: 4e83e59b27
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20291140
Change-Id: I673c2f2d4929ab675cf0e1b0ba87aab29e489c86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-27 02:58:01 +00:00
David Saff
2d31fcf35a
Merge "Disable broken NotificationStackScrollLayoutTest on qt-dev" into qt-dev am: b4ac90f433 am: c5c6a916fe am: 7bed0ed812 am: 1eb5f3a92a am: 7185d7f108 am: efb9b0bfba am: 1621b11c20 am: f05281c8ad am: 35e44874a1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20281824
Change-Id: I3b81527914c94c8820e6fbcb756856b425cce3d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-27 02:25:39 +00:00
TreeHugger Robot
88a76a8cfc
Merge "RESTRICT AUTOMERGE Revert "Revert "RESTRICT AUTOMERGE Validate permission tree size..."" into qt-dev
2022-10-27 02:09:34 +00:00
Hongwei Wang
571b988b5a
Merge "Fix the scale for entering PiP animation" into tm-qpr-dev
2022-10-27 01:53:47 +00:00
David Saff
35e44874a1
Merge "Disable broken NotificationStackScrollLayoutTest on qt-dev" into qt-dev am: b4ac90f433 am: c5c6a916fe am: 7bed0ed812 am: 1eb5f3a92a am: 7185d7f108 am: efb9b0bfba am: 1621b11c20 am: f05281c8ad
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20281824
Change-Id: Iabebdb80ee864ae57f87036206eb4ec099d1ad7c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-27 01:51:51 +00:00
David Saff
f05281c8ad
Merge "Disable broken NotificationStackScrollLayoutTest on qt-dev" into qt-dev am: b4ac90f433 am: c5c6a916fe am: 7bed0ed812 am: 1eb5f3a92a am: 7185d7f108 am: efb9b0bfba am: 1621b11c20
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20281824
Change-Id: I7fd36ee1c70ac8d01e8ec648c636d93e518dea5b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-27 01:13:55 +00:00
Evan Rosky
188119cb62
Merge "Add a config to disable registering Shell Transitions in dagger" into tm-qpr-dev
2022-10-27 01:10:09 +00:00
Ale Nijamkin
bce001ccbe
Merge changes Ibe1f0387,I2d1ec382 into tm-qpr-dev
...
* changes:
Moves quick affordances to data layer.
Changes quick affordance key to string.
2022-10-27 01:04:15 +00:00
David Saff
1621b11c20
Merge "Disable broken NotificationStackScrollLayoutTest on qt-dev" into qt-dev am: b4ac90f433 am: c5c6a916fe am: 7bed0ed812 am: 1eb5f3a92a am: 7185d7f108 am: efb9b0bfba
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20281824
Change-Id: I280e13016602c9d9ee334a06761591158586e30d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-27 00:26:01 +00:00
David Saff
efb9b0bfba
Merge "Disable broken NotificationStackScrollLayoutTest on qt-dev" into qt-dev am: b4ac90f433 am: c5c6a916fe am: 7bed0ed812 am: 1eb5f3a92a am: 7185d7f108
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20281824
Change-Id: I9e556bda4ee8e8660dae347f7c2f92f5d1ae2619
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-26 23:46:10 +00:00
David Saff
7185d7f108
Merge "Disable broken NotificationStackScrollLayoutTest on qt-dev" into qt-dev am: b4ac90f433 am: c5c6a916fe am: 7bed0ed812 am: 1eb5f3a92a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20281824
Change-Id: I3ef0db30c3ce8d36a8f795846d8605b90d574262
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-26 23:10:02 +00:00
David Saff
1eb5f3a92a
Merge "Disable broken NotificationStackScrollLayoutTest on qt-dev" into qt-dev am: b4ac90f433 am: c5c6a916fe am: 7bed0ed812
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20281824
Change-Id: Ib34f38f4fb6b7838ffb6a1c9157be6b81b0e40e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-26 22:35:15 +00:00
David Saff
7bed0ed812
Merge "Disable broken NotificationStackScrollLayoutTest on qt-dev" into qt-dev am: b4ac90f433 am: c5c6a916fe
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20281824
Change-Id: I29a538c561610c9a4bd642fce18ab2688406e172
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-26 21:43:43 +00:00
David Saff
c5c6a916fe
Merge "Disable broken NotificationStackScrollLayoutTest on qt-dev" into qt-dev am: b4ac90f433
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20281824
Change-Id: I5498db17843ed914125b5692321a29716ea2de21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-26 21:12:48 +00:00
Ats Jenk
ed7fd79631
Clean up desktop mode logging
...
We were logging "isDesktopModeActive" each time it was called, spamming
logs. Removed it.
Each time visible task info was updated, we logged that an active task
was added, even if the task was already marked as active. Updated
logging to only log when task is first time added to active. Same with
removing from active tasks. Only logging when it is actually removed
from active tasks.
Bug: 244348395
Test: manual, updating logging, verified that the logs are printed
Change-Id: I55075c222763c6cb08f2d0e6770aed831b78a369
2022-10-26 14:12:41 -07:00
David Saff
b4ac90f433
Merge "Disable broken NotificationStackScrollLayoutTest on qt-dev" into qt-dev
2022-10-26 20:40:59 +00:00
Dave Mankoff
99fedc19bb
Restart SystemUI on DeviceConfig changes.
...
Bug: 253062545
Test: atest SystemUITests
Change-Id: I905b17a6b4ba639749d6d82d08cecc55bda422a7
2022-10-26 20:05:48 +00:00
Evan Chen
facf686cad
Merge "Left aligned the Summary Description" into tm-qpr-dev
2022-10-26 19:23:28 +00:00
Evan Rosky
8275328013
Add a config to disable registering Shell Transitions in dagger
...
This is needed for android-auto where shell is actually in launcher
vs systemui.
Also have TaskViewTransitions use this information instead of checking
the flag so that it doesn't do anything in the process where it isn't
registered.
Bug: 255631687
Test: everything still works as expected
Change-Id: I61ad21575850f15fd821cc5c8239bf7246549936
2022-10-26 19:04:34 +00:00
TreeHugger Robot
a577c1d816
Merge "Always call stopMeasurementCollection before startMeasurementCollection" into tm-qpr-dev
2022-10-26 18:29:47 +00:00
Fabian Kozynski
a99cffb85e
Fix touches in Large screen header
...
When using large screen header and QS can scroll, the
NonInterceptingScrollView was intercepting the touches.
By moving the view after the qs_frame (in the children list), this makes
sure that the header has a chance to intercept touches first.
Test: manual, large display size (so it scrolls). Click on privacy
indicators and network settings.
Test: atest CtsPermission4TestCases
Fixes: 252791648
Change-Id: I91362981d34acd703487acfca8e8bd6f8fa953e9
2022-10-26 14:29:03 -04:00
Nate Myren
4e83e59b27
RESTRICT AUTOMERGE Revert "Revert "RESTRICT AUTOMERGE Validate permission tree size..."
...
Revert submission 20285709-revert-20103164-permTree-qt-dev-QWIEBZIWEA
Reason for revert: resubmission
Reverted Changes:
I0a3b68aff:Revert "RESTRICT AUTOMERGE Add PermissionMemoryFoo...
I4e8ec8b1a:Revert "RESTRICT AUTOMERGE Validate permission tre...
Change-Id: I3cd1aa270373bb32f95dfbe8422faa783ee49dca
2022-10-26 17:58:58 +00:00
Lyn Han
254acc56c1
Merge "Remove unused scaffolding for partial shelf overflow" into tm-qpr-dev
2022-10-26 17:26:58 +00:00
Beverly Tai
f4df5bc227
Merge "Gate & metrics log WakeReason for face auth run" into tm-qpr-dev
2022-10-26 15:52:34 +00:00
Xiaowen Lei
268f002098
Merge "Set required type for media entry chip complication." into tm-qpr-dev
2022-10-26 15:21:23 +00:00