Ats Jenk
4613b0f07d
Merge "Enable common logic for proto 1 and proto 2" into tm-qpr-dev
2022-12-09 00:43:04 +00:00
Chris Li
058fef7318
Merge "Fix ActivityEmbedding placeholder launching above fullscreen activity" into tm-qpr-dev am: 4706a5c650
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20647614
Change-Id: I8e51bd63e2b25065d0f98eaa1ae176cd99858be7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-09 00:30:42 +00:00
Austin Borger
3543aa808f
Merge "DO NOT MERGE CameraManager: Provide flag for overriding camera output to portrait." into tm-qpr-dev am: 0e7cbb04a2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20514192
Change-Id: I34c076307b9f6aab5709de57a9cbb6c4bd619fbe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-09 00:29:31 +00:00
Austin Borger
d420a8f684
DO NOT MERGE CameraManager: Provide flag for overriding camera output to portrait. am: ddc70c75f3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20514192
Change-Id: I7b06ebdd4dc46b5df2391adb9160a9cca7d19020
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-09 00:29:13 +00:00
Android Build Coastguard Worker
733d149f95
Snap for 9385690 from 548d669ce1 to tm-qpr2-release
...
Change-Id: I2f8e90697c8236aec9c3dee3b84a12f4481e5860
2022-12-09 00:21:19 +00:00
Chris Li
4706a5c650
Merge "Fix ActivityEmbedding placeholder launching above fullscreen activity" into tm-qpr-dev
2022-12-09 00:11:50 +00:00
Austin Borger
0e7cbb04a2
Merge "DO NOT MERGE CameraManager: Provide flag for overriding camera output to portrait." into tm-qpr-dev
2022-12-09 00:04:20 +00:00
TreeHugger Robot
edb9bd0c07
Merge "Ignore AlternateTouchProvider for UDFPS_NEW_TOUCH_DETECTION" into tm-qpr-dev am: 80d7be59bc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20635279
Change-Id: If810cea4cded68878857eac5ca07cee2b8e589f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-08 23:59:54 +00:00
Fabian Kozynski
c01709b4b7
Merge "Move trigger for dialog to change controls settings" into tm-qpr-dev am: 7dc6120c1a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20621516
Change-Id: I2ab447acb6a9aa85b62590cfbb316a655eb43ec8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-08 23:58:15 +00:00
Himanshu Gupta
a061067eb4
Merge "Fixing Storage Volume(s) Retrieval." into tm-qpr-dev am: 7527f61d86
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20582336
Change-Id: I951ee4b1ce79fe0159ee2b5dd359b30c981edd6e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-08 23:56:16 +00:00
Himanshu Gupta
c74bff2151
Merge "Fixing Storage Volume listing for Cloned User." into tm-qpr-dev am: 4a5b6525cd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20517233
Change-Id: I7c1338256a8068ede75b989c417633f62b00738f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-08 23:56:00 +00:00
Lyn Han
dd101aa822
Merge "Make Flags.FSI_CHROME accessible from kotlin" into tm-qpr-dev am: 548d669ce1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20599831
Change-Id: I57914982a859572eeaec18e79bb9ef09f5068c18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-08 23:49:09 +00:00
Julia Tuttle
1a1be0458e
Merge "Promote no_hun_for_old_when to teamfood" into tm-qpr-dev am: cbb3c5d960
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20650170
Change-Id: Icc859c0fd90b4889d4dd771326787426adefbee1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-08 23:48:08 +00:00
Aaron Liu
6697a354e1
Merge "[Bouncer] refine entry for bouncer user switcher." into tm-qpr-dev am: d77c16f960
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20654514
Change-Id: Id5726b8c3cda5a0e698d14b9d0ebd31961313a6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-08 23:45:28 +00:00
Aaron Liu
a9954ba8ca
Merge "[Bouncer] Remove margin top for bouncer view." into tm-qpr-dev am: 383be0ac55
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20643913
Change-Id: Id70ae3fcb8bfe1f98b5d6fdafebfbed99df43dc1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-08 23:43:40 +00:00
Beverly Tai
6e2fad23cf
Merge "Allow pickupGestureEnabled default configurable" into tm-qpr-dev am: fb952d5f3c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20665999
Change-Id: I1bcdd4d8e28dd109d95b0a6224b4349505636ac0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-08 23:41:54 +00:00
Jernej Virag
a4d1bed672
Merge "Add flag to gate Notification memory logging via statsd" into tm-qpr-dev am: b37bd87a54
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20662415
Change-Id: Ib7d613317fc05cfd588f4edb740159094c662b37
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-08 23:40:31 +00:00
Lucas Silva
8d46cbb3c7
Merge "Move condition logic to shared lib so it can be reused in DockSetup apk" into tm-qpr-dev am: 3a1994eac8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20639742
Change-Id: Ib6d279520ac833de8f2eedb796cdbc3f43293faa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-08 23:38:45 +00:00
Fabian Kozynski
dec138b04b
Merge "Fix crash when trying to dismiss dialog" into tm-qpr-dev am: 0bfdbbf4c2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20644637
Change-Id: Icc1152de1556ab12b001d68ad03b28afea93053f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-08 23:35:38 +00:00
TreeHugger Robot
dc0b297026
Merge "Remove old footer actions implementation" into tm-qpr-dev am: 3c86fce3a9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20579501
Change-Id: I76810bd8744e557b154162de6dbaaa4655d6c337
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-08 23:34:28 +00:00
TreeHugger Robot
5a597e25c0
Merge "Logging fold update name instead of just integer for easier bug report reading" into tm-qpr-dev am: acc8dd3223
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20607649
Change-Id: Ida4221fbccad35d9104db7caa660ef1e88c22cf8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-08 23:33:26 +00:00
Chris Poultney
ee0a35186b
Merge "Add home/lock screen argument to remaining methods that require one" into tm-qpr-dev am: 56a0d71936
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20596157
Change-Id: Ifec6ef77812aaaa4d3a926bd62c024a4841665f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-08 23:31:39 +00:00
TreeHugger Robot
d2433ad4b1
Merge "Increase power-press timeout" into tm-qpr-dev am: b9e3f7135a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20649591
Change-Id: If01429621333a000e5b4fe557f3e60aabc2665bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-08 23:30:22 +00:00
Chris Li
684c3938fb
Merge "Request change transition for layout direction change for legacy" into tm-qpr-dev am: d7994f8a97
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20617956
Change-Id: Id8fe77d784d6f0390f7a0e1e0d92f6d074ec09f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-08 23:28:39 +00:00
Shaowei Shen
23b5b5c833
Merge "[Output Switcher] Update device selection layout" into tm-qpr-dev am: 31b52d1bad
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20639447
Change-Id: I77f09408a7464cc451c75ed5f55668c46b82bddb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-08 23:27:24 +00:00
Chris Li
3bfaa4f91a
Merge "Fix ActivityEmbedding animation with new split in different layout" into tm-qpr-dev am: 1d90ad8bab
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20617837
Change-Id: I3c63c29daabe3ec66c337244d58f35100033f6ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-08 23:26:19 +00:00
Chris Li
b735a1cb1f
Merge "Fix customized activity open/close animation backdrop color" into tm-qpr-dev am: 53c5aa6792
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20662608
Change-Id: I741fe83ed27a928751607d232de94cd4857f010b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-08 23:25:18 +00:00
Jing Ji
cb12f2a221
[automerger skipped] Merge "DO NOT MERGE: Context#startInstrumentation could be started from SHELL only now." into rvc-qpr-dev am: 95907cfca2 -s ours am: d577c51c3d -s ours am: f684abcd18 -s ours am: 64da92499e -s ours am: e166e03ed3 -s ours am: d094458104 -s ours am: 72e5627c7a -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20322505
Change-Id: I1799b869cb303606ac0ccff1141497899b4e6940
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-08 23:23:11 +00:00
Jing Ji
bfb4a7fcd5
[automerger skipped] DO NOT MERGE: Context#startInstrumentation could be started from SHELL only now. am: 0b75cda3c2 -s ours am: 7fe7416e79 -s ours am: a41bf91d53 -s ours am: c22b698208 -s ours am: 1e076760e6 -s ours am: 27e23a3d50 -s ours am: df2277b423 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20322505
Change-Id: I60b859dbbd91b7f5d70cd85d5a2815f560a23640
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-08 23:22:45 +00:00
Pinyao Ting
025e234f56
[conflict] Merge "Implement a global maximum on number of shortcuts an app can publish" into rvc-dev am: 584d18790a am: f9a6a136a0 am: bb4ff2e484 am: eee3312ac2 am: 4611aa5717 am: 69042ba58f am: 891d482fb6 am: c6ec6164dc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20671668
Change-Id: I68fbe768c8b6d9fe1010a3d76037423f3ffae2fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-08 23:22:02 +00:00
Evan Laird
e6a924a66d
Merge changes I4977aa47,I87686213,If4bd3e31,I727ad3ca,Ib02a1eb6 into tm-qpr-dev am: 18917a1820
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20665129
Change-Id: I6fbc97e490f2f6b521b51861a99cfa96aa1238b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-08 23:21:33 +00:00
Shaowei Shen
b9d3d14757
Merge "[Output Switcher] Update Volume control in Output Switcher" into tm-qpr-dev am: 951ceea51c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20607486
Change-Id: I0291e48c63134191a211816dbf42ee02fd205b5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-08 23:20:50 +00:00
TreeHugger Robot
1d5d502522
Merge "[Chipbar] Don't add null icon descriptions to the main description." into tm-qpr-dev am: 6fa4943481
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20650171
Change-Id: I422bb23c17648010ff23dc1476a7ee2f05ccad21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-08 23:19:40 +00:00
TreeHugger Robot
ef00537894
Merge "[Chipbar] Always tint the start icon correctly." into tm-qpr-dev am: 80821636d9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20652875
Change-Id: Ibebf161374c1305c902e8488d2a6cf926a10351f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-08 23:18:32 +00:00
Patrick Baumann
270d6cfebf
Merge changes from topic "PackageManagerServiceTests-tm-qpr-dev" into tm-qpr-dev am: 051e23fab4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20656490
Change-Id: I2e6c36f91418cfadb84f0fa50f49935a6f4ca222
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-08 23:16:37 +00:00
Patrick Baumann
edb489cb7c
Merge "[conflict] Moving PackageManagerServiceTests to their own suite. am: b8859a2055" into tm-qpr-dev-plus-aosp
2022-12-08 23:03:53 +00:00
Yein Jo
68ebf467e0
Fix RippleFinished being called on first draw.
...
Bug: 261492904
Test: MultiRippleControllerTest
Change-Id: I6d56a901f898485578ae5acf6d8cae24a269652d
2022-12-08 22:08:28 +00:00
TreeHugger Robot
80d7be59bc
Merge "Ignore AlternateTouchProvider for UDFPS_NEW_TOUCH_DETECTION" into tm-qpr-dev
2022-12-08 22:03:32 +00:00
Aurélien Pomini
b49b0aec0b
Move all the ImageWallpaper logic outside the main thread
...
In order to avoid any thread contention, all the ImageWallpaper logic should be moved out of the main thread. This CL moves the last things that were done on the main thread:
- Call surface.lockCanvas and canvas.drawBitmap
- Call reportEngineShown
Bug: 242969351
Test: atest ImageWallpaperTest
Test: treehugger
Change-Id: I2a4400c8eaf0d9b8a182e618655855188a15892b
2022-12-08 21:03:10 +00:00
Fabian Kozynski
7dc6120c1a
Merge "Move trigger for dialog to change controls settings" into tm-qpr-dev
2022-12-08 20:59:52 +00:00
Himanshu Gupta
7527f61d86
Merge "Fixing Storage Volume(s) Retrieval." into tm-qpr-dev
2022-12-08 20:58:18 +00:00
Himanshu Gupta
4a5b6525cd
Merge "Fixing Storage Volume listing for Cloned User." into tm-qpr-dev
2022-12-08 20:58:18 +00:00
Alex Buynytskyy
eda2dda95e
[conflict] Moving PackageManagerServiceTests to their own suite. am: b8859a2055
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20656487
Change-Id: I4ba8fe95c2f38bcc5f6a7cf01771082226f15420
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
Merged-In: Iacc89c7525d8d9beec39c242bfc305ad08844580
2022-12-08 20:26:52 +00:00
Hongwei Wang
cabd5d5592
Ensure SysUI gets VIS callback when session's over
...
There are chances that SysUI does not get the
onVoiceSessionWindowVisibilityChanged(false) callback if the
voice interaction window was visible then the connection is closed.
This could cause issue for TaskBar since TaskBar relies on the callback
to clear its intermediate state.
Video: http://recall/-/b1EZhgUkQcpML5OwZekLBN/giEfwSaYA9saSOfGQwCAus
Bug: 254070601
Test: follow the reproduce steps in bug, see also video
Change-Id: I0222eea38179620c36253f47f332536ffb9e434c
2022-12-08 12:26:39 -08:00
bkchoi
b2fafea71b
Fix a bug in UserSystemPackageInstaller#installWhitelistedSystemPackages
...
When userWhitelist was not null, it only mutated the packages in
userWhitelist, and other packages left untouched.
The correct behavior is to iterate all packages and install or
uninstall according to userWhitelist.
BYPASS_INCLUSIVE_LANGUAGE_REASON=existing code that cannot be changed
Fixes: 234877652
Test: atest UserSystemPackageInstallerTest
Test: Manual test with gcar_emu_x86_64 emulator
(cherry picked from commit 2fce090146 )
Merged-In: I4325565d8acaeffd4aab5a4b6295d325edb738a9
Change-Id: I4325565d8acaeffd4aab5a4b6295d325edb738a9
2022-12-08 20:13:31 +00:00
Florence Yang
529fba976e
Enable Region Sampling Flag for Teamfood
...
Enable teamfood for region sampling text protection feature that's
hidden behind a flag. This is in hopes of having more people test the feature to catch bugs and get more feedback.
Bug: 202758428
Test: manual
Change-Id: If29b183114c06ab90edaf78765a4c8eb2d8c6bb6
2022-12-08 20:06:48 +00:00
Shawn Lee
ee49e0270a
Added logging for setting mMotionAborted in NPVC
...
Added logs for when we flag motion events as aborted and
filled in gaps for when we throw away touches in NPVC
Bug: 258708442
Test: n/a
Change-Id: Ie696834fac32a02ac509b94d75d9feea5785946a
2022-12-08 11:48:32 -08:00
Lyn Han
548d669ce1
Merge "Make Flags.FSI_CHROME accessible from kotlin" into tm-qpr-dev
2022-12-08 19:33:37 +00:00
Hawkwood Glazier
f400d32813
Fix Positioning of large custom clocks within frame
...
This reverts Iaeddce2d99a2b8db5afb6ac8ca508eeab3ae223e without
reintroducing b/259758161. It does this by compensating for the
change in margin in KeyguardClockSwitchController.getClockBottom().
This maintains existing functionality for the aod behaviour in
KeyguardClockPositionAlgorithm. As part of validation I confirmed
that the arguments to KeyguardClockPositionAlgorithm.setup did not
change with this patch.
Bug: 259758161
Fixes: 261754025
Test: Manually checked KeyguardClockPositionAlgorithm
Change-Id: I119abb49a018f6fb505100ea985d3b4121ac59f7
2022-12-08 19:10:34 +00:00
Steven Moreland
9f86720c57
Merge "Use android.hardware.graphics.common-ndk and composer3-ndk wrappers." into tm-qpr-dev-plus-aosp
2022-12-08 18:53:31 +00:00