PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
78,507 Commits 1 Branch 0 Tags
eedc7ab8fdb94de05201fa87537991558accbe8a
Commit Graph

78507 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Pinyao Ting 1c0b5f535c [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: Icacd07c7c83c91470b41aa16da64f5ea70d22545
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-06 01:10:04 +00:00
Pinyao Ting 14dda30328 [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: I281a71ddf32f8497766ccaaf7798f385ec9b435f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-06 01:10:00 +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 327793e716 [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: I19b2a114a538f2642a445ae07885d2e7516caf20
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-06 01:09:47 +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
TreeHugger Robot 36a450d96c Merge "Prevent initiating split with task excluded from recents" into udc-dev am: 0d3edbfeb6 am: 8755f5df8d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23495351

Change-Id: Ic0a0fd0bb717a70ea2855e1d80d9faff484f6d3c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-06 00:27:43 +00:00
TreeHugger Robot 9bf69ea28d Merge "Prevent initiating split with task excluded from recents" into udc-dev am: 0d3edbfeb6 am: 4418ade8ef 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23495351

Change-Id: Ib86e56e308adf538911531dc8296d2d0dd865c9e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-06 00:27:11 +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
TreeHugger Robot e2f49546e3 Merge "Prevent initiating split with task excluded from recents" into udc-dev am: 0d3edbfeb6 am: 97df54f62a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23495351

Change-Id: I63c7f0e9fef2bdae2cab6fb1692daa6cf43a86fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-06 00:23:09 +00:00
TreeHugger Robot 39a37a9458 Merge "Prevent initiating split with task excluded from recents" into udc-dev am: 0d3edbfeb6 am: 4418ade8ef 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23495351

Change-Id: I02005bd41d3f072d4863408726a75735c3b153ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-06 00:23:09 +00:00
Anushree Ganjam b82fdca98e Remove @WorkerThread annotation and Preconditions.assertWorkerThread check. am: f781ef81bf am: 82f0aaa1d5 am: 1373c90087 am: 74904a6511 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23566433

Change-Id: I9be3550b7722bb0906fd1b6b767e5da8c0fcc20b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-06 00:06:22 +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
Anushree Ganjam 7ab33407e2 Remove @WorkerThread annotation and Preconditions.assertWorkerThread check. am: f781ef81bf am: 82f0aaa1d5 am: f40761e8d0 am: 1e92378696 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23566433

Change-Id: Ib161cc1bd4ed1e2ca5c94c735a080ed3e85d45ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-05 23:50:46 +00:00
Treehugger Robot 27e0f87e2b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 68595d3b9b -s ours am: 59c909eb9b -s ours am: 6f30072f08 -s ours am: 4675e8d6ff -s ours am: 2ad395106a -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: I136effb8aff448b80e826b530ae0525c89f48eb1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-05 23:50:28 +00:00
Bill Yi a1ababf783 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 30ffb5b971 -s ours am: 12b6d0039d -s ours am: 540e743c73 -s ours am: 2a860c3f6f -s ours am: 05f32ee242 -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: I2c501d161990acbfe4a23aa291193e76e4f39a80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-05 23:50:26 +00:00
Treehugger Robot aa84a045ca [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 9051147ca3 -s ours am: 0d9425506b -s ours am: 961d1c1561 -s ours am: a45731f37c -s ours am: 30c3b6dab3 -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: I198e6845f182366c45d5a2e2486d750c05d05f49
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-05 23:50:22 +00:00
Bill Yi 40bb550d88 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ec2f0cdff0 -s ours am: 4aa543087f -s ours am: 9306294269 -s ours am: dab2d77d36 -s ours am: 2279536e1e -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: Ice73cd6077ec6d4bfc2f798d885b284974edfc56
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-05 23:50:15 +00:00
Anushree Ganjam bcfa97080a Remove @WorkerThread annotation and Preconditions.assertWorkerThread check. am: f781ef81bf am: 247d1d98ef am: 33226f1be4 am: 7394f01bf3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23566433

Change-Id: If246d5c1a5558566045df60b47f58999537f33b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-05 23:49:55 +00:00
Bill Yi b13f08b636 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 88720f7810 -s ours am: c364678343 -s ours am: 7c2a21d392 -s ours am: a887c61943 -s ours am: 7b51031cf6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5103b008fe85bb748a268a08b57785931563a80d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-05 23:48:35 +00:00
TreeHugger Robot 4418ade8ef 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: If2d3b0c2e705f48a24e13ec678e5d7e18b94102d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-05 23:41:48 +00:00
TreeHugger Robot 97df54f62a 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: Ic7c7cfe25236b16942188d87426a92e4516646c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-05 23:41:46 +00:00
TreeHugger Robot ebe5a662b2 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: I20127910badbe9f65c89a3eeba1517b1c9849e72
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-05 23:41:30 +00:00
Ats Jenk a37f3f2c2c Animate in desktop app select toast 
Add an animation for the desktop app select toast.
Played when the toast is added to the screen.

Bug: 261234402
Test: have an app on desktop, swipe up to home, verify that the toast
  has an appear animation, per the spec
Test: when toast is visible, tap on cancel button, observe toast fades
  out
Test: when toast is visible, launch an app, verify toast fades out
Change-Id: I593d6c326d6d638f1bc06e8c6add31b0244e4cb5
 2023-06-05 16:39:29 -07: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 8302a41cf2 Merge "Simplifying some test utility methods" into udc-qpr-dev am: 859d0d87e2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23443976

Change-Id: I8894188d382d41196bed569b366ba60f2ec6ae64
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-05 23:22:21 +00:00
Anushree Ganjam 74904a6511 Remove @WorkerThread annotation and Preconditions.assertWorkerThread check. am: f781ef81bf am: 82f0aaa1d5 am: 1373c90087 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23566433

Change-Id: I6e8739fa114f6c3dbdfa18133861e572cc9e5814
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-05 23:21:21 +00:00
Android Build Coastguard Worker 23e97ce9ae Snap for 10262100 from 59ec439e36 to udc-release 
Change-Id: I8e8109928fd77a41513c06f196b9927cf5574693
 2023-06-05 23:19:16 +00:00
TreeHugger Robot 859d0d87e2 Merge "Simplifying some test utility methods" into udc-qpr-dev 2023-06-05 23:10:06 +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
Anushree Ganjam 1e92378696 Remove @WorkerThread annotation and Preconditions.assertWorkerThread check. am: f781ef81bf am: 82f0aaa1d5 am: f40761e8d0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23566433

Change-Id: Ia284c2551eff2e256e06850404977682b7242dcb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-05 22:50:09 +00:00
fbaron a89f4f9b9c Fix crash on first open of widget picker when changing orientation 
Bug: 285909636
Test: on first use of widget picker a tooltip edu shows up, rotate from landscape to portrait or vice-versa and make sure widget picker doesn't crash
Change-Id: Iaa066a41633d3efe48b67a867f3f267f613ea5fe
 2023-06-05 22:45:07 +00:00
Treehugger Robot 2ad395106a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 68595d3b9b -s ours am: 59c909eb9b -s ours am: 6f30072f08 -s ours am: 4675e8d6ff -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: I93c2acb27bbe7794027dd88512d9607d204a5cbb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-05 22:40:02 +00:00
Bill Yi 05f32ee242 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 30ffb5b971 -s ours am: 12b6d0039d -s ours am: 540e743c73 -s ours am: 2a860c3f6f -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: I9f84ec6a899dd2a5c6babd30a5902d6d7e51e7e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-05 22:40:01 +00:00
Treehugger Robot 30c3b6dab3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 9051147ca3 -s ours am: 0d9425506b -s ours am: 961d1c1561 -s ours am: a45731f37c -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: Ia31db6b0916203ee74478fc935c78e180a67fb03
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-05 22:39:56 +00:00
Bill Yi 2279536e1e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ec2f0cdff0 -s ours am: 4aa543087f -s ours am: 9306294269 -s ours am: dab2d77d36 -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: I715e4779633575bb7c76a99296bb4030da78db0c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-05 22:39:50 +00:00
Anushree Ganjam 7394f01bf3 Remove @WorkerThread annotation and Preconditions.assertWorkerThread check. am: f781ef81bf am: 247d1d98ef am: 33226f1be4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23566433

Change-Id: I2932424e18591e85c77d8548d2c0147d52f9442b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-05 22:39:34 +00:00
Anushree Ganjam 1373c90087 Remove @WorkerThread annotation and Preconditions.assertWorkerThread check. am: f781ef81bf am: 82f0aaa1d5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23566433

Change-Id: Iddd70c0bfbe2dae1653d5a9e4348f4751841705f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-05 22:33:38 +00:00
Anushree Ganjam f40761e8d0 Remove @WorkerThread annotation and Preconditions.assertWorkerThread check. am: f781ef81bf am: 82f0aaa1d5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23566433

Change-Id: I7f3dd1b535539ae9e9e91ab13d773f9aec2d7f1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-05 22:31:40 +00:00
Anushree Ganjam 7f38261652 Remove @WorkerThread annotation and Preconditions.assertWorkerThread check. am: f781ef81bf am: 6fac7deb1d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23566433

Change-Id: I7b98d58d1ab10bf3b471bcd7b032200f7550c36a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-05 22:31:07 +00:00
Tony Wickham 670f17f560 Enabled NOTIFY_CRASHES for teamfood 
Flag: NOTIFY_CRASHES
Test: none
Fixes: 285951384
Change-Id: I1f4905e0b797f4d0d7356cad0be4d98bfa09a3b7
 2023-06-05 22:15:18 +00:00
Treehugger Robot 4675e8d6ff [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 68595d3b9b -s ours am: 59c909eb9b -s ours am: 6f30072f08 -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: I36ed0c43344806b6b5cae6a0d9f910e66471a0ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-05 22:02:07 +00:00
Bill Yi 2a860c3f6f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 30ffb5b971 -s ours am: 12b6d0039d -s ours am: 540e743c73 -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: Ib455c9821373cbb833b4ae30fb12f0095bd431d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-05 22:02:05 +00:00
Treehugger Robot a45731f37c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 9051147ca3 -s ours am: 0d9425506b -s ours am: 961d1c1561 -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: Ic335abb63c8f52d8f5c521c31ef77691085f0c5e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-05 22:02:00 +00:00
Bill Yi dab2d77d36 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ec2f0cdff0 -s ours am: 4aa543087f -s ours am: 9306294269 -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: I1049beb70dc5c50f9fe8ef4912e3a502acf889cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-05 22:01:54 +00:00
Bill Yi 7b51031cf6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 88720f7810 -s ours am: c364678343 -s ours am: 7c2a21d392 -s ours am: a887c61943 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3a798b29d444944da6efc415ae36d3f0b1b2a8ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-05 21:58:59 +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