Commit Graph

44140 Commits

Author SHA1 Message Date
TreeHugger Robot 31df4aca76 Merge "Testing to see if waiting for resume will fix flaky tests." into sc-v2-dev am: 1c79327f6e am: 55bef3bdd4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16214207

Change-Id: I8caedae65eff243061015e8076bb581c3aea2986
2021-11-09 00:33:31 +00:00
TreeHugger Robot 55bef3bdd4 Merge "Testing to see if waiting for resume will fix flaky tests." into sc-v2-dev am: 1c79327f6e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16214207

Change-Id: I62876c198b063445041fa67bb75b3a9b90056762
2021-11-09 00:12:23 +00:00
TreeHugger Robot 1c79327f6e Merge "Testing to see if waiting for resume will fix flaky tests." into sc-v2-dev 2021-11-08 23:52:50 +00:00
TreeHugger Robot fb23d19b0e Merge "Play fallback animation when overlay is shown." into sc-v2-dev am: 44fcfa5bfd am: 1f60b796e3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16202910

Change-Id: Ic4e4453545993c174af2be241c40af0c814cf978
2021-11-08 21:19:16 +00:00
TreeHugger Robot f4f6add857 Merge "Add temporary logging to try and debug: b/202414125" into sc-v2-dev am: c010ea2f1b am: b441ef3a4f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16200933

Change-Id: Ic51d0f03cc71659de49cfadcaea34b8921eb373c
2021-11-08 21:19:06 +00:00
TreeHugger Robot cd17e997f2 Merge "Play fallback animation when overlay is shown." into sc-v2-dev am: 44fcfa5bfd am: c6aa4b006a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16202910

Change-Id: Ia4fd2252ce84dd4a8ebca7c34060a54fa2f1eb57
2021-11-08 21:18:27 +00:00
TreeHugger Robot 06af9641b2 Merge "Add temporary logging to try and debug: b/202414125" into sc-v2-dev am: c010ea2f1b am: 71d7627105
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16200933

Change-Id: I9212815cf8784439a21a7910a6105f650d53baeb
2021-11-08 21:18:11 +00:00
TreeHugger Robot 1f60b796e3 Merge "Play fallback animation when overlay is shown." into sc-v2-dev am: 44fcfa5bfd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16202910

Change-Id: I2d805b0b53dfcf4ca94debafca0d41ce3efb5c23
2021-11-08 20:59:53 +00:00
TreeHugger Robot b441ef3a4f Merge "Add temporary logging to try and debug: b/202414125" into sc-v2-dev am: c010ea2f1b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16200933

Change-Id: Iea056ea82f4dfb1b7ba01e1fbd59b55c5055b88b
2021-11-08 20:59:48 +00:00
TreeHugger Robot c6aa4b006a Merge "Play fallback animation when overlay is shown." into sc-v2-dev am: 44fcfa5bfd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16202910

Change-Id: I08c3abb11c6c9926b1fd8e4af177e092ad20ec44
2021-11-08 20:57:04 +00:00
TreeHugger Robot 71d7627105 Merge "Add temporary logging to try and debug: b/202414125" into sc-v2-dev am: c010ea2f1b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16200933

Change-Id: I706962ed79c20c10f85f0760faaa3ba60764ce2d
2021-11-08 20:56:56 +00:00
TreeHugger Robot 44fcfa5bfd Merge "Play fallback animation when overlay is shown." into sc-v2-dev 2021-11-08 20:49:58 +00:00
TreeHugger Robot c010ea2f1b Merge "Add temporary logging to try and debug: b/202414125" into sc-v2-dev 2021-11-08 20:33:00 +00:00
Jon Miranda b9f5602d96 Testing to see if waiting for resume will fix flaky tests.
Similar to how AbstractLauncherUITest waits for resume after
switching state to Normal.

Bug: 202735477
Test: presubmit
Change-Id: I61834d32f8005491a4e14a354dc0097b05267f7b
2021-11-08 11:58:10 -08:00
TreeHugger Robot b2c382a9e2 Merge "Add to tapl quickswitch test for testing intermediate carousel." into sc-v2-dev am: 3555ef3b31 am: 8ce34e46fb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16118650

Change-Id: I5a6007bc014eaa6475659c472802ad6ba65cfa33
2021-11-08 17:30:03 +00:00
TreeHugger Robot 5d6396066a Merge "Add to tapl quickswitch test for testing intermediate carousel." into sc-v2-dev am: 3555ef3b31 am: 6bef61cb68
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16118650

Change-Id: Icc6cd0182ad47616042eb68bf8550e302df20856
2021-11-08 17:28:29 +00:00
Automerger Merge Worker e7d078f959 Merge "Merge "Accept snapshot list when cancelling recents animation" into sc-v2-dev am: 2e2f49e8a5 am: 68f7c965b4" 2021-11-08 17:28:07 +00:00
Jerry Chang 83941ef26d Merge "Accept snapshot list when cancelling recents animation" into sc-v2-dev am: 2e2f49e8a5 am: 68f7c965b4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16192191

Change-Id: Iecc3c277f50da8994db50a7837d046989740f269
2021-11-08 17:27:37 +00:00
Jerry Chang 8489592183 Merge "Accept snapshot list when cancelling recents animation" into sc-v2-dev am: 2e2f49e8a5 am: ccfa6603a9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16192191

Change-Id: Iaf49ae6959fcf54e66f8629e668a342e920e30ea
2021-11-08 17:27:16 +00:00
TreeHugger Robot 6bef61cb68 Merge "Add to tapl quickswitch test for testing intermediate carousel." into sc-v2-dev am: 3555ef3b31
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16118650

Change-Id: I1e6a4b81d0c4f8865f84c4252887d0e16ec310af
2021-11-08 13:31:17 +00:00
TreeHugger Robot 8ce34e46fb Merge "Add to tapl quickswitch test for testing intermediate carousel." into sc-v2-dev am: 3555ef3b31
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16118650

Change-Id: I8f216d791f5b39552591f34db06966921db9b7e7
2021-11-08 13:30:34 +00:00
TreeHugger Robot 3555ef3b31 Merge "Add to tapl quickswitch test for testing intermediate carousel." into sc-v2-dev 2021-11-08 13:15:44 +00:00
Pat Manning 04486f19bb Add to tapl quickswitch test for testing intermediate carousel.
Test: TaplTestsQuickstep.java
Fix: 197630182
Change-Id: I5f325995e22b76eee710154ca54a050eaf70b150
2021-11-08 11:32:56 +00:00
Jerry Chang 68f7c965b4 Merge "Accept snapshot list when cancelling recents animation" into sc-v2-dev am: 2e2f49e8a5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16192191

Change-Id: I6a316c2378fc10cf0d6a04e258192e174ceeb8bb
2021-11-08 10:39:13 +00:00
Jerry Chang ccfa6603a9 Merge "Accept snapshot list when cancelling recents animation" into sc-v2-dev am: 2e2f49e8a5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16192191

Change-Id: I5f8baffb5ef8d7596ea8e20727630b9b17aa871a
2021-11-08 10:39:08 +00:00
Jerry Chang 2e2f49e8a5 Merge "Accept snapshot list when cancelling recents animation" into sc-v2-dev 2021-11-08 10:22:34 +00:00
TreeHugger Robot cad5454d31 Merge changes from topic "presubmit-am-b573694ac00f425591ad626ca6ca14e0" into sc-qpr1-dev am: d076575915 am: 6ae13e1c6f am: 9f3406f0f4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16202102

Change-Id: I61ee7b17d33bb620a8b5851ca4b4d22b67daceef
2021-11-08 03:23:25 +00:00
Bill Yi 7a234946a8 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d6c42a8d7c am: b84eeb1b73 -s ours am: f0b0d8564d -s ours am: 4e6c3bf45c -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic91b1c7f67b1345639feac6b8cd6657dce7bd90b
2021-11-08 03:23:24 +00:00
Bill Yi 5bad3f63ff [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5cc4dfef04 -s ours am: dc79545f1c -s ours am: a9fff0809e -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6a34a848fda0fce759c4b163534c88cc287481ab
2021-11-08 03:23:16 +00:00
TreeHugger Robot df085aa0dd [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: c2f320703c -s ours am: 30ead94c3d -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib520aeb786a6daf8d983294f6d1b44120ddace4c
2021-11-08 03:23:11 +00:00
TreeHugger Robot cc9f139e8e Merge changes from topic "presubmit-am-b573694ac00f425591ad626ca6ca14e0" into sc-qpr1-dev am: d076575915 am: bbe40a094d am: 1399d15eea
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16202102

Change-Id: Ia0dc7a9554faae2bbf2f912f1f6182e09e074a18
2021-11-08 03:17:04 +00:00
Bill Yi f22c9d163e [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d6c42a8d7c am: b84eeb1b73 -s ours am: 1446cd51f2 -s ours am: b94ac2d484 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I578ca884272a423e061537ad471f9b59f45e3c1d
2021-11-08 03:17:03 +00:00
Bill Yi 34fe99545f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5cc4dfef04 -s ours am: e49fcfef6d -s ours am: 535cc82588 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2f01fd3f7432cbf20c83588cd40fbf76dbe5fd6e
2021-11-08 03:16:49 +00:00
Bill Yi ef28e3b488 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d6c42a8d7c am: e4cb9f67df -s ours am: 9a41d5d5fa -s ours am: f8e5cfa614 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I256ad1ddd4e242b7f4c3bee086f3db13d1664a3e
2021-11-08 03:16:41 +00:00
TreeHugger Robot fc343ee9bf Merge changes from topic "presubmit-am-b573694ac00f425591ad626ca6ca14e0" into sc-qpr1-dev am: d076575915 am: 6ae13e1c6f am: 9acc8da3c7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16202102

Change-Id: Id4f8f492898dc795bd4cb64018256ce6f0616d3b
2021-11-08 03:16:20 +00:00
Bill Yi f17890c653 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d6c42a8d7c am: b84eeb1b73 -s ours am: f0b0d8564d -s ours am: cf7bde327b -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia90a632f724446e1065ade1dccd8e495d813ca89
2021-11-08 03:16:19 +00:00
Bill Yi a88b52e255 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5cc4dfef04 -s ours am: dc79545f1c -s ours am: 92e43337d4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I66f5a834bb6084bce2f9fc22e4dc25497ef0f4a9
2021-11-08 03:16:06 +00:00
TreeHugger Robot 82657f6c41 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: c2f320703c -s ours am: ad4c520378 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4e8776f16e99e6f5387e66bcd14835c6b284a819
2021-11-08 03:15:40 +00:00
TreeHugger Robot 1399d15eea Merge changes from topic "presubmit-am-b573694ac00f425591ad626ca6ca14e0" into sc-qpr1-dev am: d076575915 am: bbe40a094d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16202102

Change-Id: I0f5d46ce99b4075ab204e048f1bd2457625dfe7f
2021-11-08 03:09:25 +00:00
Bill Yi b94ac2d484 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d6c42a8d7c am: b84eeb1b73 -s ours am: 1446cd51f2 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I61ce0f7ecd10e5b810d9c59eb1f7da518979dcb7
2021-11-08 03:09:23 +00:00
Bill Yi 535cc82588 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5cc4dfef04 -s ours am: e49fcfef6d -s ours
am skip reason: subject contains skip directive

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

Change-Id: I42b511210dd7dfcb32497a110975927371401e2f
2021-11-08 03:09:05 +00:00
Bill Yi f8e5cfa614 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d6c42a8d7c am: e4cb9f67df -s ours am: 9a41d5d5fa -s ours
am skip reason: subject contains skip directive

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

Change-Id: I65747de4db32b81f0af400ec11b39db9532eeb8b
2021-11-08 03:08:44 +00:00
TreeHugger Robot 9f3406f0f4 Merge changes from topic "presubmit-am-b573694ac00f425591ad626ca6ca14e0" into sc-qpr1-dev am: d076575915 am: 6ae13e1c6f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16202102

Change-Id: I0750833124f51ec8921f26041b247af684d71056
2021-11-08 03:03:49 +00:00
Bill Yi 4e6c3bf45c [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d6c42a8d7c am: b84eeb1b73 -s ours am: f0b0d8564d -s ours
am skip reason: subject contains skip directive

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

Change-Id: If302b16239b98602efa74c53280c19e5dd406a79
2021-11-08 03:03:49 +00:00
Bill Yi a9fff0809e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5cc4dfef04 -s ours am: dc79545f1c -s ours
am skip reason: subject contains skip directive

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

Change-Id: Icc4867932f561eedba937a081840059b0710e3ab
2021-11-08 03:03:43 +00:00
TreeHugger Robot 30ead94c3d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: c2f320703c -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1eee8543a4e4f2b7f15fd417e0919064a0032e2e
2021-11-08 03:03:39 +00:00
TreeHugger Robot 9acc8da3c7 Merge changes from topic "presubmit-am-b573694ac00f425591ad626ca6ca14e0" into sc-qpr1-dev am: d076575915 am: 6ae13e1c6f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16202102

Change-Id: I145f7ac118e690c17f6299c422c2e09aafaf8e49
2021-11-08 03:02:46 +00:00
Bill Yi cf7bde327b [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d6c42a8d7c am: b84eeb1b73 -s ours am: f0b0d8564d -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9597820e969768d47bf1606639876fbcf10fa29d
2021-11-08 03:02:45 +00:00
Bill Yi 92e43337d4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5cc4dfef04 -s ours am: dc79545f1c -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia6c1f1a05c9c5537e58b38c69db701a25a893fe1
2021-11-08 03:02:34 +00:00
TreeHugger Robot ad4c520378 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: c2f320703c -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iffd9a7f116edc4b50575d59095b2abbd72b5d66e
2021-11-08 03:02:28 +00:00