Wenhao Wang
9092315bb5
[automerger skipped] DO NOT MERGE Suppress notifications when device enter lockdown am: 1f789841fe -s ours am: 3506ab2cc7 -s ours am: 05d1dd3df1 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17880724
Change-Id: I5ca638580a607949314a9e067f2a144f5262d84e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 16:30:14 +00:00
Presubmit Automerger Backend
eafa73c374
[automerger skipped] [automerge] DO NOT MERGE Suppress notifications when device enter lockdown 2p: b1099290b8 am: 018f1c6ce6 -s ours am: ba093891a1 -s ours am: 5c3e5e005b -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17875442
Change-Id: I6186667d0b14427b46af3cb2f7facdcfadba0a7a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 16:27:15 +00:00
Wenhao Wang
4106456d49
[automerger skipped] Merge "DO NOT MERGE Suppress notifications when device enter lockdown" into sc-v2-dev am: 7c4f648b0f -s ours am: e32e565af6 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17880725
Change-Id: Ib20501d0fb7e0c7194d42069438d32b6ceda9773
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 16:25:38 +00:00
Wenhao Wang
9027f00eec
[automerger skipped] DO NOT MERGE Suppress notifications when device enter lockdown am: 62845d9af7 -s ours am: 675f29e0ef -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17880725
Change-Id: I42b709dce311170f387ca8528616b31c341d9f2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 16:25:32 +00:00
James O'Leary
e902b8db6e
Merge changes from topic "variants_landing" into tm-dev am: ee74679e85
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17943620
Change-Id: I7e92448f8da1b1ca206ba5ca81d5cae757c32fdc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 16:25:08 +00:00
James O'Leary
8068fac98c
Adjust variants specs to match latest UX spec. am: 6a82afbb82
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17937868
Change-Id: I2c8fe27cab64dcefb8b78a64195536fa2ebf3209
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 16:25:02 +00:00
Wenhao Wang
fe5f26abe5
[automerger skipped] Merge changes from topic "lockdown-mode-qt-dev-rvc-dev-sc-dev" into tm-dev am: 5ada3e16cf -s ours
...
am skip reason: Merged-In I7e83544863eeadf8272b6ff8a9bb8136d6466203 with SHA-1 02771b7fc3 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17875442
Change-Id: I04e6f10d0218046cf23f7947a5c1c0facec29f94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 16:24:20 +00:00
Presubmit Automerger Backend
55d00c577a
[automerger skipped] [automerged blank] DO NOT MERGE Suppress notifications when device enter lockdown 2p: b1099290b8 2p: d6a8e6d013 am: 16969bde0c -s ours
...
am skip reason: Merged-In I7e83544863eeadf8272b6ff8a9bb8136d6466203 with SHA-1 02771b7fc3 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17875442
Change-Id: I695d5057aa575010c6c07e849526a5c3c8055b0a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 16:24:17 +00:00
Steve Elliott
684dc7a46e
Merge "Use correct groupKey API for notif groups" into tm-dev am: 502a44e15a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17989540
Change-Id: I67b7401bfc18fa0246709b390d8977c0e88d0538
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 16:23:03 +00:00
Josh Tsuji
b16ae20c70
Merge changes Iee97d469,Ica1b552a into tm-dev am: 50f19f212e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17892807
Change-Id: I8e49b564e2b5e90943ddc521a17fb664b0f1850f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 16:22:40 +00:00
Kiwon Park
cb63a3e67e
Merge "Log TelephonyAnomalyDetected event from AnomalyReporter" into tm-dev am: c49ba33ac0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17802633
Change-Id: I4cd32ba71811f9efcf4bab08dacfbc5d80a2595c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 16:22:09 +00:00
Nikita Dubrovsky
a570422609
Merge "Remove manual pregrants for AttentionService (handled via roles)" into tm-dev am: 0f9f5f9379
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17190244
Change-Id: If9c25b128c3649e5bff562af4af9ddc4eb5306a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 03:04:45 +00:00
Wenhao Wang
05d1dd3df1
[automerger skipped] DO NOT MERGE Suppress notifications when device enter lockdown am: 1f789841fe -s ours am: 3506ab2cc7 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17880724
Change-Id: I8e432acebc86ef1b6c9182a823ccfd72d08beb74
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-28 20:50:39 +00:00
Presubmit Automerger Backend
5c3e5e005b
[automerger skipped] [automerge] DO NOT MERGE Suppress notifications when device enter lockdown 2p: b1099290b8 am: 018f1c6ce6 -s ours am: ba093891a1 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17875442
Change-Id: If1e6edaa78cfe8f07c17951348f1d5554e544f45
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-28 20:50:19 +00:00
Salud Lemus
67dd02d5cc
Merge "Update canSilentlyInstallPackage DPMS API for financed device owner" into tm-dev am: 7977353cd2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17949573
Change-Id: I292ff0e552a4d9d4f7ba44af4f0e0c80ed7a17e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-28 20:46:12 +00:00
Prabal Singh
3b89f7dcf6
Merge "Edit workPolicyUtil constructor" into tm-dev am: c39095ff0f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17989404
Change-Id: I9a4ee60e30253e538a49f774f5da9c5c851c496d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-28 20:42:55 +00:00
Wenhao Wang
3506ab2cc7
[automerger skipped] DO NOT MERGE Suppress notifications when device enter lockdown am: 1f789841fe -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17880724
Change-Id: Ia90c7622629c8d2a8c2148827c99304b2b60b504
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-28 20:40:54 +00:00
Presubmit Automerger Backend
ba093891a1
[automerger skipped] [automerge] DO NOT MERGE Suppress notifications when device enter lockdown 2p: b1099290b8 am: 018f1c6ce6 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17875442
Change-Id: I182375ab3aa34f914fdb33bdce04c0ceabbf6792
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-28 20:40:34 +00:00
Wenhao Wang
e32e565af6
[automerger skipped] Merge "DO NOT MERGE Suppress notifications when device enter lockdown" into sc-v2-dev am: 7c4f648b0f -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17880725
Change-Id: Ie3b8790618561f91d469f68d77cf82181de13bcd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-28 20:39:04 +00:00
Wenhao Wang
675f29e0ef
[automerger skipped] DO NOT MERGE Suppress notifications when device enter lockdown am: 62845d9af7 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17880725
Change-Id: I9c4e7b18c839116bc52a7a74052cf6c9233d9357
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-28 20:38:51 +00:00
James O'Leary
ee74679e85
Merge changes from topic "variants_landing" into tm-dev
...
* changes:
Add color scheme constructor that takes WallpaperColors & Style objects
Adjust variants specs to match latest UX spec.
2022-04-28 20:31:19 +00:00
Wenhao Wang
7c4f648b0f
Merge "DO NOT MERGE Suppress notifications when device enter lockdown" into sc-v2-dev
2022-04-28 19:46:33 +00:00
Wenhao Wang
5ada3e16cf
Merge changes from topic "lockdown-mode-qt-dev-rvc-dev-sc-dev" into tm-dev
...
* changes:
[automerged blank] DO NOT MERGE Suppress notifications when device enter lockdown 2p: b1099290b8 2p: d6a8e6d013
[automerge] DO NOT MERGE Suppress notifications when device enter lockdown 2p: b1099290b8
DO NOT MERGE Suppress notifications when device enter lockdown
2022-04-28 19:45:44 +00:00
Steve Elliott
502a44e15a
Merge "Use correct groupKey API for notif groups" into tm-dev
2022-04-28 19:10:18 +00:00
Josh Tsuji
50f19f212e
Merge changes Iee97d469,Ica1b552a into tm-dev
...
* changes:
fadeInSurfaceBehind() when the remote animation starts.
Clear task snapshot when we showSurfaceBehindKeyguard.
2022-04-28 17:52:10 +00:00
Kiwon Park
c49ba33ac0
Merge "Log TelephonyAnomalyDetected event from AnomalyReporter" into tm-dev
2022-04-28 17:25:04 +00:00
Nikita Dubrovsky
0f9f5f9379
Merge "Remove manual pregrants for AttentionService (handled via roles)" into tm-dev
2022-04-28 17:16:32 +00:00
Salud Lemus
7977353cd2
Merge "Update canSilentlyInstallPackage DPMS API for financed device owner" into tm-dev
2022-04-28 17:16:13 +00:00
Prabal Singh
c39095ff0f
Merge "Edit workPolicyUtil constructor" into tm-dev
2022-04-28 17:12:28 +00:00
Yu-Han Yang
7e78c729db
Merge "Hold the reference of TelephonyCallback" into tm-dev am: 76de9f1eab
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17946240
Change-Id: I5690f54277f0838ae9408bf7f670ce1697f5c86e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-28 16:41:33 +00:00
TreeHugger Robot
1d46a16c19
Merge "Fix IME layering issue by non-focusable IME target overlay" into tm-dev am: 23765fcbb6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17751851
Change-Id: I4c5d88abca7fb20e0af27bc2e34b88cdfa1e1b76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-28 16:41:04 +00:00
Lyn Han
f416761e2b
Merge "Fix notification shelf issues" into tm-dev am: 11bfc9677d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17896364
Change-Id: I9aaabdd0577bdd3465ee96d420a36914b54f02cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-28 16:40:45 +00:00
TreeHugger Robot
4fa5f62ef1
Merge "Fixes UMS.getPreCreatedUserLU() to ignore partial pre-created users." into tm-dev am: 26e995aaf0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17917999
Change-Id: I651ee464a3ead841a139c91dfb591b6d4f867c69
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-28 16:40:26 +00:00
Songchun Fan
1637f88a2c
Merge "[SettingsProvider] enforce permission on openFile" into tm-dev am: 0cb62fa9c7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17970005
Change-Id: Ie04c3595038bfbca13a8de610712ccae53564ac0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-28 16:40:04 +00:00
Lucas Dupin
f3c5eaae8e
Merge "Do not ignore forceReload requests" into tm-dev am: 8ed3ef0fab
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17988792
Change-Id: I83e988612b5c0bf5213325f3c4bf3f9fdff723cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-28 16:39:43 +00:00
TreeHugger Robot
e65411d0ae
Merge "Fix unexpected IME switcher dialog hidden" into tm-dev am: 441515483d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17252923
Change-Id: I15f02ae857c38b9d2a0bb060cc0fd5b2c0e3ae64
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-28 16:39:18 +00:00
Yu-Han Yang
76de9f1eab
Merge "Hold the reference of TelephonyCallback" into tm-dev
2022-04-28 16:27:04 +00:00
TreeHugger Robot
23765fcbb6
Merge "Fix IME layering issue by non-focusable IME target overlay" into tm-dev
2022-04-28 16:23:02 +00:00
Lyn Han
11bfc9677d
Merge "Fix notification shelf issues" into tm-dev
2022-04-28 16:19:15 +00:00
TreeHugger Robot
26e995aaf0
Merge "Fixes UMS.getPreCreatedUserLU() to ignore partial pre-created users." into tm-dev
2022-04-28 16:18:15 +00:00
Songchun Fan
0cb62fa9c7
Merge "[SettingsProvider] enforce permission on openFile" into tm-dev
2022-04-28 16:00:04 +00:00
Lyn Han
50f61bfdb7
Fix notification shelf issues
...
NotificationShelf/StackScrollAlgorithm:
Define "shelfStart" as yTranslation of space before the shelf
because that is the point where we no longer see the notification
being clipped by the shelf.
StackSizeCalculator:
Add missing divider before first element.
Currently, all elements have divider before them. This is not ideal
as we should be saving vertical space when possible - this will be
addressed in a future change since this change is focused on fixing
the mismatch between StackSizeCalculator and StackScrollAlgorithm.
NotificationIconContainer:
Remove overflowWidth since it is always a single iconWidth.
We can use iconWidth instead of keeping this unused scaffolding
for showing multiple dots.
Fixes: 227361193
Test: NotificationStackSizeCalculatorTest
Test: NotificationIconContainerTest
Test: on lockscreen, have 4+ notifications, swipe them away
=> shelf updates icons as expected
=> shelf does not only show a single overflow dot
Change-Id: I431a00c78a26186446182ef91f7b8935f5f422d2
2022-04-28 15:55:41 +00:00
Lucas Dupin
8ed3ef0fab
Merge "Do not ignore forceReload requests" into tm-dev
2022-04-28 15:41:04 +00:00
TreeHugger Robot
441515483d
Merge "Fix unexpected IME switcher dialog hidden" into tm-dev
2022-04-28 15:35:29 +00:00
Michał Brzeziński
41ef50c877
Merge "Fixing setting mQsExpandImmediate state in correct context in split shade" into tm-dev am: b5310919c8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17955864
Change-Id: I66cc318bfa79a7b174b3c11a1500f4715a563862
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-28 14:24:20 +00:00
Prabal Singh
c6c6920991
Edit workPolicyUtil constructor
...
We only need to pass context in the constructor for workPolicyUtil.
The other dependencies can be derviced from the context.
Test: manual
Change-Id: If97ee93e7812d0768489f038d965212332df9e2c
2022-04-28 15:19:31 +01:00
Michał Brzeziński
b5310919c8
Merge "Fixing setting mQsExpandImmediate state in correct context in split shade" into tm-dev
2022-04-28 13:46:23 +00:00
Louis Chang
547b8e2c95
Merge "Adding null check to prevent NPE" into tm-dev am: da9b7dcacc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17938066
Change-Id: Ie876fbdc75dbcb96ac95b89dd9943b48638ccef0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-28 13:40:12 +00:00
Louis Chang
da9b7dcacc
Merge "Adding null check to prevent NPE" into tm-dev
2022-04-28 13:33:43 +00:00
Fabian Kozynski
c20fdcba08
Merge "Set title for privacy dialog" into tm-dev am: e2b3d4ec6b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17958128
Change-Id: I477ee6f956a3722b6b4a6ac6ff0f3233e1b7c819
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-28 13:30:07 +00:00