Commit Graph

65893 Commits

Author SHA1 Message Date
Treehugger Robot 1ffcd98fbb Merge "Fix return condition in getWorkspacePageTranslationProvider" into udc-dev am: d756203fa7 am: c5e716dd17 am: 8ff5c3b0e0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24314473

Change-Id: Ic0f5bd1d333307d8a3df821d89e5ddf282dd1051
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-17 08:20:50 +00:00
Treehugger Robot 625bef7f3f Merge "Fix return condition in getWorkspacePageTranslationProvider" into udc-dev am: d756203fa7 am: e841687a7d am: 4ae4cf973c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24314473

Change-Id: I0baa7a55a229712822880d20938225ba9420b6be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-17 08:20:13 +00:00
Treehugger Robot 0c1255ea21 Merge "Fix return condition in getWorkspacePageTranslationProvider" into udc-dev am: d756203fa7 am: e841687a7d am: 73c3611b32
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24314473

Change-Id: I5d98b20266fcae1fb3eed38da4b62a684ebeed89
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-17 07:57:56 +00:00
Treehugger Robot 73c3611b32 Merge "Fix return condition in getWorkspacePageTranslationProvider" into udc-dev am: d756203fa7 am: e841687a7d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24314473

Change-Id: Iaff03a09ac0bc4f208554f994db3995d60b42893
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-17 07:37:19 +00:00
Treehugger Robot 8ff5c3b0e0 Merge "Fix return condition in getWorkspacePageTranslationProvider" into udc-dev am: d756203fa7 am: c5e716dd17
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24314473

Change-Id: I7abf0f2a314e439793293b976af880eb36dcbe8d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-17 07:36:32 +00:00
Treehugger Robot 4ae4cf973c Merge "Fix return condition in getWorkspacePageTranslationProvider" into udc-dev am: d756203fa7 am: e841687a7d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24314473

Change-Id: Ic43435c66c9f6e95d03b8d6734ab84783448969c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-17 07:36:21 +00:00
Treehugger Robot c5e716dd17 Merge "Fix return condition in getWorkspacePageTranslationProvider" into udc-dev am: d756203fa7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24314473

Change-Id: I30f820d6d29c7a30c8fd3ca361ee9048812f5f4c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-17 06:50:55 +00:00
Wei Sheng Shih e457c6d5bb Merge "Fix NPE crash when using MockProperties" into udc-qpr-dev am: e6866f3f32
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24458447

Change-Id: I3eeafd70e622d6696ac82a7d4ae16a1e748d8dd9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-17 06:46:24 +00:00
Treehugger Robot e841687a7d Merge "Fix return condition in getWorkspacePageTranslationProvider" into udc-dev am: d756203fa7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24314473

Change-Id: Ieef8d4827efbd137c13066fb07f3ef0f75a0e625
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-17 06:45:47 +00:00
Wei Sheng Shih e6866f3f32 Merge "Fix NPE crash when using MockProperties" into udc-qpr-dev 2023-08-17 06:34:03 +00:00
Treehugger Robot d756203fa7 Merge "Fix return condition in getWorkspacePageTranslationProvider" into udc-dev 2023-08-17 05:42:09 +00:00
Vinit Nayak acbb0869da Merge "Revert "Enable ENABLE_SPLIT_FROM_WORKSPACE_TO_WORKSPACE for TEAMFOOD"" into udc-qpr-dev am: d07d83dd75
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24447374

Change-Id: I4828f0081e965ec929c96808862a677efb8563b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-17 05:40:02 +00:00
Vinit Nayak d145973e68 Merge "Revert "Teamfood ENABLE_SPLIT_FROM_FULLSCREEN_WITH_KEYBOARD_SHORTCUTS"" into udc-qpr-dev am: e09f34628e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24445218

Change-Id: I39619a5e894b2e0e0eaafc2e89656b66099b7e91
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-17 05:40:00 +00:00
Vinit Nayak d07d83dd75 Merge "Revert "Enable ENABLE_SPLIT_FROM_WORKSPACE_TO_WORKSPACE for TEAMFOOD"" into udc-qpr-dev 2023-08-17 05:04:53 +00:00
Vinit Nayak e09f34628e Merge "Revert "Teamfood ENABLE_SPLIT_FROM_FULLSCREEN_WITH_KEYBOARD_SHORTCUTS"" into udc-qpr-dev 2023-08-17 05:04:53 +00:00
wilsonshih 6df52eb6f9 Fix NPE crash when using MockProperties
Override the setShow method in MockProperties as it is used for invalid
surface.

Bug: 295775097
Test: build
Change-Id: Id601fa3ce7408f236c77e41ccd60b7d8359c2e8c
2023-08-17 12:09:33 +08:00
Sunny Goyal 746613f591 Merge "Using CUJ_APP_CLOSE_TO_HOME_FALLBACK when fallback animaiton is playing" into udc-qpr-dev am: c480860744
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24448719

Change-Id: Ifc40189607fa0c02c6ff7ad14b853af460cac6d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-17 00:26:46 +00:00
Sunny Goyal c480860744 Merge "Using CUJ_APP_CLOSE_TO_HOME_FALLBACK when fallback animaiton is playing" into udc-qpr-dev 2023-08-16 23:36:10 +00:00
Treehugger Robot f4bbe54f97 Merge "Revert "Prevent setting mIsStashed in TaskbarStashController"" into udc-qpr-dev am: 12cd6076d3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24447385

Change-Id: I9719eb5349bc4a0cbbfde7383c11d3b56d5f4077
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16 20:43:49 +00:00
Treehugger Robot 12cd6076d3 Merge "Revert "Prevent setting mIsStashed in TaskbarStashController"" into udc-qpr-dev 2023-08-16 20:03:00 +00:00
Sunny Goyal 57a83b5732 Using CUJ_APP_CLOSE_TO_HOME_FALLBACK when fallback animaiton is playing
Bug: 281873427
Test: N/A
Flag: N/A
Change-Id: I7745b8b7d7b48fa5a4f58e8db7e99865226e81d5
2023-08-16 12:30:27 -07:00
Treehugger Robot 9f0e4cc93b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 06677beec0 -s ours am: 472a589ab4 -s ours am: b921628b87 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I34cc692282743aa5834190ca3e241c46793873a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16 19:22:00 +00:00
Bill Yi 79f4e118c7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: efdbc1a0cf -s ours am: bd6c8ab2a4 -s ours am: 2253e31378 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0bc334d2bdd81020c17c252d3349e47d1c06e6ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16 19:21:49 +00:00
Bill Yi 3c3f681569 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dabcd0f326 -s ours am: 67c5f16300 -s ours am: c439e24a3a -s ours
am skip reason: subject contains skip directive

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

Change-Id: I41f075041881cfd2cd216044881a39c2cfd55d0a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16 19:21:34 +00:00
Bill Yi 196a90eb02 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 186f8a6143 -s ours am: ff8a5c791a -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0993e8e19d2ee0b392de5a2ebeab1e5430376a95
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16 19:17:49 +00:00
Treehugger Robot 6cae99a4fe [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 06677beec0 -s ours am: 52baf1783b -s ours am: 67463ba8ef -s ours
am skip reason: subject contains skip directive

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

Change-Id: I803c2107ddd73536100235d7b29088096711254a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16 19:12:45 +00:00
Bill Yi 93d0754c4d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: efdbc1a0cf -s ours am: b4b14bf48a -s ours am: b79fa567c5 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9c46fdf0159d51ebaf81772a4f91f3ef9959989b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16 19:12:34 +00:00
Bill Yi cc24359f86 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dabcd0f326 -s ours am: 0bfd828001 -s ours am: a164e77c32 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6c7ddf4167879ebbe464a9b8cf4d78147aa5c574
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16 19:12:20 +00:00
Charlie Anderson a9b0249faa Merge "add logging for Launcher backup and restore events" into udc-qpr-dev am: 8a68138995
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24310674

Change-Id: Ic15305f1845395602e3a9d0af17ae316ca20b8bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16 19:00:23 +00:00
Treehugger Robot fc43c9adb5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 06677beec0 -s ours am: 472a589ab4 -s ours am: dc371661b7 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iee3ca459058816552eda2625bda7a163163cb853
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16 18:56:25 +00:00
Bill Yi 47583ee4cf [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: efdbc1a0cf -s ours am: bd6c8ab2a4 -s ours am: ad92c8f9ec -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic4565450858531c31919a9ad1f00f672178c2e46
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16 18:56:15 +00:00
Bill Yi 5d74c13b89 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dabcd0f326 -s ours am: 67c5f16300 -s ours am: 49efeac546 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib889b1334d4a980d9b784276fe8fad970d14ca9f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16 18:56:01 +00:00
Charlie Anderson 8a68138995 Merge "add logging for Launcher backup and restore events" into udc-qpr-dev 2023-08-16 18:53:36 +00:00
Bill Yi d8dc46a403 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 186f8a6143 -s ours am: 526000e713 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6ad09c93ef9b62a627299197ea75699d539d1aad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16 18:51:10 +00:00
Vinit Nayak a725e48879 Revert "Prevent setting mIsStashed in TaskbarStashController"
This reverts commit 51a210d787.

Reason for revert: test may have been fixed before this got merged, will merge revert to confirm

Change-Id: Ib26b94af971eceb02e6bf58f39a578ee04eb72e8
2023-08-16 18:45:51 +00:00
Treehugger Robot b921628b87 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 06677beec0 -s ours am: 472a589ab4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7cd427ef1479ff6a5cae273e2497b40dbdcad19b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16 18:37:54 +00:00
Bill Yi 2253e31378 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: efdbc1a0cf -s ours am: bd6c8ab2a4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia2900b6c3aaee6302dc60cb198b744af91ba0688
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16 18:37:43 +00:00
Bill Yi c439e24a3a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dabcd0f326 -s ours am: 67c5f16300 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5fed5c6e3100d11dcb57464ddbf88f7b1f02b3dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16 18:37:30 +00:00
Treehugger Robot dc371661b7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 06677beec0 -s ours am: 472a589ab4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I88f0099f79d7a239936ee65642e6cb7aea7576a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16 18:36:11 +00:00
Bill Yi ad92c8f9ec [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: efdbc1a0cf -s ours am: bd6c8ab2a4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5a79e7f15697805540ee471e282d24eaa56ea919
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16 18:36:01 +00:00
Bill Yi 49efeac546 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dabcd0f326 -s ours am: 67c5f16300 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I37c010e3aedc3fb9f769fe266157a821a065ab06
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16 18:35:45 +00:00
Bill Yi ff8a5c791a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 186f8a6143 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I67d56b79702773da7196aa29729a27b0bc1fe4cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16 18:34:06 +00:00
Bill Yi 526000e713 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 186f8a6143 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5f19a752941d67ce3594e64a515777bbd849a0d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16 18:32:58 +00:00
Treehugger Robot 67463ba8ef [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 06677beec0 -s ours am: 52baf1783b -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie68dfe5382ab6146b5aeef2c297e94069a327758
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16 18:30:10 +00:00
Bill Yi b79fa567c5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: efdbc1a0cf -s ours am: b4b14bf48a -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia901b91668af0b40b5aee0a846a9637dc0b80732
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16 18:30:00 +00:00
Bill Yi a164e77c32 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dabcd0f326 -s ours am: 0bfd828001 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I17ab6e5d93a002244ca4a24a1c45713fec856a11
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16 18:29:44 +00:00
Brandon Dayauon afa6c0ff0b Merge "Remove unused onboardingPrefs" into udc-qpr-dev am: 7aaee510db
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23681105

Change-Id: I5684257d5c26c0d3b05e27080791225c29e704e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16 18:19:53 +00:00
Treehugger Robot a375911a65 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: 08cd533f79 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iae2828c5fbdb132afa5ef7cd4735f1e0e0a7dca9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16 18:14:39 +00:00
Bill Yi 4fc176b1f1 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 04ba1ae0c4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I55e0696ec68f85e390d6646e224b551da65522b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16 18:14:27 +00:00
Brandon Dayauon 7aaee510db Merge "Remove unused onboardingPrefs" into udc-qpr-dev 2023-08-16 17:49:26 +00:00