Commit Graph

64776 Commits

Author SHA1 Message Date
Treehugger Robot 174fff0bcb Merge "Add themed work badge for themed icons in dragview or floatingiconview" into udc-qpr-dev am: d2d1942b27
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23786528

Change-Id: I6fa18fc1ecf2b8c269ff7db517118c7bef360096
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-27 17:30:35 +00:00
Treehugger Robot d2d1942b27 Merge "Add themed work badge for themed icons in dragview or floatingiconview" into udc-qpr-dev 2023-06-27 16:42:25 +00:00
Anvesh Renikindi 3481712f48 [automerger skipped] Merge "Update renamed util function M3HCTToColor in launcher code" into udc-dev-plus-aosp am: d8af5abcfd am: d15a76629b -s ours
am skip reason: Merged-In If4c6783472d7fa05a1162e2f176a613d28f7bec3 with SHA-1 04be6e6874 is already in history

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

Change-Id: I3846088b78e864c2a03fa3a9d7252468b0de53e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-27 16:27:07 +00:00
Anvesh Renikindi d15a76629b Merge "Update renamed util function M3HCTToColor in launcher code" into udc-dev-plus-aosp am: d8af5abcfd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23813693

Change-Id: I53dd898d0443dc1c596bec5ac475d73c28abced2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-27 15:52:57 +00:00
Anvesh Renikindi d8af5abcfd Merge "Update renamed util function M3HCTToColor in launcher code" into udc-dev-plus-aosp 2023-06-27 14:54:49 +00:00
TreeHugger Robot 4756250431 Merge "Restore strong reference to animation runner" into udc-dev am: 1f3c56af5b am: 0093120979 am: 0f900df04d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23793397

Change-Id: Ief30a6575bfd2300a10c35169cca9919f2ff733c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-27 07:36:45 +00:00
TreeHugger Robot 8bc913ca7c Merge "Restore strong reference to animation runner" into udc-dev am: 1f3c56af5b am: 7733c11623 am: ba78d5c19f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23793397

Change-Id: I5a4fd5fdd3648a5194b47f6751a8f3f595eff3d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-27 07:34:41 +00:00
Xin Li dec444a604 [automerger skipped] Merge "Merge Android 13 QPR3" am: fb950e94a1 -s ours am: 50ae1841f2 -s ours am: d875edea67 -s ours am: 4621b9a393 -s ours am: 32616d4cbe -s ours
am skip reason: Merged-In Icab60e7658d7e8be74d86eccbc74b386b25ae92d with SHA-1 361f9d6085 is already in history

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

Change-Id: I131ea687ef75d710cd1ec5e9dad0a6b6ab2287fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-27 07:27:25 +00:00
Xin Li 472d9dd8f5 [automerger skipped] Merge Android 13 QPR3 am: d0e76db392 -s ours am: 929d988f81 -s ours am: 9c36d14a59 -s ours am: f7ed632631 -s ours am: e30400ac15 -s ours
am skip reason: Merged-In Icab60e7658d7e8be74d86eccbc74b386b25ae92d with SHA-1 361f9d6085 is already in history

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

Change-Id: I17b92a92237a94437c0217a492e89c3549137e47
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-27 07:25:44 +00:00
Winson Chung 77ce55727d Merge "Fix NPE due to invalid RecentsView access" into udc-dev am: fa3434fc37 am: 24fe986f33 am: b0d4374d5a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23810649

Change-Id: I124a31c276547e8ee816829ac6535f0131cbbf48
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-27 05:59:16 +00:00
TreeHugger Robot c872783415 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: d3e37bf03d -s ours am: ded3800457 -s ours am: 609278b3da -s ours
am skip reason: subject contains skip directive

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

Change-Id: I994d0edf38e85f4292416fc9d02d45874921bd97
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-27 05:58:31 +00:00
Bill Yi febad604da [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d6b0605005 -s ours am: ed2a94892b -s ours am: 00efeb87a0 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I41b66d5e05fb94d6fa5c3b16cecb2563adf55521
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-27 05:58:19 +00:00
TreeHugger Robot b972cf66f0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 1e49227a09 -s ours am: ad423d74dc -s ours am: a1b1a5ce20 -s ours am: 90f62acd8a -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ifc9d93a5a8de94f061d6da7c7c1416aeeaa223c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-27 05:57:28 +00:00
Bill Yi 8a9146332f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c1d2c6e41d -s ours am: 5d6de6ce8d -s ours am: 3228111f8c -s ours am: e3a46c078f -s ours
am skip reason: subject contains skip directive

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

Change-Id: I493952690e09f7e26cfb65341f4581fc7ec009a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-27 05:57:15 +00:00
Bill Yi ad889a09fa [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6caeb0e5f5 -s ours am: 88c422d04a -s ours am: 17bfcb5623 -s ours am: d61b025bbb -s ours
am skip reason: subject contains skip directive

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

Change-Id: I12d4fc0084a656200b7f2e7aaadc7a19ca51df2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-27 05:56:22 +00:00
TreeHugger Robot bb96bfdcfa Merge "Restore strong reference to animation runner" into udc-dev am: 1f3c56af5b am: 7733c11623 am: 796c3bbd02
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23793397

Change-Id: I5271737bd92ddabdf19dcc8d48e769f84f715b9e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-27 04:42:53 +00:00
TreeHugger Robot 0f900df04d Merge "Restore strong reference to animation runner" into udc-dev am: 1f3c56af5b am: 0093120979
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23793397

Change-Id: I2f9493ee7d2aa30a0a9476ed326f66fb95d21f08
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-27 03:55:36 +00:00
TreeHugger Robot 796c3bbd02 Merge "Restore strong reference to animation runner" into udc-dev am: 1f3c56af5b am: 7733c11623
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23793397

Change-Id: I5f485e204fa56b319f250a467eb448622be9f01f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-27 03:54:56 +00:00
TreeHugger Robot ba78d5c19f Merge "Restore strong reference to animation runner" into udc-dev am: 1f3c56af5b am: 7733c11623
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23793397

Change-Id: Idacab10522770903c5f5932842964f7b0077c5f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-27 03:50:41 +00:00
TreeHugger Robot 0093120979 Merge "Restore strong reference to animation runner" into udc-dev am: 1f3c56af5b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23793397

Change-Id: Ibc13e029b1d318f501e1cc787f2ee7724b686538
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-27 03:05:09 +00:00
TreeHugger Robot 7733c11623 Merge "Restore strong reference to animation runner" into udc-dev am: 1f3c56af5b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23793397

Change-Id: I5faa06a4742cbe4edc6bc3c4819807ac7e99af80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-27 03:04:07 +00:00
TreeHugger Robot 1f3c56af5b Merge "Restore strong reference to animation runner" into udc-dev 2023-06-27 02:13:00 +00:00
Randy Pfohl 72c638fb9c Merge "Updating content description for accessibility no matter the state" into udc-qpr-dev am: 2310a890c2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23815319

Change-Id: I94f66b0347354edde1ac42218faa72ae3b6c5b13
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-27 01:57:23 +00:00
TreeHugger Robot 78e78c9ef9 Merge "Add logs to determine if grid positions incorrect" into udc-qpr-dev am: f382308ca8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23795939

Change-Id: Ie412d228e0dcdcc11381915058ddd109e6066b0b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-27 01:56:09 +00:00
Xin Li 32616d4cbe [automerger skipped] Merge "Merge Android 13 QPR3" am: fb950e94a1 -s ours am: 50ae1841f2 -s ours am: d875edea67 -s ours am: 4621b9a393 -s ours
am skip reason: Merged-In Icab60e7658d7e8be74d86eccbc74b386b25ae92d with SHA-1 361f9d6085 is already in history

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

Change-Id: Ie4da0e9004c3621bcdb6c898dd3865a1610860d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-27 01:15:45 +00:00
Xin Li e30400ac15 [automerger skipped] Merge Android 13 QPR3 am: d0e76db392 -s ours am: 929d988f81 -s ours am: 9c36d14a59 -s ours am: f7ed632631 -s ours
am skip reason: Merged-In Icab60e7658d7e8be74d86eccbc74b386b25ae92d with SHA-1 361f9d6085 is already in history

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

Change-Id: I3274a9cdfc2adeee21f343da8f022b666a930edd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-27 01:14:06 +00:00
Randy Pfohl 2310a890c2 Merge "Updating content description for accessibility no matter the state" into udc-qpr-dev 2023-06-27 01:13:53 +00:00
TreeHugger Robot f382308ca8 Merge "Add logs to determine if grid positions incorrect" into udc-qpr-dev 2023-06-27 01:02:59 +00:00
Xin Li 4621b9a393 [automerger skipped] Merge "Merge Android 13 QPR3" am: fb950e94a1 -s ours am: 50ae1841f2 -s ours am: d875edea67 -s ours
am skip reason: Merged-In Icab60e7658d7e8be74d86eccbc74b386b25ae92d with SHA-1 361f9d6085 is already in history

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

Change-Id: I439400edd629e150d81c66132a84d63bc253185a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-27 00:34:15 +00:00
Xin Li f7ed632631 [automerger skipped] Merge Android 13 QPR3 am: d0e76db392 -s ours am: 929d988f81 -s ours am: 9c36d14a59 -s ours
am skip reason: Merged-In Icab60e7658d7e8be74d86eccbc74b386b25ae92d with SHA-1 361f9d6085 is already in history

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

Change-Id: I3c1880fa7f1e95e86383660fd8f46d55e74ee9c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-27 00:32:35 +00:00
Winson Chung 6cfe2e6cbe Restore strong reference to animation runner
- The remote animation factory needs to be strongly referenced since
  the only other reference is a weakly held one from
  LauncherAnimationRunner, and if a gc happens in between starting
  the animation and the onAnimationStart() callback, then the
  animation will not play.

Fixes: 284106887
Test: Force a gc after creating a remote app launch animation and ensure
      that the runner still exists when the animation starts

Change-Id: I5f584451b41c666916801b8ea0cb470c7ab9fc51
2023-06-26 23:55:23 +00:00
TreeHugger Robot d158a29b0a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 1e49227a09 -s ours am: b337b2fef6 -s ours am: 5debc67da1 -s ours am: 7fbec4ff19 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I159edcb88f82cc9ee377343de77f265f970b042d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-26 23:44:01 +00:00
Bill Yi be8ad6cfda [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c1d2c6e41d -s ours am: 00a238ceb0 -s ours am: 90b1d38500 -s ours am: bee73a9649 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5c395336a9e503c23c028c2036d6db99a419ae86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-26 23:43:48 +00:00
Bill Yi 6f0b96b524 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6caeb0e5f5 -s ours am: 6583add9fc -s ours am: 6d04e6109e -s ours am: b22fea66ac -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id4625791ba68d10017002d68f39d30dba1053f1e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-26 23:42:06 +00:00
Winson Chung b0d4374d5a Merge "Fix NPE due to invalid RecentsView access" into udc-dev am: fa3434fc37 am: 24fe986f33
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23810649

Change-Id: I4aa73cb25d597610a9849cff0dc313b51bcb17d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-26 23:40:34 +00:00
TreeHugger Robot 609278b3da [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: d3e37bf03d -s ours am: ded3800457 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I579ca0cfa98b858174b2309330632b33fc3e99a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-26 23:34:26 +00:00
Bill Yi 00efeb87a0 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d6b0605005 -s ours am: ed2a94892b -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia177921d4834636ad1d95ba33653e2ec26c79f9b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-26 23:34:12 +00:00
TreeHugger Robot 90f62acd8a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 1e49227a09 -s ours am: ad423d74dc -s ours am: a1b1a5ce20 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0b4f764a3b7d93c3f64e7040d87fafd2fd1f4ba4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-26 23:33:26 +00:00
Bill Yi e3a46c078f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c1d2c6e41d -s ours am: 5d6de6ce8d -s ours am: 3228111f8c -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id735d1e04cc0726a8ded6463453250777cf80972
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-26 23:33:15 +00:00
Bill Yi d61b025bbb [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6caeb0e5f5 -s ours am: 88c422d04a -s ours am: 17bfcb5623 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4d224a631562a42ae2af8484e12e623a93deb970
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-26 23:32:41 +00:00
Holly Jiuyu Sun 06d06b38e3 Merge "[a11y] Add FLAG_NOT_PINNABLE and modify supportAddToWorkSpace." into udc-d1-dev am: 926057fd18 am: 0232719b41
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23814528

Change-Id: Ib4255bc7bd51a91c938549a1d162d18376f8d3f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-26 23:32:06 +00:00
Xin Li d875edea67 [automerger skipped] Merge "Merge Android 13 QPR3" am: fb950e94a1 -s ours am: 50ae1841f2 -s ours
am skip reason: Merged-In Icab60e7658d7e8be74d86eccbc74b386b25ae92d with SHA-1 361f9d6085 is already in history

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

Change-Id: I9b3bfe3165c6cc9d2024546142d2e9804087fbec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-26 23:12:12 +00:00
Xin Li 9c36d14a59 [automerger skipped] Merge Android 13 QPR3 am: d0e76db392 -s ours am: 929d988f81 -s ours
am skip reason: Merged-In Icab60e7658d7e8be74d86eccbc74b386b25ae92d with SHA-1 361f9d6085 is already in history

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

Change-Id: I6f2e1f334154b6c132be6f280039897776af915f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-26 23:10:27 +00:00
Holly Jiuyu Sun a0c448c742 Merge "[a11y] Add FLAG_NOT_PINNABLE and modify supportAddToWorkSpace." into udc-d1-dev am: 926057fd18 am: 65d7ccd153
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23814528

Change-Id: I8d58049a4f8fcd015d430415dbf89c39a26adc0e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-26 23:08:43 +00:00
TreeHugger Robot 7fbec4ff19 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 1e49227a09 -s ours am: b337b2fef6 -s ours am: 5debc67da1 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic9a1f31191c754620c9aebb2fc49159290c43d62
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-26 23:02:22 +00:00
Bill Yi bee73a9649 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c1d2c6e41d -s ours am: 00a238ceb0 -s ours am: 90b1d38500 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1d875c5803051cadba65f16c5299c124f780d9b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-26 23:02:08 +00:00
Bill Yi b22fea66ac [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6caeb0e5f5 -s ours am: 6583add9fc -s ours am: 6d04e6109e -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic61312b9b99e0a46ca3b160a581f21d85272ec01
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-26 23:00:59 +00:00
Xin Li 50ae1841f2 [automerger skipped] Merge "Merge Android 13 QPR3" am: fb950e94a1 -s ours
am skip reason: Merged-In Icab60e7658d7e8be74d86eccbc74b386b25ae92d with SHA-1 361f9d6085 is already in history

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

Change-Id: Iacf60dd176391f8e0dd5adfa31f5b009e69c8fc5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-26 22:59:22 +00:00
Xin Li 929d988f81 [automerger skipped] Merge Android 13 QPR3 am: d0e76db392 -s ours
am skip reason: Merged-In Icab60e7658d7e8be74d86eccbc74b386b25ae92d with SHA-1 361f9d6085 is already in history

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

Change-Id: I2ac3c95e65005bf4554bb10fb029eb9c0b2f082a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-26 22:57:42 +00:00
Holly Jiuyu Sun 65d7ccd153 Merge "[a11y] Add FLAG_NOT_PINNABLE and modify supportAddToWorkSpace." into udc-d1-dev am: 926057fd18
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23814528

Change-Id: Idbb918c4926f54a44bc861d1ebb9fa17082bd6fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-26 22:41:19 +00:00