Commit Graph

59208 Commits

Author SHA1 Message Date
Bill Yi 46bbf50d77 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3f4d577e24 -s ours am: 89a768b1a3 -s ours am: b181190b2c -s ours am: 1a35a43380 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Icec29efb45162b991e7dce8f7e250f55beea009a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-01 13:31:49 +00:00
Bill Yi 1a35a43380 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3f4d577e24 -s ours am: 89a768b1a3 -s ours am: b181190b2c -s ours
am skip reason: subject contains skip directive

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

Change-Id: I721569230363f10132388cf92b66472c3f9371c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-01 13:18:00 +00:00
Bill Yi b181190b2c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3f4d577e24 -s ours am: 89a768b1a3 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5b15adffb55e45054716e2ffd290ecfe43dd52bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-01 13:04:51 +00:00
Alex Chau a96c37d079 Merge "Skip updateIconAlphaForHome if Taskbar is already destroyed" into tm-qpr-dev am: 81b1d3576a am: 694a0a8685 am: 5a21a787f5 am: 4552227013
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21610408

Change-Id: Ie718b97627de5ff9ead74846b0eedbb1b9dbcd03
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-01 00:02:17 +00:00
Alex Chau 38fd9b8d01 Merge "Skip updateIconAlphaForHome if Taskbar is already destroyed" into tm-qpr-dev am: 81b1d3576a am: 694a0a8685 am: 5a21a787f5 am: 2743249385
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21610408

Change-Id: Ie65a7e1553388c06c53eac8b3eb09aa2bac7ee05
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-28 23:27:26 +00:00
Anushree Ganjam 286a4392fa Merge "Add logging for EDUCARD resultType." into tm-qpr-dev am: 409b17eee4 am: 2fbffbad9f am: 888b6f997f am: 25ef575e01
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21620428

Change-Id: Ie1aad53197aa324588c35e3540c8125231895829
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-28 23:25:45 +00:00
Alex Chau 2743249385 Merge "Skip updateIconAlphaForHome if Taskbar is already destroyed" into tm-qpr-dev am: 81b1d3576a am: 694a0a8685 am: 5a21a787f5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21610408

Change-Id: I6fd2679b99d08072a62eb94515f84fda917ffa1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-28 23:24:18 +00:00
Alex Chau 4552227013 Merge "Skip updateIconAlphaForHome if Taskbar is already destroyed" into tm-qpr-dev am: 81b1d3576a am: 694a0a8685 am: 5a21a787f5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21610408

Change-Id: I05bcac709c5cf50677a20c15b4a696c34645b0c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-28 23:23:49 +00:00
Anushree Ganjam 71173f2512 Merge "Add logging for EDUCARD resultType." into tm-qpr-dev am: 409b17eee4 am: 2fbffbad9f am: 888b6f997f am: 3e5da7f5aa
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21620428

Change-Id: I301d4931b7b40f395173c23d284d1dd727679f1c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-28 23:05:41 +00:00
Alex Chau 5a21a787f5 Merge "Skip updateIconAlphaForHome if Taskbar is already destroyed" into tm-qpr-dev am: 81b1d3576a am: 694a0a8685
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21610408

Change-Id: I18e4e859134652a81b370e2af77ba40016ed881a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-28 22:43:03 +00:00
Bill Yi 89a768b1a3 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3f4d577e24 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I111fde18f26cec433e5e1f767915b2ddf659fa2a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-28 22:34:25 +00:00
Anushree Ganjam 3e5da7f5aa Merge "Add logging for EDUCARD resultType." into tm-qpr-dev am: 409b17eee4 am: 2fbffbad9f am: 888b6f997f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21620428

Change-Id: Ic34679904bdddfb2eb19255dfb5a75794690dfe6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-28 22:28:27 +00:00
Anushree Ganjam 25ef575e01 Merge "Add logging for EDUCARD resultType." into tm-qpr-dev am: 409b17eee4 am: 2fbffbad9f am: 888b6f997f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21620428

Change-Id: I79b7d3ccd251aa1ee371f08ddba315e9ccbad5f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-28 22:13:44 +00:00
Sunny Goyal 665c4c5316 [automerger skipped] Merge "Moving flag creation to a separate file" into tm-qpr-dev am: 1297f400bc am: e7fe6b57ff -s ours am: 4036e44501 -s ours am: 01efaa449d -s ours
am skip reason: Merged-In I31014e397690379024d2e42c0e913ce806b9569c with SHA-1 749983b192 is already in history

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

Change-Id: I4a5ada4356cc2672d7457f6e5126583ece39b136
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-28 22:03:32 +00:00
Sunny Goyal f14317e059 [automerger skipped] Merge "Moving flag creation to a separate file" into tm-qpr-dev am: 1297f400bc am: e7fe6b57ff -s ours am: 4036e44501 -s ours am: 9bc24fd509 -s ours
am skip reason: Merged-In I31014e397690379024d2e42c0e913ce806b9569c with SHA-1 749983b192 is already in history

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

Change-Id: I4dc056b3f02ecf4ba644c78c231251d55b4635c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-28 22:02:17 +00:00
Alex Chau 694a0a8685 Merge "Skip updateIconAlphaForHome if Taskbar is already destroyed" into tm-qpr-dev am: 81b1d3576a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21610408

Change-Id: I35d9bcf444bd9fb8b5ac5223f5579e0eb0901a03
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-28 22:02:13 +00:00
Sunny Goyal 9bc24fd509 [automerger skipped] Merge "Moving flag creation to a separate file" into tm-qpr-dev am: 1297f400bc am: e7fe6b57ff -s ours am: 4036e44501 -s ours
am skip reason: Merged-In I31014e397690379024d2e42c0e913ce806b9569c with SHA-1 749983b192 is already in history

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

Change-Id: I6339740cae7a38acf4d6caf00cc4f2b5a13283a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-28 21:42:31 +00:00
Anushree Ganjam 888b6f997f Merge "Add logging for EDUCARD resultType." into tm-qpr-dev am: 409b17eee4 am: 2fbffbad9f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21620428

Change-Id: Ib47ea0a08fdb5f523bfd263255de0795117d2680
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-28 21:40:42 +00:00
Sunny Goyal 01efaa449d [automerger skipped] Merge "Moving flag creation to a separate file" into tm-qpr-dev am: 1297f400bc am: e7fe6b57ff -s ours am: 4036e44501 -s ours
am skip reason: Merged-In I31014e397690379024d2e42c0e913ce806b9569c with SHA-1 749983b192 is already in history

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

Change-Id: Ic345dd4ac13dfb285ed37d20e4b6c0527bf3793d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-28 21:24:03 +00:00
Alex Chau 81b1d3576a Merge "Skip updateIconAlphaForHome if Taskbar is already destroyed" into tm-qpr-dev 2023-02-28 21:23:53 +00:00
Anushree Ganjam 2fbffbad9f Merge "Add logging for EDUCARD resultType." into tm-qpr-dev am: 409b17eee4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21620428

Change-Id: Ifcff2926479aa14217337a060224855937e029bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-28 21:05:15 +00:00
Sunny Goyal da6abc49ef Merge "Moving flag creation to a separate file" into udc-dev am: 11c8b4f594 am: 151ff90196
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21616343

Change-Id: I218efc8abc2e67909306eb79c5b189afd4cb2a32
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-28 21:05:00 +00:00
Anushree Ganjam 409b17eee4 Merge "Add logging for EDUCARD resultType." into tm-qpr-dev 2023-02-28 20:10:07 +00:00
Sunny Goyal 4036e44501 [automerger skipped] Merge "Moving flag creation to a separate file" into tm-qpr-dev am: 1297f400bc am: e7fe6b57ff -s ours
am skip reason: Merged-In I31014e397690379024d2e42c0e913ce806b9569c with SHA-1 749983b192 is already in history

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

Change-Id: I7b5f574ae406f033c3cc87292ad971d25958ac4e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-28 20:06:14 +00:00
Sunny Goyal 499224564e Merge "Moving flag creation to a separate file" into udc-dev am: 11c8b4f594 am: 2b4cd6d648
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21616343

Change-Id: Ieb5e4931145754c70a3dcf7f65a0f7661c6e6b22
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-28 20:05:39 +00:00
Sunny Goyal e7fe6b57ff Merge "Moving flag creation to a separate file" into tm-qpr-dev am: 1297f400bc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21586607

Change-Id: I0b50d9286e8abab8b3d5f54853f8bfc74141cbb4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-28 19:48:41 +00:00
Sunny Goyal 151ff90196 Merge "Moving flag creation to a separate file" into udc-dev am: 11c8b4f594
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21616343

Change-Id: I2cd4f0543afdf55b6c842da52f35fb491fa337b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-28 19:47:03 +00:00
Sunny Goyal 2b4cd6d648 Merge "Moving flag creation to a separate file" into udc-dev am: 11c8b4f594
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21616343

Change-Id: I072cf00a902e00381f3156750687d27a8f2a4ce3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-28 19:28:23 +00:00
Sunny Goyal 1297f400bc Merge "Moving flag creation to a separate file" into tm-qpr-dev 2023-02-28 19:18:25 +00:00
Sunny Goyal 98204add71 Moving flag creation to a separate file
> This provides better control over proguarding descriptions
> Enforcing bug number in flag creation

Bug: 270386012
Test: Presubmit and verified on device
Change-Id: I31014e397690379024d2e42c0e913ce806b9569c
Merged-In: I31014e397690379024d2e42c0e913ce806b9569c
2023-02-28 18:05:42 +00:00
Alex Chau 7fee161cd5 Skip updateIconAlphaForHome if Taskbar is already destroyed
Bug: 269409332
Test: Switch display with and without Tasxkbar at home and in-app, Taskbar and Hotseat visibility are correct
Change-Id: I598f618c336067bf795b77ccdf3b03f420634047
2023-02-28 12:46:50 +00:00
Sunny Goyal 11c8b4f594 Merge "Moving flag creation to a separate file" into udc-dev 2023-02-28 07:36:20 +00:00
Automerger Merge Worker 232fa978fb Merge changes from topic "am-02ca89497ccd460783f07fce969ccfaa"
* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: eadf7a67bf -s ours am: 946ed114c4 -s ours am: 52a32467e7 -s ours am: 4a8efe5727 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 96fbc57162 -s ours am: 080b719694 -s ours am: e5675c4e23 -s ours am: 4b725b02b7 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: e1e12ea5dd -s ours am: d40129a0d0 -s ours am: 59fd638447 -s ours am: a5cf2c3295 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 80b5644087 -s ours am: d2026fc4ed -s ours am: a37a043ee5 -s ours am: b57cc660ed -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9650b930e2 -s ours am: 7079a3301f -s ours am: 45aad39e96 -s ours am: fb4135fcba -s ours
2023-02-28 01:29:09 +00:00
TreeHugger Robot bbfb55889d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: eadf7a67bf -s ours am: 946ed114c4 -s ours am: 52a32467e7 -s ours am: 4a8efe5727 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5b9a1b39b1e77930a4ff07e1ee45856d18471dc1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-28 01:28:52 +00:00
Bill Yi 2d154c73b8 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 96fbc57162 -s ours am: 080b719694 -s ours am: e5675c4e23 -s ours am: 4b725b02b7 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I14eb5f41e3b2379f898118b21334a058d4e1c883
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-28 01:28:49 +00:00
TreeHugger Robot 61077a5313 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: e1e12ea5dd -s ours am: d40129a0d0 -s ours am: 59fd638447 -s ours am: a5cf2c3295 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8f76d85a7d03d33b5401f5bcfd80d47b178e7ec7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-28 01:28:41 +00:00
Bill Yi 6916aa87a9 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 80b5644087 -s ours am: d2026fc4ed -s ours am: a37a043ee5 -s ours am: b57cc660ed -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2b50274a6d0ef84333a7a98b3bbc3d2c205bb494
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-28 01:28:27 +00:00
Bill Yi d2bb445d6a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9650b930e2 -s ours am: 7079a3301f -s ours am: 45aad39e96 -s ours am: fb4135fcba -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia3b2fc25bd5759512728131890a2e33d94db0ce6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-28 01:28:06 +00:00
TreeHugger Robot 05f8ee8062 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: eadf7a67bf -s ours am: 946ed114c4 -s ours am: 52a32467e7 -s ours am: 99f4c3f2a0 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib5ae429ff02d29ff90a38dc00549a05bbde5fa54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-28 01:27:45 +00:00
Bill Yi 834034fb28 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 96fbc57162 -s ours am: 080b719694 -s ours am: e5675c4e23 -s ours am: d58aa17829 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I418fdb306e7f3aaeb1f007aec820f08585ee04c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-28 01:27:38 +00:00
TreeHugger Robot 0c1cef7dc0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: e1e12ea5dd -s ours am: d40129a0d0 -s ours am: 59fd638447 -s ours am: c2107bae91 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I54e7f30b238df008e5b56a9159cd50de4c24e7a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-28 01:27:29 +00:00
Bill Yi 54b72a4b7e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 80b5644087 -s ours am: d2026fc4ed -s ours am: a37a043ee5 -s ours am: 95722515a2 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9d7587168b4d2416852e9c508e374281694683fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-28 01:27:14 +00:00
Bill Yi adaa2736d5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9650b930e2 -s ours am: 7079a3301f -s ours am: 45aad39e96 -s ours am: 4415edbac0 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I19ccffec45a01eaab76256985b78eeee57ffaefa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-28 01:26:51 +00:00
TreeHugger Robot 4a8efe5727 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: eadf7a67bf -s ours am: 946ed114c4 -s ours am: 52a32467e7 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6a252939e7a7684a780561081b198a413ddfa173
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-28 00:51:17 +00:00
TreeHugger Robot 99f4c3f2a0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: eadf7a67bf -s ours am: 946ed114c4 -s ours am: 52a32467e7 -s ours
am skip reason: subject contains skip directive

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

Change-Id: If3868396dee54f30c0990eb2be7e0cd2523710af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-28 00:51:13 +00:00
Bill Yi 4b725b02b7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 96fbc57162 -s ours am: 080b719694 -s ours am: e5675c4e23 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9c914c8c4d965bfd62c1a825998fcf0e18f08050
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-28 00:51:09 +00:00
Bill Yi d58aa17829 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 96fbc57162 -s ours am: 080b719694 -s ours am: e5675c4e23 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id7a9ae7e155979346cb11aee4298dc91fa3ed297
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-28 00:51:09 +00:00
TreeHugger Robot a5cf2c3295 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: e1e12ea5dd -s ours am: d40129a0d0 -s ours am: 59fd638447 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0777686a512b52cf3850e1dceec0e24fd34e3d3b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-28 00:51:04 +00:00
TreeHugger Robot c2107bae91 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: e1e12ea5dd -s ours am: d40129a0d0 -s ours am: 59fd638447 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic7b51bec7854ae55f25c687cb6acce37422cf00f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-28 00:51:00 +00:00
Bill Yi b57cc660ed [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 80b5644087 -s ours am: d2026fc4ed -s ours am: a37a043ee5 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ide6f3780b37f49a9dc4960895f3917d6002928d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-28 00:50:49 +00:00