Commit Graph
83004 Commits
Author SHA1 Message Date
Sihua Ma 36344a9c27 Merge "Update widget picker row logic to resolve cropping" into tm-qpr-dev am: a245873fed am: 8fa10370ef am: c6996dd5ef
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20696781

Change-Id: I5c6f21ade52a9ed8baf3311de1db5d85a23ccdb3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 21:44:03 +00:00
Sihua Ma 5d0a9f6298 Merge "Update widget picker row logic to resolve cropping" into tm-qpr-dev am: a245873fed am: 8fa10370ef am: c6996dd5ef
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20696781

Change-Id: I7a40cb0f1e286a1b12274e9846044976981c6313
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 21:43:31 +00:00
Brandon Dayauon eebeb2dd8b Merge "Correctly make to spec the color for "Turn on work apps" button and add stroke" into tm-qpr-dev am: d0838d3ac1 am: 76e123820a am: aab27044a1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21470669

Change-Id: I97893debbd86370fb4da47b1ff9d3a4e0c0bbdc9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 21:40:39 +00:00
Brandon Dayauon 15d0a3d09c Merge "Correctly make to spec the color for "Turn on work apps" button and add stroke" into tm-qpr-dev am: d0838d3ac1 am: 76e123820a am: aab27044a1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21470669

Change-Id: I94343144605bafe95f80b71ab14192f8f94e4498
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 21:40:38 +00:00
Sebastián Franco 8dc693c6e8 Merge "Decoupling the reorder logic from the CellLayout view" into tm-qpr-dev am: 90ff89e2b9 am: 05eb665281 am: 69330a80e6 am: bb16298848
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20832424

Change-Id: I626470b9836bafb6a44f8ba260fd2877743f1158
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 21:37:02 +00:00
Sebastián Franco bdde1bf923 Merge "Decoupling the reorder logic from the CellLayout view" into tm-qpr-dev am: 90ff89e2b9 am: 05eb665281 am: 69330a80e6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20832424

Change-Id: I9ea318ff443a63e359cdb623dc21d453d4eaecab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 21:36:16 +00:00
Sebastián Franco bb16298848 Merge "Decoupling the reorder logic from the CellLayout view" into tm-qpr-dev am: 90ff89e2b9 am: 05eb665281 am: 69330a80e6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20832424

Change-Id: I9fd2b0e2562d95ce46de7990b0e3c03f36cef6d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 21:35:07 +00:00
Tony Wickham e8616f0e95 Merge "Align taskbar children to Y value instead of X." into tm-qpr-dev am: 7fa1e32f21 am: 8c61868b40 am: e6e0c7d126 am: 76173ce982
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21787133

Change-Id: If94b311b9522e7c10686ff550b2f06ce1a1f048a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 21:35:03 +00:00
Tony Wickham 909389ac1f Merge "Align taskbar children to Y value instead of X." into tm-qpr-dev am: 7fa1e32f21 am: 8c61868b40 am: e6e0c7d126
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21787133

Change-Id: If7c5cb3c61df954fe3ab38da9ceda5515b3fddee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 21:34:24 +00:00
Tony Wickham 76173ce982 Merge "Align taskbar children to Y value instead of X." into tm-qpr-dev am: 7fa1e32f21 am: 8c61868b40 am: e6e0c7d126
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21787133

Change-Id: I3afee8966b84cf74dc00a19cda0d745e92a4c030
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 21:33:19 +00:00
Brian Isganitis 727a6108ad [automerger skipped] Merge "Implement light mode for persistent Taskbar." into tm-qpr-dev am: 2790c9dbbf am: ef9514beab -s ours am: 0e9394b794 -s ours
am skip reason: Merged-In I917a1a1be013c304910b0f674ae8a13abb8e47a1 with SHA-1 cae62a563a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21592661

Change-Id: I9aad1cdbf3e0380825c02fe0ae7809700f74a98e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 21:33:05 +00:00
TreeHugger Robot 510edea989 Merge "Fix an issue with concurrent modification on widget holders list" into tm-qpr-dev am: f22345eace am: bc74b530aa am: 195ef05cc8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21694006

Change-Id: I1a38301ecf36fa76e10b98be02569b2cc0695425
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 21:32:55 +00:00
Vadim Tryshev 79303ca33d Merge "Making Launcher3Tests "abtd atest"-compatible" into tm-qpr-dev am: 8f7ca126b0 am: bcd0f209db am: 2a3efea5c3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21730826

Change-Id: I7be0ab6d89c1176e49577d9beb5d486771d4eebe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 21:32:49 +00:00
Brian Isganitis 54d820c669 [automerger skipped] Merge "Implement light mode for persistent Taskbar." into tm-qpr-dev am: 2790c9dbbf am: ef9514beab -s ours am: 0e9394b794 -s ours am: 3ebaf940d5 -s ours
am skip reason: Merged-In I917a1a1be013c304910b0f674ae8a13abb8e47a1 with SHA-1 cae62a563a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21592661

Change-Id: I697cabcea2fcbe815c3ba70279d8bd39ab17a6ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 21:31:28 +00:00
Jon Miranda 783ecfe114 Merge "Use dY to determine if taskbar nav threshold is met." into tm-qpr-dev am: 05f08214be am: 89d42acf47
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21802101

Change-Id: Iab0604593e39ff62027f3811c5d81a1b776f7b77
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 21:30:36 +00:00
Brandon Dayauon a679877d2c Merge "Add logging to testDragAppIconToWorkspaceCell()" into tm-qpr-dev am: 9de1c05cbf am: 6a1f4f0ddb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21532182

Change-Id: I8e07781f484c049dd51982c21ec9e66fe1f0cc5b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 21:30:09 +00:00
Sihua Ma c6996dd5ef Merge "Update widget picker row logic to resolve cropping" into tm-qpr-dev am: a245873fed am: 8fa10370ef
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20696781

Change-Id: I67453fe97d423d2548e6eb160352a6bf8dea0d75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 21:28:59 +00:00
Brandon Dayauon aab27044a1 Merge "Correctly make to spec the color for "Turn on work apps" button and add stroke" into tm-qpr-dev am: d0838d3ac1 am: 76e123820a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21470669

Change-Id: I7281d4c3968a220c2d2fbb0a2468623b02047c84
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 21:24:44 +00:00
Sebastián Franco 69330a80e6 Merge "Decoupling the reorder logic from the CellLayout view" into tm-qpr-dev am: 90ff89e2b9 am: 05eb665281
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20832424

Change-Id: I949f548ab9a2a9e8f136d76d2e0ee0f3ad462f47
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 21:21:34 +00:00
TreeHugger Robot 277621146a Merge "Fix an issue with concurrent modification on widget holders list" into tm-qpr-dev am: f22345eace am: bc74b530aa am: 195ef05cc8 am: add23c8c45
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21694006

Change-Id: Ia28f5d9f803923cf444e0b834e9bf0ad0c7ae5ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 21:14:30 +00:00
Vadim Tryshev 217e048058 Merge "Making Launcher3Tests "abtd atest"-compatible" into tm-qpr-dev am: 8f7ca126b0 am: bcd0f209db am: 2a3efea5c3 am: c91b9979b7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21730826

Change-Id: I6b794ea829339d406576f8c17a94e773a6aa5dd0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 21:14:20 +00:00
Tony Wickham e6e0c7d126 Merge "Align taskbar children to Y value instead of X." into tm-qpr-dev am: 7fa1e32f21 am: 8c61868b40
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21787133

Change-Id: Ie6743e057e216710988f45c7e2b5d3e2cff10408
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 21:14:10 +00:00
Schneider Victor-tulias 673549f1df Merge "Translate the navigation setting text to prevent overlapping with home gesture hint" into tm-qpr-dev am: f1a0bd61f4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21681580

Change-Id: I76652e3df99cad129f3b1443257b65454c1bf389
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 21:13:43 +00:00
Johannes Gallmann 778abf3d3a Merge "Add onEndCallback to ContainerAnimationRunner" into tm-qpr-dev am: 83683829f7 am: 72313feac1 am: 10dd8449bf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21750179

Change-Id: Ia51a195a6ed1a961476aeb9e41f8998196e532ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 21:08:13 +00:00
Johannes Gallmann 98a7af4d89 Merge "Add onEndCallback to ContainerAnimationRunner" into tm-qpr-dev am: 83683829f7 am: 72313feac1 am: 10dd8449bf am: 00ae64d59f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21750179

Change-Id: I66ecb58010aeb59fe3186004ad657e77693f3560
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 21:07:37 +00:00
Brian Isganitis 3ebaf940d5 [automerger skipped] Merge "Implement light mode for persistent Taskbar." into tm-qpr-dev am: 2790c9dbbf am: ef9514beab -s ours am: 0e9394b794 -s ours
am skip reason: Merged-In I917a1a1be013c304910b0f674ae8a13abb8e47a1 with SHA-1 cae62a563a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21592661

Change-Id: I0843e3263b7783e5e2c02385601281603bd92f45
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 21:07:06 +00:00
Hyunyoung Song e58de93784 Merge "Hide the splash icon when launching with no view and no item." into tm-qpr-dev am: eeee84efb6 am: a10811b4fe am: 8a548cfa43 am: 1ee406851e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21447384

Change-Id: Ibe7f21f5dbe3feb9946f85364fc1c2e526aafe04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 21:07:06 +00:00
TreeHugger Robot add23c8c45 Merge "Fix an issue with concurrent modification on widget holders list" into tm-qpr-dev am: f22345eace am: bc74b530aa am: 195ef05cc8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21694006

Change-Id: Ied7da0439e5624e2b5fccbb9d3e5422836dd689b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 21:06:51 +00:00
Vadim Tryshev c91b9979b7 Merge "Making Launcher3Tests "abtd atest"-compatible" into tm-qpr-dev am: 8f7ca126b0 am: bcd0f209db am: 2a3efea5c3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21730826

Change-Id: I4cae44cf588285d13bdd728b5cb2372e4a0bc88e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 21:06:45 +00:00
Hyunyoung Song 379a48697e Merge "Hide the splash icon when launching with no view and no item." into tm-qpr-dev am: eeee84efb6 am: a10811b4fe am: 8a548cfa43
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21447384

Change-Id: I88b57c0f93a3332484e2214533d2b61b45c34bb3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 21:06:17 +00:00
Brian Isganitis 0e9394b794 [automerger skipped] Merge "Implement light mode for persistent Taskbar." into tm-qpr-dev am: 2790c9dbbf am: ef9514beab -s ours
am skip reason: Merged-In I917a1a1be013c304910b0f674ae8a13abb8e47a1 with SHA-1 cae62a563a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21592661

Change-Id: I2a139bb4e21cc467a9a08eb8689f94c3dd1fdbd6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 21:03:41 +00:00
Hongwei Wang 00d8b2ca63 Merge "Turn ENABLE_PIP_APP_ICON_OVERLAY on by default" into tm-qpr-dev am: 1897e4f40f am: 5f57433ebc am: 8471613528
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21613694

Change-Id: I0587a0a97836762f8348bb1b5e4a3d012462fe41
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 21:03:14 +00:00
TreeHugger Robot 195ef05cc8 Merge "Fix an issue with concurrent modification on widget holders list" into tm-qpr-dev am: f22345eace am: bc74b530aa
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21694006

Change-Id: I7bd998c8ea8c453f378fc2b65a7eadd8ea11ea96
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 21:03:04 +00:00
Vadim Tryshev 2a3efea5c3 Merge "Making Launcher3Tests "abtd atest"-compatible" into tm-qpr-dev am: 8f7ca126b0 am: bcd0f209db
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21730826

Change-Id: I10b294ad0dbfb4061daf1a85549b9fd5d98cc0cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 21:02:54 +00:00
Hongwei Wang fdad44766f Merge "Turn ENABLE_PIP_APP_ICON_OVERLAY on by default" into tm-qpr-dev am: 1897e4f40f am: 5f57433ebc am: 8471613528 am: 3b5845f08b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21613694

Change-Id: I330d1f24bb6564a8d875b2f8864f79fa7e00ae37
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 21:02:12 +00:00
Johannes Gallmann 00ae64d59f Merge "Add onEndCallback to ContainerAnimationRunner" into tm-qpr-dev am: 83683829f7 am: 72313feac1 am: 10dd8449bf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21750179

Change-Id: I3207ec3225f22d81a6e1ab7dc7fade85a14b53e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 21:02:07 +00:00
Hyunyoung Song 1ee406851e Merge "Hide the splash icon when launching with no view and no item." into tm-qpr-dev am: eeee84efb6 am: a10811b4fe am: 8a548cfa43
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21447384

Change-Id: Ie2bef5a247a6800545844336404fcf55765feff0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 21:01:29 +00:00
Johannes Gallmann 10dd8449bf Merge "Add onEndCallback to ContainerAnimationRunner" into tm-qpr-dev am: 83683829f7 am: 72313feac1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21750179

Change-Id: I55a17ffd869cd33e53296d7aef80e27e88a1cf4b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 20:50:00 +00:00
Schneider Victor-tulias f1a0bd61f4 Merge "Translate the navigation setting text to prevent overlapping with home gesture hint" into tm-qpr-dev 2023-03-07 20:49:22 +00:00
Hongwei Wang 3b5845f08b Merge "Turn ENABLE_PIP_APP_ICON_OVERLAY on by default" into tm-qpr-dev am: 1897e4f40f am: 5f57433ebc am: 8471613528
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21613694

Change-Id: I7cab67db66bcb6c4b3e373ba90e8e1488249bbb6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 20:42:51 +00:00
Hyunyoung Song 8a548cfa43 Merge "Hide the splash icon when launching with no view and no item." into tm-qpr-dev am: eeee84efb6 am: a10811b4fe
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21447384

Change-Id: I561fe17887572072dd65c271314a896acf9b6724
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 20:42:30 +00:00
Hongwei Wang 8471613528 Merge "Turn ENABLE_PIP_APP_ICON_OVERLAY on by default" into tm-qpr-dev am: 1897e4f40f am: 5f57433ebc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21613694

Change-Id: I2063daa39aac1da9c546b28cab3093cce1f01698
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 20:36:40 +00:00
Jon Miranda 89d42acf47 Merge "Use dY to determine if taskbar nav threshold is met." into tm-qpr-dev am: 05f08214be
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21802101

Change-Id: I08787b44374c195e617fa35147b31232ea4bfcc4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 20:18:02 +00:00
Jon Miranda 05f08214be Merge "Use dY to determine if taskbar nav threshold is met." into tm-qpr-dev 2023-03-07 20:07:24 +00:00
Brandon Dayauon 6a1f4f0ddb Merge "Add logging to testDragAppIconToWorkspaceCell()" into tm-qpr-dev am: 9de1c05cbf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21532182

Change-Id: I01961910daa717ea911e1df8d4f0407882456cd5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 19:46:03 +00:00
Brandon Dayauon 9de1c05cbf Merge "Add logging to testDragAppIconToWorkspaceCell()" into tm-qpr-dev 2023-03-07 19:37:44 +00:00
Sihua Ma 8fa10370ef Merge "Update widget picker row logic to resolve cropping" into tm-qpr-dev am: a245873fed
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20696781

Change-Id: Ied0a8552fa8bf21c7c7b599d7ba3a21beaa8ea3f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 19:27:55 +00:00
Android Build Coastguard Worker 30d412c3fe [coastguard skipped] Merge sparse cherrypicks from sparse-9662652-L34400000958984256 into tm-qpr2-release.
COASTGUARD_SKIP: I7795abe0aebefca2d42998a672abfd12f951d501
COASTGUARD_SKIP: Ie572a0ae8ae4d687b86ea6a4011b4fdc33b43cd7

Change-Id: I1136d0f649849f51731523c4081424ac8a70fbea
2023-03-07 19:01:57 +00:00
Android Build Coastguard Worker ba4a1e0b45 Merge cherrypicks of ['googleplex-android-review.googlesource.com/21050546'] into sparse-9662652-L34400000958984256.
SPARSE_CHANGE: I7795abe0aebefca2d42998a672abfd12f951d501

Change-Id: Ie572a0ae8ae4d687b86ea6a4011b4fdc33b43cd7
2023-03-07 18:54:52 +00:00
Winson Chung 6c5c183e4c Prevent falling into OtherActivityInputConsumer when over lockscreen
- When opening the emergency dialer from the bouncer, there's a brief
  period where notificationPanelExpanded=false and occluded=false which
  currently means canStartSystemGesture=true and
  isKeyguardShowingOccluded=false, which falls through to other activity
  input consumer.  In this state, we can't properly finish the gesture
  stream because Launcher never shows (it's behind the lockscreen)
  and the recents animation never finishes.

Bug: 242704576
Test: atest NexusLauncherTests
Change-Id: I7795abe0aebefca2d42998a672abfd12f951d501
(cherry picked from commit on googleplex-android-review.googlesource.com host: f6d75c98a9)
Merged-In: I7795abe0aebefca2d42998a672abfd12f951d501
2023-03-07 18:53:40 +00:00