Commit Graph

61116 Commits

Author SHA1 Message Date
Bill Yi 6971101037 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b14af65416 -s ours am: eed5ede9d5 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ieb7970648b053b5262a7fcbdbe09e5fe99da05e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-06 14:51:20 +00:00
Automerger Merge Worker a2b2a67274 Merge changes from topic "am-bf5c0a3c14b74e2d967841198557db9f" into udc-dev-plus-aosp
* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 33af14add5 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 24e69ac29d -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 6aeae7ba85 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f5b0898001 -s ours
2023-06-06 14:51:04 +00:00
Treehugger Robot c10fc8f21e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: fd4d657517 -s ours am: 8ac9ba9c43 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I90eb4f0dac9c2d8c74c88500e75d8be2385e0178
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-06 14:49:56 +00:00
Bill Yi 8182fa00d6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b14af65416 -s ours am: 55c19361f0 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic06a3bdd7d124546774539b7064a5e1878b14eae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-06 14:49:53 +00:00
Treehugger Robot 3706f2e860 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 33af14add5 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I144164900b33bc988827dfb4331b7dbcc169a3e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-06 14:49:06 +00:00
Bill Yi 87905d20fb [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 24e69ac29d -s ours
am skip reason: subject contains skip directive

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

Change-Id: I250ffaf062fc07196ab63287ca5912c435e82602
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-06 14:48:51 +00:00
Bill Yi f9ab0b5aa6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: c1794e84a1 -s ours am: 12008e9301 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4f3402c5bfda6b8e1f46080c1fd012004f2449ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-06 14:48:46 +00:00
Treehugger Robot 2587246d11 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 6aeae7ba85 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4e6fccf11c5ff5fba7e0a553bf78cd61281aac1b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-06 14:48:37 +00:00
Bill Yi b413c57d65 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a22d343f96 -s ours am: 40b4762b14 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ibec4385228b2988fbe0ceb990f6adedac3296cc3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-06 14:48:37 +00:00
Bill Yi 00b0e2984b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f5b0898001 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia1aab0e8149529ad85c4b313448bef87adc21c8b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-06 14:48:25 +00:00
Bill Yi eed5ede9d5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b14af65416 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I470c6995683e1d274acdd932a8fcb70529cf60b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-06 14:46:11 +00:00
Treehugger Robot 8ac9ba9c43 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: fd4d657517 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I67ae134186233794acafab3d378983ce438fcc2a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-06 14:43:34 +00:00
Bill Yi 55c19361f0 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b14af65416 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9c330fa0f99b646939801c0faa0b9a1a01e765c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-06 14:43:30 +00:00
Treehugger Robot 33af14add5 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev 2023-06-06 14:43:16 +00:00
Treehugger Robot 6aeae7ba85 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev 2023-06-06 14:43:16 +00:00
Bill Yi 5afb88da55 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: c1794e84a1 -s ours am: 9e7f16b778 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3edb5b23387e5459a1fa3f2654b15ccf348e625c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-06 14:43:09 +00:00
Bill Yi 5de1b7612d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a22d343f96 -s ours am: 9642678618 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib558141905be273bcc99083d0fb75ef5d04917bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-06 14:43:02 +00:00
Treehugger Robot fd4d657517 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2023-06-06 14:19:16 +00:00
Bill Yi 9e7f16b778 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: c1794e84a1 -s ours
am skip reason: subject contains skip directive

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

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

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

Change-Id: I76b75c173d2cba514df0852a7a67367aa578c670
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-06 14:00:51 +00:00
Bill Yi 12008e9301 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: c1794e84a1 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9c849a851539025b0b6d597d1c3d4ba75bdf40cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-06 13:58:50 +00:00
Bill Yi 40b4762b14 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a22d343f96 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie133db307aecc3e306098320e7711ae6486e0b78
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-06 13:58:40 +00:00
Bill Yi c1794e84a1 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2023-06-06 13:25:53 +00:00
Pinyao Ting f834e1b4b0 [automerger skipped] Fix permission issue in legacy shortcut am: c53818a16b am: d19cb72bae am: 3c771b12fb am: d9bb5cd96f am: e2d76ce0a1 am: 0c816c738d am: d3aef7acf3 -s ours am: 909f0e91bf -s ours am: b03dce3091 -s ours
am skip reason: Merged-In I05ccbde0a873569f24af4d3675a86830ba54c43f with SHA-1 f0261b5b38 is already in history

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

Change-Id: I4defd7c7dec5675668f6341b93a40b21b0cb7965
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-06 06:38:12 +00:00
Pinyao Ting 3850bafd27 [automerger skipped] Fix permission issue in legacy shortcut am: c53818a16b am: d19cb72bae am: 3c771b12fb am: d9bb5cd96f am: e2d76ce0a1 am: 0c816c738d am: d3aef7acf3 -s ours am: 909f0e91bf -s ours am: ff1e766e34 -s ours
am skip reason: Merged-In I05ccbde0a873569f24af4d3675a86830ba54c43f with SHA-1 f0261b5b38 is already in history

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

Change-Id: Ic83bc608674bd0584c305ae5ea93fe4565d23aa4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-06 06:12:39 +00:00
Pinyao Ting ff1e766e34 [automerger skipped] Fix permission issue in legacy shortcut am: c53818a16b am: d19cb72bae am: 3c771b12fb am: d9bb5cd96f am: e2d76ce0a1 am: 0c816c738d am: d3aef7acf3 -s ours am: 909f0e91bf -s ours
am skip reason: Merged-In I05ccbde0a873569f24af4d3675a86830ba54c43f with SHA-1 f0261b5b38 is already in history

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

Change-Id: I51b834cefc6991f900ba1f4a584beaecdba56653
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-06 05:54:20 +00:00
Pinyao Ting b03dce3091 [automerger skipped] Fix permission issue in legacy shortcut am: c53818a16b am: d19cb72bae am: 3c771b12fb am: d9bb5cd96f am: e2d76ce0a1 am: 0c816c738d am: d3aef7acf3 -s ours am: 909f0e91bf -s ours
am skip reason: Merged-In I05ccbde0a873569f24af4d3675a86830ba54c43f with SHA-1 f0261b5b38 is already in history

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

Change-Id: I95fbe88b4ed3e5067a2cc3b23de50fc721dd0d08
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-06 05:52:11 +00:00
Pinyao Ting a224b7b606 [automerger skipped] Fix permission issue in legacy shortcut am: c53818a16b am: d19cb72bae am: 3c771b12fb am: d9bb5cd96f am: e2d76ce0a1 am: 0c816c738d am: 7c15fcab12 -s ours am: 6763125ac7 -s ours
am skip reason: Merged-In I05ccbde0a873569f24af4d3675a86830ba54c43f with SHA-1 f0261b5b38 is already in history

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

Change-Id: Ifc2f63b6aa08d1ff28f08b7ca915ae25048fea75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-06 05:51:36 +00:00
Pinyao Ting 909f0e91bf [automerger skipped] Fix permission issue in legacy shortcut am: c53818a16b am: d19cb72bae am: 3c771b12fb am: d9bb5cd96f am: e2d76ce0a1 am: 0c816c738d am: d3aef7acf3 -s ours
am skip reason: Merged-In I05ccbde0a873569f24af4d3675a86830ba54c43f with SHA-1 f0261b5b38 is already in history

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

Change-Id: I01d184f9cff4a4993e03f02f52d85a2389c9bb83
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-06 05:14:11 +00:00
Pinyao Ting 6763125ac7 [automerger skipped] Fix permission issue in legacy shortcut am: c53818a16b am: d19cb72bae am: 3c771b12fb am: d9bb5cd96f am: e2d76ce0a1 am: 0c816c738d am: 7c15fcab12 -s ours
am skip reason: Merged-In I05ccbde0a873569f24af4d3675a86830ba54c43f with SHA-1 f0261b5b38 is already in history

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

Change-Id: I5065be22916197069324b0f7a22d669fb7301f3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-06 05:11:36 +00:00
Pinyao Ting d3aef7acf3 Fix permission issue in legacy shortcut am: c53818a16b am: d19cb72bae am: 3c771b12fb am: d9bb5cd96f am: e2d76ce0a1 am: 0c816c738d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23526090

Change-Id: I3c935b28921fe2a40833229219d8d52f9748bc60
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-06 04:30:37 +00:00
Pinyao Ting 7c15fcab12 Fix permission issue in legacy shortcut am: c53818a16b am: d19cb72bae am: 3c771b12fb am: d9bb5cd96f am: e2d76ce0a1 am: 0c816c738d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23526090

Change-Id: I2b5cffd08b8be191861536da9b86143307d8cd4d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-06 04:29:33 +00:00
Pinyao Ting 0c816c738d Fix permission issue in legacy shortcut am: c53818a16b am: d19cb72bae am: 3c771b12fb am: d9bb5cd96f am: e2d76ce0a1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23526090

Change-Id: I41bc3f0337ed6613f0fc9aaa6207b97cfe2339ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-06 03:43:10 +00:00
Pinyao Ting e2d76ce0a1 Fix permission issue in legacy shortcut am: c53818a16b am: d19cb72bae am: 3c771b12fb am: d9bb5cd96f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23526090

Change-Id: I4ea4039f3c1e70385a87a7f53a0da2aa231af8e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-06 03:06:32 +00:00
TreeHugger Robot 21c61e80e9 Merge "Don't allow Taskbar unstash during Assistant gesture" into udc-dev am: e2a6113e93
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23565985

Change-Id: I660c58403744b737a2819378b8ffd62f8c8a0bd7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-06 02:19:10 +00:00
Pinyao Ting d9bb5cd96f Fix permission issue in legacy shortcut am: c53818a16b am: d19cb72bae am: 3c771b12fb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23526090

Change-Id: I679537a6b5e8831065e8a665ecd6e686da20988f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-06 02:18:35 +00:00
Pinyao Ting 3c771b12fb Fix permission issue in legacy shortcut am: c53818a16b am: d19cb72bae
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23526090

Change-Id: I8a0137303fdbb2811788efef4290a5bacd469f65
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-06 01:33:35 +00:00
TreeHugger Robot e2a6113e93 Merge "Don't allow Taskbar unstash during Assistant gesture" into udc-dev 2023-06-06 01:33:31 +00:00
Pinyao Ting 4bebfa2819 [automerger skipped] [RESTRICT AUTOMERGE] Fix permission issue in legacy shortcut am: f0261b5b38 -s ours am: 51962097af -s ours
am skip reason: subject contains skip directive

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

Change-Id: I870fbb19b74465525626b7cddeda0b270cb52203
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-06 01:10:40 +00:00
Pinyao Ting 0b42655768 [automerger skipped] [RESTRICT AUTOMERGE] Fix permission issue in legacy shortcut am: f0261b5b38 am: 8a41748cdf -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie756991a2dcb487cd370e776f0caca87b4f4a8c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-06 01:09:50 +00:00
Pinyao Ting d19cb72bae Fix permission issue in legacy shortcut am: c53818a16b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23526090

Change-Id: I88304cadd17c6237942fc0ad3287269ab22704bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-06 00:46:10 +00:00
Pinyao Ting 51962097af [automerger skipped] [RESTRICT AUTOMERGE] Fix permission issue in legacy shortcut am: f0261b5b38 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I32c67c23f57b63dba3cc9cbdeee9aed0dc8465ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-06 00:25:39 +00:00
Pinyao Ting 8a41748cdf [RESTRICT AUTOMERGE] Fix permission issue in legacy shortcut am: f0261b5b38
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23566423

Change-Id: I4b9c6db81ed92b12c0563d8a2a20891242215b6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-06 00:23:30 +00:00
Pinyao Ting c53818a16b Fix permission issue in legacy shortcut
When building legacy shortcut, Launcher calls
PackageManager#resolveActivity to retrieve necessary permission to
launch the intent.

However, when the source app wraps an arbitrary intent within
Intent#createChooser, the existing logic will fail because launching
Chooser doesn't require additional permission.

This CL fixes the security vulnerability by performing the permission
check against the intent that is wrapped within.

Bug: 270152142
Test: manual
Merged-In: I05ccbde0a873569f24af4d3675a86830ba54c43f
Change-Id: If35344c08975e35085c7c2b9b814a3c457a144b0
2023-06-05 23:53:39 +00:00
TreeHugger Robot 8755f5df8d Merge "Prevent initiating split with task excluded from recents" into udc-dev am: 0d3edbfeb6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23495351

Change-Id: I8cc7db47b039d28745386b8b6d8e65a3b3b8188a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-05 23:37:26 +00:00
Tony Wickham 97bada6339 Don't allow Taskbar unstash during Assistant gesture
Test: manual with "swipe to invoke assistant" enabled
Flag: none
Fixes: 282060498
Change-Id: I317d01dbbb59d020338b17d424c853a00ef03cce
2023-06-05 23:23:40 +00:00
TreeHugger Robot 0d3edbfeb6 Merge "Prevent initiating split with task excluded from recents" into udc-dev 2023-06-05 22:56:42 +00:00
Treehugger Robot 6f30072f08 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 68595d3b9b -s ours am: 59c909eb9b -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iee76f7495ca04fe9832e94384c90558eba387aba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-05 21:56:32 +00:00
Bill Yi 540e743c73 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 30ffb5b971 -s ours am: 12b6d0039d -s ours
am skip reason: subject contains skip directive

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

Change-Id: I913f6b6990ee944a9785458b6986f05572dc0343
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-05 21:56:30 +00:00
Treehugger Robot 961d1c1561 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 9051147ca3 -s ours am: 0d9425506b -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ibd89051adf4c22ebf1a0928454c22b7b5f799227
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-05 21:56:26 +00:00