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
Alex Chau
5885b074dc
Fix a case that task jump when dismissing
...
- Fixed an edge case that RecentsView was not snapped to last tasks, but become snapped to last tasks after dismiss, as last pages' scroll is the position where ClearAllButton is barely invisible, instead of aligned to mLastComputedTaskSize.
- Fixed a case that misclassifed as split select
Fix: 202941373
Test: manual
Change-Id: Ib50dda471189da4325cd8ed57d600cc64907c978
2021-11-08 16:57:38 +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
TreeHugger Robot
bbe40a094d
Merge changes from topic "presubmit-am-b573694ac00f425591ad626ca6ca14e0" into sc-qpr1-dev am: d076575915
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16202102
Change-Id: I42f59cfa6f83225db15375d0e30f66166b612f32
2021-11-08 02:46:38 +00:00
Bill Yi
1446cd51f2
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d6c42a8d7c am: b84eeb1b73 -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: I934f77450859978a6ae7cbc7b28716e5fb3dd6fa
2021-11-08 02:46:37 +00:00
TreeHugger Robot
6ae13e1c6f
Merge changes from topic "presubmit-am-b573694ac00f425591ad626ca6ca14e0" into sc-qpr1-dev am: d076575915
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16202102
Change-Id: Ib38b2a97a25a224b0f04b2a2a191ca6754b37b3e
2021-11-08 02:46:29 +00:00
Bill Yi
f0b0d8564d
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d6c42a8d7c am: b84eeb1b73 -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: I8e86854edafaef1f9b6c95390af5bb5741559194
2021-11-08 02:46:28 +00:00
Bill Yi
e49fcfef6d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5cc4dfef04 -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: Iba9114de55d515f49beda04d3c8210c4babb4d12
2021-11-08 02:46:01 +00:00
Bill Yi
dc79545f1c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5cc4dfef04 -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: Ie4d05fd157dc7618c5d5e8b95c2fce895d673470
2021-11-08 02:45:55 +00:00
Bill Yi
9a41d5d5fa
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d6c42a8d7c am: e4cb9f67df -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: I8d590131f52335d259529cb174212c86a2390d59
2021-11-08 02:44:25 +00:00
TreeHugger Robot
c2f320703c
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev
2021-11-08 02:32:52 +00:00
TreeHugger Robot
d076575915
Merge changes from topic "presubmit-am-b573694ac00f425591ad626ca6ca14e0" into sc-qpr1-dev
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d6c42a8d7c
Import translations. DO NOT MERGE ANYWHERE
2021-11-08 02:29:55 +00:00
TreeHugger Robot
e57322923e
Merge changes from topic "presubmit-am-b573694ac00f425591ad626ca6ca14e0"
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d6c42a8d7c 2p: f792544d09
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d6c42a8d7c
Import translations. DO NOT MERGE ANYWHERE
2021-11-08 02:29:55 +00:00
TreeHugger Robot
e3b9a8fa39
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 032d2e83e4 -s ours am: 943621523d -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16202106
Change-Id: I0191ac63883631fa93a5079764e2d2e5e2ff7d28
2021-11-08 02:10:34 +00:00
TreeHugger Robot
bbc63075d6
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 032d2e83e4 -s ours am: f29d9bccbc -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16202106
Change-Id: Icd397311193058db81d049153efbf1bdb71f4b2d
2021-11-08 02:02:29 +00:00
Jerry Chang
331f46fab3
Accept snapshot list when cancelling recents animation
...
Bug: 200813008
Test: enter overview after activated split screen, observed task
thumbnails showing with correct bounds after roation.
Change-Id: Ifea17d2c685d16db111c4fab88e131595254b9a5
2021-11-08 09:55:43 +08:00
TreeHugger Robot
943621523d
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 032d2e83e4 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16202106
Change-Id: Icf021a0ffe298026afabbea129e04b095e0502c9
2021-11-08 01:51:39 +00:00
TreeHugger Robot
f29d9bccbc
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 032d2e83e4 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16202106
Change-Id: Ieae86e7f3377a52e9626cf82d08b8dba810f90d5
2021-11-08 01:50:26 +00:00