PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,436 Commits 1 Branch 0 Tags
67fa00189dcafe5df7ebc08c3dd1e6ccc2a7e276
Commit Graph

58436 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jerry Chang b17912fd75 Merge "Prevent wallpaper flicker while entering split screen from overview" into tm-dev am: 0b944f6a4d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18797269

Change-Id: If9bd971313cf613cf8eaee19fce4a6a1ddc50bc2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-09 00:53:11 +00:00
Jerry Chang 0b944f6a4d Merge "Prevent wallpaper flicker while entering split screen from overview" into tm-dev 2022-06-09 00:32:49 +00:00
Winson Chung 883facf091 Updating call to match change in interface 
Bug: 235273016
Test: Start up several apps and take a heap dump and verify the buffers
      have been preemptively closed prior to the next GC
Change-Id: If7e46e668efa101d4257dd174f31e5e366a02c9d
 2022-06-08 23:31:15 +00:00
Android Build Coastguard Worker de4b49de5c Snap for 8698879 from fe83fce489 to tm-release 
Change-Id: I2cae9ea4ea7344e55bd529014ed89fc38e724418
 2022-06-08 23:24:24 +00:00
Andy Wickham ce647cc9ae Fixes issue where personal/work tabs could overlap search reasults. 
When you start searching, the header is set to "collapsed" mode.
This normally hides the tabs indirectly if the height of the
header changed as a result, which happens if there is a prediction
row because the previous height is non-zero but is considered 0
after the collapse. However, if there was no prediction row, the
height was already 0, so the header was not re-initialized, which
is where the tab visibility takes effect.

Fix: 235299156
Test: Manually with and without app predictions enabled and
keyboard default on/off.

Change-Id: I192a700ac83776f30d3207f92636113bdb8a86c5
 2022-06-08 14:46:46 -07:00
Andy Wickham 5a476da75c Fixes Search bar padding when work profile not present. 
The full padding was accounted for between the search bar and the
work/personal tabs, but only part of it was there when the tabs
were not shown.

Screenshot: https://screenshot.googleplex.com/8axV9QQ5Qy8MaUn.png

Test: Manually with and without work profile added. In the latter
case, nothing changed. The screenshot reflects the former case.
Fix: 233010483

Change-Id: I11b3c8cc814be48c25cbd9f454c3e122fff96fa0
 2022-06-08 13:32:41 -07:00
Automerger Merge Worker 5c21f8c6e0 Merge "Merge "[Toast] Add query_length for launcher latency logging." into tm-dev am: fe83fce489 am: 9d84f6e7fb" into tm-d1-dev-plus-aosp am: 991248acac am: c3e8de8937 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18783028

Change-Id: Ie201600c824c51eb97707e4040a9bb13ba928b41
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-08 19:59:49 +00:00
Becky Qiu 990bf00655 Merge "[Toast] Add query_length for launcher latency logging." into tm-dev am: fe83fce489 am: f9dfd06424 am: 9db4cb559c am: 1508be40eb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18783028

Change-Id: I8ac111e2551261d1abbf11f83848bf56b76c77d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-08 19:58:50 +00:00
Becky Qiu c8fe5dfa0e Merge "[Toast] Add query_length for launcher latency logging." into tm-dev am: fe83fce489 am: f9dfd06424 am: 9074e97780 am: 5b4816a119 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18783028

Change-Id: I96ef5f802f3dd2326fd77838f2b3eed6c8f01975
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-08 19:57:33 +00:00
Automerger Merge Worker c3e8de8937 Merge "Merge "[Toast] Add query_length for launcher latency logging." into tm-dev am: fe83fce489 am: 9d84f6e7fb" into tm-d1-dev-plus-aosp am: 991248acac 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18783028

Change-Id: I2fe8982518173f25ee28b5f022503f981130f8ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-08 19:22:26 +00:00
Becky Qiu 1508be40eb Merge "[Toast] Add query_length for launcher latency logging." into tm-dev am: fe83fce489 am: f9dfd06424 am: 9db4cb559c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18783028

Change-Id: I25690b4de0c6c6dba4267d4128f383f7549e07f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-08 19:21:24 +00:00
Becky Qiu 5b4816a119 Merge "[Toast] Add query_length for launcher latency logging." into tm-dev am: fe83fce489 am: f9dfd06424 am: 9074e97780 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18783028

Change-Id: I2a0888dcd1487533dc0d7c2d18f1384ada177823
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-08 19:20:35 +00:00
Becky Qiu 68a63e0b73 [Toast] Add a new latency type as FAIL. 
Bug: 227696256
Test: no need to test.
Change-Id: I84cdbbfc605494062ba07d79bee96a006e7ea7a5
 2022-06-08 19:00:33 +00:00
Becky Qiu 013ea78b95 Merge "[Toast] Add query_length for launcher latency logging." into tm-dev am: fe83fce489 am: 40059b55cc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18783028

Change-Id: Ie18546e63867101d9ac6db9bc0534042864b956a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-08 18:53:22 +00:00
Automerger Merge Worker 991248acac Merge "Merge "[Toast] Add query_length for launcher latency logging." into tm-dev am: fe83fce489 am: 9d84f6e7fb" into tm-d1-dev-plus-aosp 2022-06-08 18:52:52 +00:00
Becky Qiu 9db4cb559c Merge "[Toast] Add query_length for launcher latency logging." into tm-dev am: fe83fce489 am: f9dfd06424 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18783028

Change-Id: Ieacb02db6f2a4a0c9e5035e4a421a076cab18d1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-08 18:52:40 +00:00
Becky Qiu 957640aeca Merge "[Toast] Add query_length for launcher latency logging." into tm-dev am: fe83fce489 am: 9d84f6e7fb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18783028

Change-Id: I2c01aa4fcd60542948a400a93ebaa590c3fab877
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-08 18:52:40 +00:00
Becky Qiu 9074e97780 Merge "[Toast] Add query_length for launcher latency logging." into tm-dev am: fe83fce489 am: f9dfd06424 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18783028

Change-Id: I339a468a49fc8490154dd0dc4d6266ab6e41f90e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-08 18:52:38 +00:00
Becky Qiu f9dfd06424 Merge "[Toast] Add query_length for launcher latency logging." into tm-dev am: fe83fce489 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18783028

Change-Id: I95de30e9971e85981814ca5298d1956870720c76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-08 18:26:24 +00:00
Becky Qiu 40059b55cc Merge "[Toast] Add query_length for launcher latency logging." into tm-dev am: fe83fce489 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18783028

Change-Id: Ibecd39ae00198dbf352a5d7cdfe450320fe7d1f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-08 18:25:08 +00:00
Becky Qiu 9d84f6e7fb Merge "[Toast] Add query_length for launcher latency logging." into tm-dev am: fe83fce489 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18783028

Change-Id: I00d85dc5e5afb784fdc243ce93115193c5560e80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-08 18:24:54 +00:00
Pat Manning d7da112185 Hide both drop target icons if either text goes to two lines. am: e3d74b496e am: 56ee9a90d1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18795367

Change-Id: I456bf3b573ba94db51657000fff933fcff233403
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-08 18:18:31 +00:00
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