Bill Yi
d1dd671163
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2e48ec156f -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18585030
Change-Id: I0a68139fcb46e991b86cea3001276beb5d4d3533
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 19:05:54 +00:00
TreeHugger Robot
240b4e7b47
Merge "Catch when telecom isn't ready yet" into tm-dev am: 5a633e1b99
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18577095
Change-Id: I66548101306b1c2a3d6b93108abf826b9b21b795
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 18:16:40 +00:00
Songchun Fan
6170b6514a
Merge "[pm] update shared libraries if the old package used it" into tm-dev am: f77a4fd308
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18589115
Change-Id: I06e66549bb8937085a03636fe3f7a945473a1b75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 18:16:19 +00:00
Andrii Kulian
a15c08cb85
Merge "Synchronize SplitController" into tm-dev am: d4d0fee814
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18418602
Change-Id: I8580f43a7225000ad124c790a2a3351cef42f6c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 18:15:50 +00:00
TreeHugger Robot
5a633e1b99
Merge "Catch when telecom isn't ready yet" into tm-dev
2022-05-25 18:13:06 +00:00
Songchun Fan
f77a4fd308
Merge "[pm] update shared libraries if the old package used it" into tm-dev
2022-05-25 17:52:36 +00:00
Andrii Kulian
d4d0fee814
Merge "Synchronize SplitController" into tm-dev
2022-05-25 17:48:24 +00:00
Mateusz Cicheński
b2cd9af9c5
Merge "Check for null mLeash before setting alpha." into tm-dev am: 1f9afd727a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18585595
Change-Id: I5dcb324bbdd9028b7fe4cf56c0d43383b4fb567a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 17:02:57 +00:00
Mateusz Cicheński
1f9afd727a
Merge "Check for null mLeash before setting alpha." into tm-dev
2022-05-25 16:35:38 +00:00
Jack Yu
ccda49065b
Merge "Traffic descriptor only data profile should be enabled" into tm-dev am: e55b0a1f17
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18567917
Change-Id: I12accca49ced1a57b037ac62c470a6e9737f8b2a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 16:09:16 +00:00
Jack Yu
e55b0a1f17
Merge "Traffic descriptor only data profile should be enabled" into tm-dev
2022-05-25 15:46:25 +00:00
Jeff DeCew
b3d48b82bb
Revert suppression of recalculation to fix jump after aod->ls animation am: c003cb8785
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18581099
Change-Id: Ie49d9b3fe6cf62f8a27bcc07b267510528dc898f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 14:58:24 +00:00
Jeff DeCew
c003cb8785
Revert suppression of recalculation to fix jump after aod->ls animation
...
The change I6575f733b17d6c8905150c0a7854d752dd0a5cfe suppressed recalculation of the number of notifications whenever dozeAmount != 0. However, this meant that from the time the device was locked to the time it finished the screen on animation, the number of notifications that fit on the device was never updated. In cases where notifications changed while on aod, this meant the number could be completely wrong. But even without that, this meant that when locking the device and then unlocking, the count would be based on the height of the notifications given their non-keyguard expansion state (i.e. first notification expanded) which meant that we almost always showed too few notifications during the aod->ls transition.
I am unable to reproduce b/229882633 (which that CL was fixing) until I also revert I139d25e2bb57257a18f18f6288f3e18b7a1b72d1 which landed a week later.
Bug: 229882633
Fixes: 232079794
Test: atest NotificationPanelViewControllerTest
Test: numerous failed attempts to reproduce b/229882633#comment2
Test: unlock; screen off (to aod); screen on (to ls); observe no jumps
Test: post notify notifications with "no text" ; slow animations; lock; aod -> ls; post notifications via shell during animation; observe no jumps during or at end of animation
Change-Id: Ib3a3c6377a71cc4c1a1b06eb652237a5493a56d0
2022-05-25 10:59:29 +00:00
Lucas Lin
ef0cdab0bb
Merge changes from topics "CATEGORY_EVENT_ALWAYS_ON_STATE_CHANGED", "CATEGORY_EVENT_DEACTIVATED_BY_USER" into tm-dev am: 0b2c39c7b2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18114464
Change-Id: I23eff6c22c463f782094f06ebeac60aa61608edf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 10:42:25 +00:00
lucaslin
8ababe764e
Send VPN manager event when VPN always-on status is changed am: 52f9de422d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18112116
Change-Id: I371bd0fc5db8c576a721fbd02333dbd9acc17ce6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 10:42:23 +00:00
Lucas Lin
0b2c39c7b2
Merge changes from topics "CATEGORY_EVENT_ALWAYS_ON_STATE_CHANGED", "CATEGORY_EVENT_DEACTIVATED_BY_USER" into tm-dev
...
* changes:
Send VPN manager event when VPN is deactivated
Send VPN manager event when VPN always-on status is changed
2022-05-25 10:20:18 +00:00
TreeHugger Robot
e4e4c11cb3
Merge "Do not get portInfo if physical address is 0x0000" into tm-dev am: 054f5c15c9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18570258
Change-Id: I80f92b7efa46fd421b80aa6c2cea991ec5eee12c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 10:09:09 +00:00
TreeHugger Robot
054f5c15c9
Merge "Do not get portInfo if physical address is 0x0000" into tm-dev
2022-05-25 09:50:05 +00:00
Sudheer Shanka
0589c6cc20
Merge "Allow shell uid without checking the package name." into tm-dev am: 5caf3932af
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18584744
Change-Id: I228915f8299e68c160e170f9ea8d8448e54b20fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 08:30:11 +00:00
Sudheer Shanka
5caf3932af
Merge "Allow shell uid without checking the package name." into tm-dev
2022-05-25 08:13:54 +00:00
Tony Huang
d155710371
Merge "Fix NPE if draging again while animating" into tm-dev am: a876e7b2d0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18570244
Change-Id: I50e7b59f716fb979f96bce9ab63b5f99ceee5363
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 07:10:48 +00:00
Calvin Pan
8a677d4a0d
Merge "Fix using incorrect view in app language selection" into tm-dev am: fa264b81be
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18579445
Change-Id: I89b8165445d37174356f0d06da38bfd139324a44
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 07:09:13 +00:00
Tony Huang
a876e7b2d0
Merge "Fix NPE if draging again while animating" into tm-dev
2022-05-25 06:53:54 +00:00
Calvin Pan
fa264b81be
Merge "Fix using incorrect view in app language selection" into tm-dev
2022-05-25 06:51:35 +00:00
TreeHugger Robot
b17d87fc21
Merge "Use max height attr as backup for device config" into tm-dev am: 248de47fe1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18529605
Change-Id: Ie2f1b0b1c3d82ace9b4f517fb0ce0f6bea537933
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 03:54:20 +00:00
Andrii Kulian
40a67faae4
Synchronize SplitController
...
Adding synchronization to the public methods in SplitController,
as they might be called on different threads and cause a
ConcurrentModificationException.
Bug: 228201646
Test: atest CtsWindowManagerJetpackTestCases --iterations 100
Change-Id: I2db9ccb5e9829487eae7aa85eff5f6153721cc04
2022-05-25 03:32:54 +00:00
TreeHugger Robot
248de47fe1
Merge "Use max height attr as backup for device config" into tm-dev
2022-05-25 03:26:37 +00:00
Calvin Pan
5f8fa45e80
Fix using incorrect view in app language selection
...
Bug: 233175025
Test: By manual
Change-Id: Idd5b277cdfb737acf9262ff5efbeca93afaa100f
2022-05-25 03:15:19 +00:00
Lyn Han
0dd9f89200
Merge "Revert "Make media squishy for portrait shade open and close"" into tm-dev am: 5bcfb4c3fd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18566290
Change-Id: I05724615a419501bbf88b6f2305899b71ef12782
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 03:02:19 +00:00
TreeHugger Robot
c8571df946
Merge "Add ALL_INCLUDING_DISPLAYS category for getDisplays()" into tm-dev am: d5b0c3f163
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18488313
Change-Id: I7d8ed0e3dd91a8c0bd54868de5333f63d2268fdf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 03:01:12 +00:00
Matt Casey
78803a58ea
Merge "Fix chooser handle color." into tm-dev am: e55d23f3ae
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18581092
Change-Id: Ieaedbdd7a2ae3b1cd80eb2e541a3f9824b78f937
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 03:00:58 +00:00
Calvin Pan
62d3c47058
Merge "Fix app language show "Und" when all languages in the suggestion list" into tm-dev am: 8848ca6f3b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18570256
Change-Id: If2d7b1d87fc3cfa7e3e3f5ae709b983f14829f4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 03:00:44 +00:00
Matt Casey
198c72adcd
Merge "Align outer edge of profile tabs and icons" into tm-dev am: 4a191d7fad
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18566767
Change-Id: Ie03da3c82960034d1777511e58b1dc04a4ee6e70
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 03:00:26 +00:00
Lyn Han
5bcfb4c3fd
Merge "Revert "Make media squishy for portrait shade open and close"" into tm-dev
2022-05-25 02:49:22 +00:00
TreeHugger Robot
d5b0c3f163
Merge "Add ALL_INCLUDING_DISPLAYS category for getDisplays()" into tm-dev
2022-05-25 02:40:34 +00:00
Matt Casey
e55d23f3ae
Merge "Fix chooser handle color." into tm-dev
2022-05-25 02:40:30 +00:00
Calvin Pan
8848ca6f3b
Merge "Fix app language show "Und" when all languages in the suggestion list" into tm-dev
2022-05-25 02:36:24 +00:00
Matt Casey
4a191d7fad
Merge "Align outer edge of profile tabs and icons" into tm-dev
2022-05-25 02:34:45 +00:00
TreeHugger Robot
f5b33da6ea
Merge "[CDM] Update binding flag for self-managed apps" into tm-dev am: c4be963fe0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18567157
Change-Id: If52e7fc27410c93c4eb082ce4d9cb578326acf9f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 01:48:07 +00:00
TreeHugger Robot
c4be963fe0
Merge "[CDM] Update binding flag for self-managed apps" into tm-dev
2022-05-25 01:38:30 +00:00
Yuri Lin
34729d7910
Merge "Disable review permissions notification with config flag" into tm-dev am: fe8f3855a6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18581093
Change-Id: I139cbc3a9b7c3e3db735c0e9a45635673aa0693f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 01:30:38 +00:00
Santos Cordon
f9a5d08ada
Merge "Apply a maximum time to Screen brightness RampAnimator." into tm-dev am: 7cda9b01e3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17707268
Change-Id: Ie18b5e91bfb3470727085a5b984633219ed88804
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 01:30:15 +00:00
TYM Tsai
34fe95788a
Merge "Fix inline tooltip position is wrong" into tm-dev am: edca30dce8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18350147
Change-Id: I9f4aac26f0960036f13860cc24281daebba3cd2c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 01:29:52 +00:00
Yuri Lin
fe8f3855a6
Merge "Disable review permissions notification with config flag" into tm-dev
2022-05-25 01:26:47 +00:00
Santos Cordon
7cda9b01e3
Merge "Apply a maximum time to Screen brightness RampAnimator." into tm-dev
2022-05-25 01:11:38 +00:00
TYM Tsai
edca30dce8
Merge "Fix inline tooltip position is wrong" into tm-dev
2022-05-25 01:05:17 +00:00
Sudheer Shanka
6db81c15df
Allow shell uid without checking the package name.
...
Bug: 230779051
Test: manual
Change-Id: I2867a15840a0987c948179e2f8069e652c4a0c1f
2022-05-24 17:37:48 -07:00
TreeHugger Robot
646ae22229
Merge "MessagingImageMessage: Don't crash if measured after recycle" into tm-dev am: ec3ee0a5c3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18577093
Change-Id: Ic462a801aa9b5322285600c86bb52fcbaf0c7bd7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 00:14:45 +00:00
TreeHugger Robot
ec3ee0a5c3
Merge "MessagingImageMessage: Don't crash if measured after recycle" into tm-dev
2022-05-25 00:08:29 +00:00
Jack Wang
22b5b92afc
Merge "Grant visibility of voice interaction to the client app" into tm-dev am: b92b97dd6d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17730109
Change-Id: I9bd631e305becedf9926dbdf485d79ddf3f8b4e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 00:07:00 +00:00