Commit Graph

54966 Commits

Author SHA1 Message Date
Becky Qiu fe83fce489 Merge "[Toast] Add query_length for launcher latency logging." into tm-dev 2022-06-08 18:02:07 +00:00
Pat Manning 56ee9a90d1 Hide both drop target icons if either text goes to two lines. am: e3d74b496e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18795367

Change-Id: I1afb43206e6af6855602b4d0bc992fadcd73a0c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-08 17:56:43 +00:00
Tony Wickham d127d521f1 Hide taskbar while VoiceInteractionWindow is visible
- Fade out icons (or stashed handle if stashed)
- Move background to APPLICATION_OVERLAY layer (behind VIW)
  - Only for gesture nav
- On home screen in 3 button mode, translate buttons down when assistant
  is invoked

Test: Invoke assistant, ensure it draws above taskbar background and
taskbar stops drawing icons or stashed handle
Bug: 225200928

Change-Id: I7807d30df8f358295b8231d89217c7413f32c6f9
2022-06-08 17:23:45 +00:00
Pat Manning e3d74b496e Hide both drop target icons if either text goes to two lines.
Fix: 235088140
Test: manual
Change-Id: I582b8b771d859402b932193251690e5a4ffecbae
2022-06-08 16:33:05 +01:00
Jerry Chang c04af333f5 Prevent wallpaper flicker while entering split screen from overview
When launching a pair of apps from overview panel, it will perform
cross-fade animations to transit from overview to the split pair. But
wallpaper might be visible for a while when both overveiw and split pair
is transparent during the transition. This updates to not fade-out
overview until the split pair is finishing showing in foregorund to
prevent the flicker of wallpaper.

Bug: 235137249
Test: swipe to home and enter overview panel, select and swipe down to
      enter a split pair, verified there's no flicker.
Change-Id: Iec1dc49e260f6e46640d47295d7f65dad5c24ab5
2022-06-08 15:26:25 +00:00
Winson Chung 51dc480f38 Merge "Revert changes waiting for launcher to resume when transitioning to home" into tm-dev am: 46c9c66048 am: 0cf33355a0 am: ee9ccc7e43 am: 87973ae6c9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18764661

Change-Id: I488dd168ac8dfc62a001108a45eea48ae12f2a49
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-08 04:36:42 +00:00
Automerger Merge Worker 2239385388 Merge changes from topic "am-929047f04f63492aa317e461df695a23" into tm-d1-dev-plus-aosp am: 379b59a42f am: 9a68c49df7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18781097

Change-Id: Iaad976b8ee35334ababb69a431038d0e2ba10439
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-08 04:35:39 +00:00
TreeHugger Robot 8cc08c7f0d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: df4ac7549c -s ours am: 45181e072d -s ours am: ffd170a300 -s ours am: beb824aef2 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1f49a3062b1e6a4f323b6ea6c1a8ab8c7dc1f489
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-08 04:35:21 +00:00
Winson Chung 77db319a58 Merge "Revert changes waiting for launcher to resume when transitioning to home" into tm-dev am: 46c9c66048 am: 2bd8504363 am: 59696028c1 am: ae46372877
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18764661

Change-Id: I7e969a640f422cd06a0d40df13c677624c138288
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-08 04:32:41 +00:00
TreeHugger Robot da1da5e37f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: df4ac7549c -s ours am: 56e1472b4a -s ours am: 79aecc3dd0 -s ours am: ddffa53783 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia3c1e82f79b5e518966d2c736e0d880e620da6f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-08 04:28:25 +00:00
Bill Yi 0ca1acc93b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 774a541d61 -s ours am: 03ee5e60b6 -s ours am: c525574e4a -s ours am: 3eae19a88f -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie3ef619de33f6d843a1b67ca1fefba226ce24f2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-08 04:28:06 +00:00
Winson Chung 87973ae6c9 Merge "Revert changes waiting for launcher to resume when transitioning to home" into tm-dev am: 46c9c66048 am: 0cf33355a0 am: ee9ccc7e43
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18764661

Change-Id: I0deeced96792b5550d187ac01e088a81e4075ba3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-08 04:23:48 +00:00
Automerger Merge Worker 9a68c49df7 Merge changes from topic "am-929047f04f63492aa317e461df695a23" into tm-d1-dev-plus-aosp am: 379b59a42f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18781097

Change-Id: If7d6466c76683d1dc1105d2c6af416080c780b7a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-08 04:22:31 +00:00
TreeHugger Robot beb824aef2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: df4ac7549c -s ours am: 45181e072d -s ours am: ffd170a300 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I02ae80546410b3dcfd115cab411cf3446679fa4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-08 04:22:11 +00:00
Winson Chung 710d65037c Merge "Revert changes waiting for launcher to resume when transitioning to home" into tm-dev am: 46c9c66048 am: 0cf33355a0 am: d3a7d37a57 am: cd95768e0e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18764661

Change-Id: I2c33e94ca5ec18e1f07088762418b048432d48cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-08 04:21:46 +00:00
Winson Chung ae46372877 Merge "Revert changes waiting for launcher to resume when transitioning to home" into tm-dev am: 46c9c66048 am: 2bd8504363 am: 59696028c1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18764661

Change-Id: Ie1fa84ad40bed55bb12dc1fa8c536b0c7c43aa07
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-08 04:18:16 +00:00
TreeHugger Robot 41226efa21 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: df4ac7549c -s ours am: 45181e072d -s ours am: c41cee6e48 -s ours am: 09f30fcba8 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8da43b4287b23ec5b61ee4a95961806bce70e2bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-08 04:17:18 +00:00
Bill Yi 71a8e7cf1f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 774a541d61 -s ours am: 6d15c5de59 -s ours am: 482dca1011 -s ours am: 5757e8aad4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Icb40ad3252248db396b37bae2792aefdb83aefe6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-08 04:17:00 +00:00
TreeHugger Robot ddffa53783 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: df4ac7549c -s ours am: 56e1472b4a -s ours am: 79aecc3dd0 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I20554d05f72bf1dc352b4a0f3d343bf6ca9aa5f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-08 04:15:02 +00:00
Bill Yi 3eae19a88f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 774a541d61 -s ours am: 03ee5e60b6 -s ours am: c525574e4a -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib513bf073dafdb3b2923ce4b0f3362d93cc2b63e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-08 04:14:44 +00:00
TreeHugger Robot 9d3ae204d9 Merge "Show split option without consider the "Lock task mode"" into tm-qpr-dev am: 34bc21ffb0 am: edd37684ed
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18753549

Change-Id: Ie1ef1870d833dd43ae6d8047924443d6063d2be6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-08 04:14:01 +00:00
Winson Chung cd95768e0e Merge "Revert changes waiting for launcher to resume when transitioning to home" into tm-dev am: 46c9c66048 am: 0cf33355a0 am: d3a7d37a57
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18764661

Change-Id: Ice05097acc2736d7c313dc04900e501c4f003191
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-08 04:00:09 +00:00
TreeHugger Robot 09f30fcba8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: df4ac7549c -s ours am: 45181e072d -s ours am: c41cee6e48 -s ours
am skip reason: subject contains skip directive

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

Change-Id: If751e8f2bbd1e21fd3fd86d7b4ce504602cc2bd3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-08 03:57:52 +00:00
Bill Yi 5757e8aad4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 774a541d61 -s ours am: 6d15c5de59 -s ours am: 482dca1011 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I57aa2dd5e2eff61d2ce27f4cc155946bab425160
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-08 03:57:33 +00:00
Winson Chung 775d576ef9 Merge "Revert changes waiting for launcher to resume when transitioning to home" into tm-dev am: 46c9c66048 am: 76863f9602
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18764661

Change-Id: Ia26fe18d22b5d5c483a303260e46b165e66c68cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-08 03:54:01 +00:00
Winson Chung ee9ccc7e43 Merge "Revert changes waiting for launcher to resume when transitioning to home" into tm-dev am: 46c9c66048 am: 0cf33355a0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18764661

Change-Id: I48ebd971920917bf4a7a365e0c2726e7946bcef1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-08 03:51:35 +00:00
Automerger Merge Worker 379b59a42f Merge changes from topic "am-929047f04f63492aa317e461df695a23" into tm-d1-dev-plus-aosp
* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: df4ac7549c -s ours am: 45181e072d -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 774a541d61 -s ours am: 6d15c5de59 -s ours
2022-06-08 03:51:07 +00:00
Winson Chung 59696028c1 Merge "Revert changes waiting for launcher to resume when transitioning to home" into tm-dev am: 46c9c66048 am: 2bd8504363
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18764661

Change-Id: Ibf20c2caf7bc49ce891cd9f66068f461320ed766
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-08 03:50:30 +00:00
Winson Chung d3a7d37a57 Merge "Revert changes waiting for launcher to resume when transitioning to home" into tm-dev am: 46c9c66048 am: 0cf33355a0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18764661

Change-Id: I8b0f3b1e6a93f124ba16506872372f6e856dabf2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-08 03:50:20 +00:00
TreeHugger Robot 9d0d43f348 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: df4ac7549c -s ours am: 195734cd26 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2d86ec91cd831864a2148eb6f03390f0b0554d5c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-08 03:49:50 +00:00
Bill Yi 50bf24190b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 774a541d61 -s ours am: 9286b45ad0 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0fea3a9a8770555994a7c753d861fd82f6b74543
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-08 03:49:32 +00:00
TreeHugger Robot ffd170a300 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: df4ac7549c -s ours am: 45181e072d -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8e59d7a3038f9e24a6c1e5415eae32aab6316062
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-08 03:49:09 +00:00
TreeHugger Robot 79aecc3dd0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: df4ac7549c -s ours am: 56e1472b4a -s ours
am skip reason: subject contains skip directive

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

Change-Id: I73934d4abf781f8eb1f0dc26da0db7e40af393e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-08 03:49:02 +00:00
Bill Yi 17032f6b30 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 774a541d61 -s ours am: 6d15c5de59 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I30f013a339ab229f114d29916a92b206faa3ccdc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-08 03:48:50 +00:00
TreeHugger Robot c41cee6e48 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: df4ac7549c -s ours am: 45181e072d -s ours
am skip reason: subject contains skip directive

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

Change-Id: I92f5782acb50e0e85c8059f330186e66a4d72819
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-08 03:48:49 +00:00
Bill Yi c525574e4a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 774a541d61 -s ours am: 03ee5e60b6 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I67fc8b2a06249a5bb5f3336deb84d08032ec1c04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-08 03:48:43 +00:00
Bill Yi 482dca1011 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 774a541d61 -s ours am: 6d15c5de59 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3af61d9d3bc9d028b0dcc42eb0e4065852d3d2bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-08 03:48:31 +00:00
TreeHugger Robot edd37684ed Merge "Show split option without consider the "Lock task mode"" into tm-qpr-dev am: 34bc21ffb0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18753549

Change-Id: I6b2949fc96d748fc0a6c24f4c6e340927dd82730
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-08 03:44:55 +00:00
Winson Chung 0cf33355a0 Merge "Revert changes waiting for launcher to resume when transitioning to home" into tm-dev am: 46c9c66048
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18764661

Change-Id: I94743a4cf5b3db0d65e1139c715048b16f9c77a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-08 03:20:12 +00:00
Winson Chung 76863f9602 Merge "Revert changes waiting for launcher to resume when transitioning to home" into tm-dev am: 46c9c66048
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18764661

Change-Id: I0d24651cff26d9a7030c0ad8742b01f21ba52a0b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-08 03:19:07 +00:00
Winson Chung 2bd8504363 Merge "Revert changes waiting for launcher to resume when transitioning to home" into tm-dev am: 46c9c66048
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18764661

Change-Id: I138786ffdb4f73b4046ae03d4f8bb34a7664c37d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-08 03:18:38 +00:00
Winson Chung 46c9c66048 Merge "Revert changes waiting for launcher to resume when transitioning to home" into tm-dev 2022-06-08 03:11:16 +00:00
TreeHugger Robot 56e1472b4a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: df4ac7549c -s ours
am skip reason: subject contains skip directive

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

Change-Id: I69add2931c915fbbe70b1278cec19413778d9695
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-08 02:47:08 +00:00
TreeHugger Robot 45181e072d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: df4ac7549c -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ifedb18faa3349213aad5996402a4d42560591112
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-08 02:47:03 +00:00
Bill Yi 03ee5e60b6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 774a541d61 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib9af500bb9ad0058d5d5c73c7271a935197ee2a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-08 02:46:49 +00:00
Bill Yi 6d15c5de59 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 774a541d61 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1c471e7002cac73c6c53546534fb143881330f38
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-08 02:46:44 +00:00
TreeHugger Robot 195734cd26 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: df4ac7549c -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id6c63bbc8162a8da9cc264da69d23a9c84f5ee39
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-08 02:46:43 +00:00
Bill Yi 9286b45ad0 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 774a541d61 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I31c75bec2e416198395bb03aae735210a5da43b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-08 02:46:25 +00:00
TreeHugger Robot 34bc21ffb0 Merge "Show split option without consider the "Lock task mode"" into tm-qpr-dev 2022-06-08 02:35:57 +00:00
TreeHugger Robot df4ac7549c Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-06-08 02:31:19 +00:00