Commit Graph

49925 Commits

Author SHA1 Message Date
Automerger Merge Worker 48390fa1da Merge "Merge "Consolidate isTablet logic across Launcher and SysUI" into sc-v2-dev am: cc1e94a982" into sc-v2-dev-plus-aosp 2021-09-24 17:27:16 +00:00
TreeHugger Robot ccea2a117f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 3eecc1b472 -s ours am: 6c51a64514 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ibfe39c8f4e410598824605641bba85c4a7aadff3
2021-09-24 17:27:09 +00:00
Bill Yi aab810843d Merge changes from topic "presubmit-am-be485105f9b444559d3c27e9898a99c9" into sc-qpr1-dev am: ccd543980b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15904417

Change-Id: I0f547a3a63415415ff5100436df64a43b56e819d
2021-09-24 17:27:07 +00:00
Bill Yi 9d5adb3f81 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: aefa1b2863 am: 90df8bcbea -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib4f11bf6aa2ef1980b11481c30cd7f4dba6600c5
2021-09-24 17:27:06 +00:00
Bill Yi baa5aeb5b0 Merge changes from topic "presubmit-am-9e19ef3aeac3461da35856b896c7b70d" into sc-qpr1-dev am: 0d65dda435 am: 604fc43e6b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15904652

Change-Id: I159b1f1706820770c946ad95a1457ce214845a81
2021-09-24 17:27:05 +00:00
Bill Yi a676124c54 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: fcc30d82cf am: a0156079b4 -s ours am: 3990946801 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I28a8ce478ef026b02a323bb7a13e7079f07837ce
2021-09-24 17:27:05 +00:00
Tracy Zhou 39fc729912 Merge "Consolidate isTablet logic across Launcher and SysUI" into sc-v2-dev am: cc1e94a982
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15898421

Change-Id: I0634c4df4d7ccad9862f934c5fa2e09922c51209
2021-09-24 17:27:03 +00:00
Bill Yi 678565d40d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 6eef820c0e -s ours am: b82efa0892 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I54f691b8583471db01e0794ca88a4ffdda4772cc
2021-09-24 17:27:00 +00:00
Bill Yi 281b55a3c5 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: fcc30d82cf am: 571c76c883 -s ours am: 03b68f1f91 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ifa662358137ba733ddefc625c75503f1fb5c4614
2021-09-24 17:26:48 +00:00
Bill Yi c8c4b55141 Merge changes from topic "presubmit-am-be485105f9b444559d3c27e9898a99c9" into sc-qpr1-dev am: ccd543980b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15904417

Change-Id: If57f095b14f62c88507cef011296a78c91c50b65
2021-09-24 17:26:37 +00:00
Bill Yi 5e2aabd48a [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: aefa1b2863 am: 90df8bcbea -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5beed8cc8844c23d08255df381406bc2a962c6ee
2021-09-24 17:26:37 +00:00
Bill Yi 3d1a04c942 Merge changes from topic "presubmit-am-be485105f9b444559d3c27e9898a99c9" into sc-dev-plus-aosp am: 08713c8ad5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15904417

Change-Id: If95a347ec16bc25a979ee319ca6f3a18f292e97f
2021-09-24 17:26:29 +00:00
Bill Yi 793576c4e7 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: aefa1b2863 am: 9a9262e69e -s ours
am skip reason: subject contains skip directive

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

Change-Id: If3a4ef08fab1c65d74f6966aef685b849de305e8
2021-09-24 17:26:28 +00:00
Bill Yi 604fc43e6b Merge changes from topic "presubmit-am-9e19ef3aeac3461da35856b896c7b70d" into sc-qpr1-dev am: 0d65dda435
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15904652

Change-Id: I0b73dc335e4c3259fcae95fd1359b00b4455d37d
2021-09-24 17:26:23 +00:00
Bill Yi 3990946801 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: fcc30d82cf am: a0156079b4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5e818f802c7dc263e504863c775f7aa64440d10c
2021-09-24 17:26:22 +00:00
TreeHugger Robot 46f4dbf413 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 5ea00b5796 -s ours am: 5fac11e4cb -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie9a28118ad5e968603fda947286b7f191a9c7c8e
2021-09-24 17:26:19 +00:00
Bill Yi 938c48478e Merge changes from topic "presubmit-am-9e19ef3aeac3461da35856b896c7b70d" into sc-qpr1-dev am: 0d65dda435
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15904652

Change-Id: Iafc9b53d702370b19dd6884bcae8122461bd6bab
2021-09-24 17:26:17 +00:00
Bill Yi 0538ffe1ba [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: fcc30d82cf am: a0156079b4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0dbd67fef8969cd4cc36461e726f7b78b7cae76e
2021-09-24 17:26:17 +00:00
Bill Yi b82efa0892 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 6eef820c0e -s ours
am skip reason: subject contains skip directive

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

Change-Id: I17d7a81ce77b28d75b85ecdfdcaba84ab31179cd
2021-09-24 17:26:08 +00:00
Bill Yi 03b68f1f91 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: fcc30d82cf am: 571c76c883 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib7292e15dc22d6db7bb18063bb1c42196000cbf8
2021-09-24 17:25:56 +00:00
Bill Yi 87796822bb [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 6eef820c0e -s ours am: cde036d1c3 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3aab52a7e83816dd3d44f7fbc6e2ccbdbbf012ec
2021-09-24 17:25:49 +00:00
Bill Yi 22060a34a3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 6eef820c0e -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id69d09471337fb7e0f05376bbd56acb63ba59abe
2021-09-24 17:25:38 +00:00
Bill Yi f1e17d73cb Merge changes from topic "presubmit-am-be485105f9b444559d3c27e9898a99c9" into sc-mainline-prod am: 6a1c47ab1a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15904417

Change-Id: I3ad22b0d58179e275a8b61d48d2fe13b777c7712
2021-09-24 17:25:37 +00:00
TreeHugger Robot 811f0054c6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: adc7b4fbf5 -s ours am: 619b15c097 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I214a2af061eb02fd8a1730851f22baeb6aa69c95
2021-09-24 17:25:18 +00:00
Bill Yi cde036d1c3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 6eef820c0e -s ours
am skip reason: subject contains skip directive

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

Change-Id: I66e903429bbf665c5fc24d7ba1c4a6b703f7868e
2021-09-24 17:25:16 +00:00
Vinit Nayak f2907c6ce3 Merge "Hide split options for focused task." into sc-v2-dev 2021-09-24 17:18:02 +00:00
Miranda Kephart 2aa6ab95bf Merge "Standardize screenshot naming scheme" 2021-09-24 17:16:51 +00:00
Tracy Zhou cc1e94a982 Merge "Consolidate isTablet logic across Launcher and SysUI" into sc-v2-dev 2021-09-24 17:16:41 +00:00
Bill Yi 6eef820c0e Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-09-24 17:11:41 +00:00
Bill Yi ccd543980b Merge changes from topic "presubmit-am-be485105f9b444559d3c27e9898a99c9" into sc-qpr1-dev
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: aefa1b2863
  Import translations. DO NOT MERGE ANYWHERE
2021-09-24 17:11:41 +00:00
Bill Yi 08713c8ad5 Merge changes from topic "presubmit-am-be485105f9b444559d3c27e9898a99c9" into sc-dev-plus-aosp
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: aefa1b2863
  Import translations. DO NOT MERGE ANYWHERE
2021-09-24 17:11:41 +00:00
Bill Yi 6a1c47ab1a Merge changes from topic "presubmit-am-be485105f9b444559d3c27e9898a99c9" into sc-mainline-prod
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: aefa1b2863
  Import translations. DO NOT MERGE ANYWHERE
2021-09-24 17:11:41 +00:00
Bill Yi 08d6309368 Merge changes from topic "presubmit-am-be485105f9b444559d3c27e9898a99c9"
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: aefa1b2863 2p: c87d8841ed
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: aefa1b2863
  Import translations. DO NOT MERGE ANYWHERE
2021-09-24 17:11:41 +00:00
Bill Yi 0d65dda435 Merge changes from topic "presubmit-am-9e19ef3aeac3461da35856b896c7b70d" into sc-qpr1-dev
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: fcc30d82cf
  Import translations. DO NOT MERGE ANYWHERE
2021-09-24 17:10:27 +00:00
Bill Yi 393d5f066b Merge changes from topic "presubmit-am-9e19ef3aeac3461da35856b896c7b70d"
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: fcc30d82cf 2p: 417376005c
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: fcc30d82cf
  Import translations. DO NOT MERGE ANYWHERE
2021-09-24 17:10:27 +00:00
TreeHugger Robot f8fda296f1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 5ea00b5796 -s ours am: f20bc6a1b6 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9dcb003cc68367e3dc6358a9d6200b0f77eacdbd
2021-09-24 17:02:28 +00:00
TreeHugger Robot ced08eff5d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: adc7b4fbf5 -s ours am: ebe02e2835 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I91f51a50c85b8563aa7f19585d2497f408ab6bd2
2021-09-24 17:02:24 +00:00
TreeHugger Robot 6aae5d5e31 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 0cefad626b -s ours
am skip reason: subject contains skip directive

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

Change-Id: I17bc5dd75546ac6f217c67d5414e359b15845cf8
2021-09-24 17:02:20 +00:00
TreeHugger Robot 5fac11e4cb [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 5ea00b5796 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie10b145a8c2c8c2f8332180640676d36b6164334
2021-09-24 17:02:11 +00:00
TreeHugger Robot f20bc6a1b6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 5ea00b5796 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5fcbfd2e87926ef30fab82f4c9cace1baf516cf3
2021-09-24 17:01:54 +00:00
TreeHugger Robot e9f75034f8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 34f90af89d -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ifa43a544067be66301975e585e58828824cc031d
2021-09-24 17:01:35 +00:00
TreeHugger Robot ebe02e2835 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: adc7b4fbf5 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I96853f37a68e78264e3e8c11a73328442243ae49
2021-09-24 17:01:25 +00:00
TreeHugger Robot 619b15c097 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: adc7b4fbf5 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ied9ff3f23ea10033938946e3e07bed1d5b6db74e
2021-09-24 17:01:16 +00:00
TreeHugger Robot 6c51a64514 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 3eecc1b472 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5d64a7eec32e8654e3217dabdccc9953363bf80e
2021-09-24 17:00:53 +00:00
TreeHugger Robot 3a42851c71 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-09-24 16:51:27 +00:00
TreeHugger Robot 0cefad626b Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2021-09-24 16:50:35 +00:00
TreeHugger Robot 59434c9677 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-09-24 16:47:38 +00:00
TreeHugger Robot 34f90af89d Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2021-09-24 16:45:38 +00:00
TreeHugger Robot 3eecc1b472 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2021-09-24 16:45:36 +00:00
TreeHugger Robot 5ea00b5796 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev 2021-09-24 16:44:49 +00:00