Commit Graph

39922 Commits

Author SHA1 Message Date
Treehugger Robot bf8a2429ea [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 70689199c1 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I540ce3429cb4b1b86b8554a08677679c932b05e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 19:09:06 +00:00
Bill Yi 30e5748993 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8e8ad70206 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4b22c04a2936c1115fc95490f1673e42fe04cffd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 19:09:00 +00:00
Treehugger Robot 0cd951ea1e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: fd1fae4277 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I060b05118dabe323e379a0a62b8445ec2f110d2d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 19:08:53 +00:00
Bill Yi a1ba8d0b9f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2b81886af7 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I89cc026c8d8ebcf0e211054a04524c796ac194c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 19:08:38 +00:00
Treehugger Robot f82012ed90 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: d8768464a2 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5dd7923b187b2875761f4f1e62118dd722aa5212
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 19:08:23 +00:00
Bill Yi cff899118a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d2989bc50c -s ours
am skip reason: subject contains skip directive

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

Change-Id: I612cc8e7e358b9eb2b81ac635a94d25e0e3597ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 19:08:12 +00:00
TreeHugger Robot 836dbca092 Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2022-06-06 18:42:20 +00:00
TreeHugger Robot 451d752a1f Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2022-06-06 18:41:04 +00:00
Treehugger Robot 70689199c1 Merge "Import translations. DO NOT MERGE ANYWHERE" 2022-06-06 18:29:34 +00:00
Treehugger Robot fd1fae4277 Merge "Import translations. DO NOT MERGE ANYWHERE" 2022-06-06 18:29:34 +00:00
Treehugger Robot d8768464a2 Merge "Import translations. DO NOT MERGE ANYWHERE" 2022-06-06 18:29:34 +00:00
Bill Yi 8e8ad70206 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I55830e2459bc3d1c8eed84bcc96ab8f856b10530
2022-06-05 17:12:12 -07:00
Bill Yi 2b81886af7 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I6af2022983eea02c62b33fc4b1a0d39fe9911ec8
2022-06-05 17:11:27 -07:00
Bill Yi d2989bc50c Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I39bbd2c49268c2f578398d45cec234a0fcdebc61
2022-06-05 17:10:55 -07:00
Bill Yi a31959e9de Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Id0b1f8f1a27bdcb908b419275b41436d955a5280
2022-06-05 17:09:16 -07:00
Bill Yi 5e76968615 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I5cf8d6d60a6eee17404ceb312cc68eaaca27e5c1
2022-06-05 17:08:31 -07:00
Bill Yi 13797b3952 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I44c9b7ba60e6908b2c044ae6a46fbcb794b2bde3
2022-06-05 17:07:58 -07:00
Xin Li f688b04eab Merge sc-v2-dev-plus-aosp-without-vendor@8433047
Bug: 226662282
Merged-In: I310e7924c7767b24b697fc96a098b37db4cf1216
Change-Id: I8bd98ceff90846a20679bfb6c55b37c1765fd13b
2022-04-18 21:01:08 +00:00
Bill Yi 5976b9813c [automerger skipped] Merge "Merge SP2A.220405.004 to aosp-master - DO NOT MERGE" am: e7c175c92a -s ours am: 17561f2af1 -s ours
am skip reason: Merged-In Ic3e8c89ef9571af2b88516911f0fe1238a2eb847 with SHA-1 e24db03da4 is already in history

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

Change-Id: I41f86251536e6bdf4c1960d816eb4e82c31b9a44
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 19:14:48 +00:00
Bill Yi 3ebae8de95 [automerger skipped] Merge SP2A.220405.004 to aosp-master - DO NOT MERGE am: 7c68785b02 -s ours am: b613e0f43d -s ours
am skip reason: Merged-In Ic3e8c89ef9571af2b88516911f0fe1238a2eb847 with SHA-1 e24db03da4 is already in history

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

Change-Id: I9bef565dceafeb2d96208f07db8824f5b81f7c32
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 19:14:32 +00:00
Bill Yi 17561f2af1 [automerger skipped] Merge "Merge SP2A.220405.004 to aosp-master - DO NOT MERGE" am: e7c175c92a -s ours
am skip reason: Merged-In Ic3e8c89ef9571af2b88516911f0fe1238a2eb847 with SHA-1 e24db03da4 is already in history

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

Change-Id: Ibc08dff78d69d650aef6e1d8ed51a1f5a851bbf7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 18:31:40 +00:00
Bill Yi b613e0f43d [automerger skipped] Merge SP2A.220405.004 to aosp-master - DO NOT MERGE am: 7c68785b02 -s ours
am skip reason: Merged-In Ic3e8c89ef9571af2b88516911f0fe1238a2eb847 with SHA-1 e24db03da4 is already in history

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

Change-Id: Ib471841e6f9a72588df776293ceda24b90f8581a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 18:31:21 +00:00
Bill Yi e7c175c92a Merge "Merge SP2A.220405.004 to aosp-master - DO NOT MERGE" 2022-04-08 18:08:24 +00:00
TreeHugger Robot 82ad998d6d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: b01524ff6f -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8664625e40cdb087a0e5c989bdeb3631c636f967
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 16:39:53 +00:00
Bill Yi 5f94b389e5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e9903f38db -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib4b7ef64b4cec0ac012406f7b2c24c14474c0c8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 16:39:52 +00:00
Bill Yi 480a9b7d15 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b891ee715f -s ours
am skip reason: subject contains skip directive

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

Change-Id: I10d84e7fb533e3bf7e9f5a7b7e80057b8b9e587d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 16:38:10 +00:00
TreeHugger Robot b01524ff6f Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2022-04-08 16:24:38 +00:00
Bill Yi 7c68785b02 Merge SP2A.220405.004 to aosp-master - DO NOT MERGE
Merged-In: Ic3e8c89ef9571af2b88516911f0fe1238a2eb847
Merged-In: I3d3f56108117d0b8b8e97e8463ea6e2b64a80cb5
Change-Id: Ie464199869ae378a3a2ce66f5ced5db46ac6ad8d
2022-04-07 18:41:00 -07:00
Bill Yi b891ee715f Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I310e7924c7767b24b697fc96a098b37db4cf1216
2022-04-05 21:24:55 +00:00
Bill Yi e9903f38db Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I079f72f6b183f11535e77f03ab6a3f9c0bf1da93
2022-04-05 21:23:51 +00:00
Xin Li 1eff2959d1 [automerger skipped] Merge Android 12 QPR3 ab/8391262 am: e24db03da4 -s ours
am skip reason: Merged-In Ifdaf4928e7f1f0da5deb7dd44a6b89f5f08cdf2c with SHA-1 bd2860f039 is already in history

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

Change-Id: I3d3f56108117d0b8b8e97e8463ea6e2b64a80cb5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-03 07:11:35 +00:00
Xin Li e24db03da4 Merge Android 12 QPR3 ab/8391262
Bug: 226662282
Merged-In: Ifdaf4928e7f1f0da5deb7dd44a6b89f5f08cdf2c
Change-Id: Ic3e8c89ef9571af2b88516911f0fe1238a2eb847
2022-04-01 20:32:44 +00:00
Tony Wickham 274a88a949 [RESTRICT AUTOMERGE] Ignore taskbar system gesture inset on Launcher am: 864f8d45b8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17512165

Change-Id: I40829c772de9b898af060180fb12da6363c978a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-31 23:33:42 +00:00
Tony Wickham 864f8d45b8 [RESTRICT AUTOMERGE] Ignore taskbar system gesture inset on Launcher
- Also have Taskbar report itself as MANDATORY_GESTURE_INSETS

Test: Able to drag bottom workspace items
Bug: 205493938
Change-Id: I014991b1cc6dbd66fa275a7766304ebd92171328
2022-03-30 23:57:16 +00:00
Treehugger Robot bd2860f039 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 2477e8540d -s ours am: 8d101a4975 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ifdaf4928e7f1f0da5deb7dd44a6b89f5f08cdf2c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-28 07:23:08 +00:00
Bill Yi fc6e2e59c3 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 87d2f0d38a -s ours am: a48be8cdb6 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7f320128af64faadb983e6280d2b9b280e80874c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-28 07:23:07 +00:00
Treehugger Robot f3935537fa [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: e4f54186d0 -s ours am: d47ba10b2e -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ibd44c1ddc94c4595a9116e6418825e3b68e0a2e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-28 07:21:53 +00:00
Bill Yi 85ba92caa8 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 30e9301222 -s ours am: a44be61244 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Icc9550795b1a07e7ef2d7439c31f1ca2ef572d51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-28 07:21:52 +00:00
Treehugger Robot 69e1565ec0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: cbb52a0553 -s ours am: 0b545de4ff -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7859287effd166884ca79418ed8f98bab78d7d58
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-28 07:17:23 +00:00
Bill Yi 586137531f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4a39289296 -s ours am: 59b68fedf8 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie8ad816c17a424a9a3f5876cadb29f4d229d6341
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-28 07:17:22 +00:00
Treehugger Robot 8d101a4975 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 2477e8540d -s ours
am skip reason: subject contains skip directive

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

Change-Id: I85c19444c8d1b057173455db02bd519193e3ee1c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-28 07:04:05 +00:00
Bill Yi a48be8cdb6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 87d2f0d38a -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic076538d689000589e213929936691a4c992c685
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-28 07:04:04 +00:00
Treehugger Robot d47ba10b2e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: e4f54186d0 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I28a3012bb578a73d9c0496ff289d81ca0272a575
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-28 07:03:46 +00:00
Bill Yi a44be61244 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 30e9301222 -s ours
am skip reason: subject contains skip directive

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

Change-Id: If2273dc9763f628283d5806abd16635a785baa9e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-28 07:03:45 +00:00
Treehugger Robot 0b545de4ff [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: cbb52a0553 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I729bb11b63832805b1589461cc09d5b22168bfc5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-28 07:01:01 +00:00
Bill Yi 59b68fedf8 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4a39289296 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3f7aa7b31e8d309768f96c8874a2168f253c1034
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-28 07:00:59 +00:00
TreeHugger Robot 86627586b2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: e199dfaf47 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I73f52831ceba608ab5f29175bd4fd71bfb38d3ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-28 06:55:30 +00:00
Bill Yi 609b9fed35 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1fba444664 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1451535aa6bed986046eee21fef0ffd060a62878
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-28 06:55:28 +00:00
TreeHugger Robot d5b5be48cc [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: c53b90fcf9 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2bcbac2a0ca9666da9cdc362a5e0a5b1d88e7cb5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-28 06:51:19 +00:00
Bill Yi a27a229049 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a3c6ff41f9 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I38fbc26b71c54a3d68639463aba4d3221802e707
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-28 06:51:17 +00:00