Commit Graph

72246 Commits

Author SHA1 Message Date
Krzysztof Kosiński c1d05a7101 Merge "Clean up obsolete aliases for Truth." into main am: a4bc505d01 am: 6247399c9b am: f56d690e22 am: 42c39649a7 am: b085f9e819
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/2778094

Change-Id: Id239979be76a11ce08d564c13f174aa5d02deb3f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-11 00:16:49 +00:00
Automerger Merge Worker d12de08601 Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 53bc743c58 -s ours am: 2e3aea5133 -s ours am: 2d42f8724e -s ours" into udc-qpr-dev-plus-aosp am: 281ad63c31 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I45649ea677a532e7c31ba7e8f3b779c2b7728bb0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-10 23:42:43 +00:00
Bill Yi 67af07f460 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 53bc743c58 -s ours am: 2e3aea5133 -s ours am: 2d42f8724e -s ours am: 5adb4d0f59 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie4fbc3742037475b5009b0fe84df57856b7d93c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-10 23:42:31 +00:00
Automerger Merge Worker d31ef63ae0 Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 53bc743c58 -s ours am: f145e084cc -s ours am: a2a4b84db1 -s ours" into udc-qpr-dev-plus-aosp am: 644a5bd5b4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5aedd906a161051723f5cb660fea2be59de69c2a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-10 23:35:19 +00:00
Bill Yi 2c74d95768 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 53bc743c58 -s ours am: f145e084cc -s ours am: a2a4b84db1 -s ours am: 9909efb8d5 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6ef62cbff5140a69698bf3cf90bcdd3230265040
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-10 23:35:05 +00:00
Bill Yi b0a593cffe [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 53bc743c58 -s ours am: f145e084cc -s ours am: 4113114d9c -s ours am: f0f05a30dc -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ibed3e3b47ec08feed404da7a6347258ab780dc45
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-10 23:19:49 +00:00
Automerger Merge Worker 39c1a9ab23 Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3b26a6ef18 -s ours am: dae4fd731e -s ours" into udc-qpr-dev-plus-aosp am: 1ba2273553 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5f0e857aae34bdbe00f30d17cab2abdd6be668c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-10 23:17:00 +00:00
Bill Yi f9a36cf5bc [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3b26a6ef18 -s ours am: dae4fd731e -s ours am: e96a39e257 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I41b94e6402197a150495cc1b347db53e30f0e5b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-10 23:16:45 +00:00
Bill Yi ab83e65451 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3b26a6ef18 -s ours am: 4c74dcb8f2 -s ours am: b621499fde -s ours
am skip reason: subject contains skip directive

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

Change-Id: I53293b4c4d35f567095db16dbd8ba2cf8ea2bd97
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-10 23:08:30 +00:00
Krzysztof Kosiński b085f9e819 Merge "Clean up obsolete aliases for Truth." into main am: a4bc505d01 am: 6247399c9b am: f56d690e22 am: 42c39649a7
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/2778094

Change-Id: Idc45788d21959e1569e0fd33686536a9675442ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-10 21:50:07 +00:00
Krzysztof Kosiński 42c39649a7 Merge "Clean up obsolete aliases for Truth." into main am: a4bc505d01 am: 6247399c9b am: f56d690e22
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/2778094

Change-Id: Ief1a7711ee66ce89708ed9bb0daed55471383329
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-10 21:17:18 +00:00
Krzysztof Kosiński f56d690e22 Merge "Clean up obsolete aliases for Truth." into main am: a4bc505d01 am: 6247399c9b
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/2778094

Change-Id: I60a48030963d6f2e9ddd090e0438bd3b0ba714ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-10 20:10:09 +00:00
Krzysztof Kosiński 6247399c9b Merge "Clean up obsolete aliases for Truth." into main am: a4bc505d01
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/2778094

Change-Id: Ic9eed67c9957d2702a0b01319dc63688189f3963
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-10 19:36:40 +00:00
Bill Yi 9f34a29d0e Merge "Import translations. DO NOT MERGE ANYWHERE" into main 2023-10-10 19:29:49 +00:00
Bill Yi 7991a8ed41 Merge "Import translations. DO NOT MERGE ANYWHERE" into main 2023-10-10 19:29:49 +00:00
Jeremy Sim df55a762fe Merge "App Pairs: Implement app pairs icon" into main 2023-10-10 19:15:20 +00:00
Sunny Goyal b834d6eca8 Merge "Removing some usage of shared prefs" into main 2023-10-10 18:44:15 +00:00
Krzysztof Kosiński a4bc505d01 Merge "Clean up obsolete aliases for Truth." into main 2023-10-10 18:28:25 +00:00
Jagrut Desai 3872759957 Merge "Stop Active Gesture Error Detection for Non Gestural Navigation Mode" into main 2023-10-10 17:32:47 +00:00
Federico Baron e221945296 Merge "Add NullPointerException to try/catch since it's possible to have such an error" into main 2023-10-10 17:01:15 +00:00
Alex Chau 09d8e2ca57 Merge "Revert "Migrate ENABLE_GRID_ONLY_OVERVIEW to aconfig flag"" into main 2023-10-10 12:26:21 +00:00
Alex Chau 7b5472f986 Revert "Migrate ENABLE_GRID_ONLY_OVERVIEW to aconfig flag"
This reverts commit 6f264a927b.

Reason for revert: Keeping old flag system so we can test in Tapl tests (b/283246928)
Bug: 270397206

Change-Id: I3e6364ebac8018facc3b22e510615735299a3dad
2023-10-10 10:38:04 +00:00
Krzysztof Kosiński 6e3b7a6943 Clean up obsolete aliases for Truth.
Bug: 255714762
Test: presubmit
Change-Id: Idd56488c129096c520e4e69f175778f10156a569
2023-10-10 06:50:28 +00:00
Tracy Zhou f14c534ec5 Merge "Set correct stashed task(nav) bar height with taskbar/navbar unification" into main 2023-10-10 05:08:02 +00:00
Automerger Merge Worker 281ad63c31 Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 53bc743c58 -s ours am: 2e3aea5133 -s ours am: 2d42f8724e -s ours" into udc-qpr-dev-plus-aosp 2023-10-10 01:38:52 +00:00
Automerger Merge Worker 644a5bd5b4 Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 53bc743c58 -s ours am: f145e084cc -s ours am: a2a4b84db1 -s ours" into udc-qpr-dev-plus-aosp 2023-10-10 01:37:16 +00:00
Bill Yi 5adb4d0f59 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 53bc743c58 -s ours am: 2e3aea5133 -s ours am: 2d42f8724e -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6ce7a8c9c4405f30cb130a850d3ec05aaca6bf14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-10 01:36:28 +00:00
Bill Yi 9909efb8d5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 53bc743c58 -s ours am: f145e084cc -s ours am: a2a4b84db1 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I451c39ac87ddf83e51e1b7404b9092f84abd8844
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-10 01:32:31 +00:00
Bill Yi f0f05a30dc [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 53bc743c58 -s ours am: f145e084cc -s ours am: 4113114d9c -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id47b68afbe921c3515c1d1cdd60b479734f9e6ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-10 01:31:40 +00:00
Automerger Merge Worker 1ba2273553 Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3b26a6ef18 -s ours am: dae4fd731e -s ours" into udc-qpr-dev-plus-aosp 2023-10-10 01:30:34 +00:00
Bill Yi b621499fde [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3b26a6ef18 -s ours am: 4c74dcb8f2 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2567885934c625e60d0d82eae245dde6498b6183
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-10 01:26:17 +00:00
Bill Yi f184529b64 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 53bc743c58 -s ours am: af26e5d298 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia1176f4ef5d57a62be5e65a0936441c32abe6fc0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-10 01:26:03 +00:00
Bill Yi e96a39e257 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3b26a6ef18 -s ours am: dae4fd731e -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5625a841e2d2c9843c230f9d6f7d3265916a2a71
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-10 01:25:31 +00:00
Bill Yi 2d42f8724e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 53bc743c58 -s ours am: 2e3aea5133 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I77dae3d8d96b693382fb7612234bf938d30eb01c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-10 01:25:08 +00:00
Bill Yi a2a4b84db1 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 53bc743c58 -s ours am: f145e084cc -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie6e5ba75ff8a5e7cda38ab8f749dca85461bf66e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-10 00:15:35 +00:00
Bill Yi dae4fd731e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3b26a6ef18 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I83e05d16a6b305810020a039d18dc9f1a1a41422
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-10 00:11:29 +00:00
Bill Yi 4113114d9c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 53bc743c58 -s ours am: f145e084cc -s ours
am skip reason: subject contains skip directive

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

Change-Id: If655986413295adc22b003b068801aa2270b47a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-10 00:09:24 +00:00
Bill Yi 4c74dcb8f2 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3b26a6ef18 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I163009954fd36895e4015e5b782e37169486fd3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-10 00:03:14 +00:00
Bill Yi f145e084cc [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 53bc743c58 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I984f6bf4764b7e00843d0df001e51d2728de9c46
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-10 00:01:25 +00:00
Bill Yi 2e3aea5133 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 53bc743c58 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0fb40c56224a8bebdd37daefa47977fa7026f99b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-10 00:01:00 +00:00
Bill Yi af26e5d298 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 53bc743c58 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I70cd7b81083a46e9c6a5e3eaf1c7b525251c32a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-10 00:00:52 +00:00
Federico Baron ca39bd99cc Merge "Add screenrecord to testOverviewActionsMenu_iconAppChipMenu" into main 2023-10-09 21:29:11 +00:00
Sebastián Franco 488defcac2 Merge "Removing logs of test investigation" into main 2023-10-09 21:23:22 +00:00
Vadim Tryshev 6bc3f5e0e1 Merge "Introducing a method for execution an action on Launcher for teardown" into main 2023-10-09 21:22:47 +00:00
Tracy Zhou 5bd641e3f5 Merge "Fix task bar crashing in small screen with task bar / nav bar unification on" into main 2023-10-09 20:26:25 +00:00
Andreas Agvard 833bc3a1ca [automerger skipped] DO NOT MERGE Temporary fix for race condition. am: 928e0521b2 am: d25afb7eab -s ours
am skip reason: subject contains skip directive

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

Change-Id: If90d4051041f6596ee05f54bde166a3e11b8132e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-09 18:56:26 +00:00
Vadim Tryshev 39b4fad9b0 Introducing a method for execution an action on Launcher for teardown
If the test fails to initialize properly, tearDown is still called,
and we may have null Launcher activity.

We want to safely skip using that activity to avoid a NullPointerException
that would hide the original error message.

Bug: 304306290
Test: presubmit
Flag: N/A
Change-Id: I89774a92ede046fa3afadacc62df25f4f496f4e7
2023-10-09 11:29:42 -07:00
Andreas Agvard d25afb7eab DO NOT MERGE Temporary fix for race condition. am: 928e0521b2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24955345

Change-Id: Iae4f125b437f3fc4528851d48432757b1121f353
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-09 18:21:59 +00:00
Sebastian Franco 76fcdd909d Removing logs of test investigation
Fix: 288944469
Test: uninstallWorkspaceIcon
Change-Id: I4ffaa0dd589a891f880296c7be35b5fce85362e3
2023-10-09 10:52:33 -07:00
Alex Chau 461b65fa4e Merge "Use mock TaskStackChangeListeners in RecentsModelTest" into main 2023-10-09 16:39:13 +00:00