Commit Graph

58436 Commits

Author SHA1 Message Date
Yogisha Dixit 0fca930ec3 Merge "resolve merge conflicts of 1491ec31c5 to sc-v2-dev" into sc-v2-dev am: 79d95df59d am: ee61dbb13a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15111790

Change-Id: I68cf65e2264ec4715b698edc1d8459e138af82c6
2021-06-26 15:30:52 +00:00
TreeHugger Robot fa505670b0 Merge "Enabling screen record for some flaky tests" into sc-dev am: 5c6d7c3a1f am: ca97d699d1 am: 56073c3f6e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15112968

Change-Id: Ibc5b39506884a3b062716ddde0a52c683046e3af
2021-06-26 15:30:05 +00:00
Jonathan Miranda 2a84ebe1f4 Merge "Update colors for non-v31 devices." into sc-dev am: 7a582f2d7d am: 99843fde0d am: 3b33ac1cbf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15096360

Change-Id: Ieffa7142c62e2a56bea9a61ca50d0859ba1d0cb7
2021-06-26 15:29:56 +00:00
TreeHugger Robot 7f0753ac9c Merge "Improving hierarchy dump for test failure" into sc-dev am: e9d8df54ab am: af357f13cd am: 473fa7a34e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15097672

Change-Id: I95bb07bdbb74c17422282c00210cdb44412df66a
2021-06-26 15:29:51 +00:00
TreeHugger Robot 8e5aa1e4c0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: ad6cdf7bef -s ours am: 3cf073ea66 -s ours am: 19f63397fc -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0948c36b207e16bcf64eeb2def239429db5be1f8
2021-06-26 15:29:44 +00:00
Jonathan Miranda 725d0e564a Merge "Fix folder icon text alignment." into sc-dev am: 48dbfcd1c8 am: 66e6d991df am: 0b52655aa6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15111651

Change-Id: I3b908334fb8c95d157a29494e831c50cf0e5ede3
2021-06-26 15:29:38 +00:00
Tracy Zhou 85ab4bae28 Merge "Wallpaper and non-app targets are not necessary" into sc-dev am: 540723bd05 am: 0785671ceb am: 89b0a538b4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15085898

Change-Id: Id803513b1cb5c59c38ed3d97a797b9286ee00705
2021-06-26 15:29:31 +00:00
Vadim Tryshev 1b4a94628d Merge "Postponing CUJ start by 1 frame" into sc-dev am: e70e6a3b0b am: 5877fc876a am: 7fd5a1d160
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15096971

Change-Id: I76212045cb0c9d4eba4ca4debd350c92fdee8c30
2021-06-26 15:29:20 +00:00
TreeHugger Robot d92b53e338 Merge "Enabling screen record for some flaky tests" into sc-dev am: 5c6d7c3a1f am: 9f867ac8b6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15112968

Change-Id: Icaf555c0f139e009000a0507d3016fce695ba49f
2021-06-26 15:27:30 +00:00
Jonathan Miranda 376a6c035e Merge "Update colors for non-v31 devices." into sc-dev am: 7a582f2d7d am: 9f113f76fa
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15096360

Change-Id: I87af122bfe1519fed27887c910113095ea38d5e5
2021-06-26 15:27:23 +00:00
TreeHugger Robot ed22c1905c Merge "Improving hierarchy dump for test failure" into sc-dev am: e9d8df54ab am: 8c15da0654
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15097672

Change-Id: I1135b78015f8d00b2d5566874b3b7d4ed50e6838
2021-06-26 15:27:19 +00:00
TreeHugger Robot 05fcfbf2c4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: ad6cdf7bef -s ours am: ccafbfff0a -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ica33261df29ab1287b049cd928b0e4ca7d00d33b
2021-06-26 15:27:15 +00:00
Jonathan Miranda 62f7efe5f5 Merge "Fix folder icon text alignment." into sc-dev am: 48dbfcd1c8 am: ca670425a8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15111651

Change-Id: I0aa97d0ca4b0fec265a6ef9d6da5f70123f38f66
2021-06-26 15:27:11 +00:00
Tracy Zhou 8d4cbc479c Merge "Wallpaper and non-app targets are not necessary" into sc-dev am: 540723bd05 am: 10966ba3de
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15085898

Change-Id: Ib15ae84df3b9fb30ba172ee281849b5ee78e6720
2021-06-26 15:27:07 +00:00
Vadim Tryshev 9a66880257 Merge "Postponing CUJ start by 1 frame" into sc-dev am: e70e6a3b0b am: e3f02c4de6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15096971

Change-Id: I5db60734e2924b4cfca23e0cb808ac7028273e2a
2021-06-26 15:26:58 +00:00
Hilary Huo bfb83873d0 Merge "[settings-pixel-search] Flag guard slice logging." into sc-dev am: 7a5a96ea73 am: 40a75363a1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15084513

Change-Id: Ifbd7a78e42bc8a8fa0d43e602f5b03afa1872bd6
2021-06-26 15:26:53 +00:00
Yogisha Dixit ee61dbb13a Merge "resolve merge conflicts of 1491ec31c5 to sc-v2-dev" into sc-v2-dev am: 79d95df59d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15111790

Change-Id: Iee5a7b774c705f82e13e65839c30a576b1cc21b8
2021-06-26 15:26:46 +00:00
Hilary Huo 75f6ed8155 Merge "[settings-pixel-search] Flag guard slice logging." into sc-dev am: 7a5a96ea73 am: 894c29b60d am: add0ede55c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15084513

Change-Id: I5d9eb8bcf4f6fdcb330a09f79ada7ad3cdd3e67e
2021-06-26 15:26:39 +00:00
Yogisha Dixit 432299d1ff Merge "resolve merge conflicts of a2e4c36d1c to sc-v2-dev-plus-aosp" into sc-v2-dev-plus-aosp am: 35205c1636
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15107821

Change-Id: I63f2d1672ffb37bdcc9b2f598e0c681d32c9e484
2021-06-26 15:26:27 +00:00
TreeHugger Robot 9f867ac8b6 Merge "Enabling screen record for some flaky tests" into sc-dev am: 5c6d7c3a1f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15112968

Change-Id: I188875721529cbb36fd5ae37fb304953125802fc
2021-06-26 15:10:36 +00:00
TreeHugger Robot 56073c3f6e Merge "Enabling screen record for some flaky tests" into sc-dev am: 5c6d7c3a1f am: ca97d699d1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15112968

Change-Id: I0528a86b492af67873b3f783ed4c6ccba503751c
2021-06-26 15:10:29 +00:00
Jonathan Miranda 9f113f76fa Merge "Update colors for non-v31 devices." into sc-dev am: 7a582f2d7d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15096360

Change-Id: Ib926073532c53a4db19e9930ade8c9efd776796d
2021-06-26 15:10:27 +00:00
Jonathan Miranda 3b33ac1cbf Merge "Update colors for non-v31 devices." into sc-dev am: 7a582f2d7d am: 99843fde0d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15096360

Change-Id: I7ed1807bcacf7e593bc753dbecafa4402f4159d6
2021-06-26 15:10:23 +00:00
TreeHugger Robot 8c15da0654 Merge "Improving hierarchy dump for test failure" into sc-dev am: e9d8df54ab
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15097672

Change-Id: I3de22c6313d83b991dd880c5520a3e1ecfe0999b
2021-06-26 15:10:22 +00:00
TreeHugger Robot 473fa7a34e Merge "Improving hierarchy dump for test failure" into sc-dev am: e9d8df54ab am: af357f13cd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15097672

Change-Id: I60c2383c2e00578301c24c425b2df8a297fc3dc5
2021-06-26 15:10:19 +00:00
TreeHugger Robot ccafbfff0a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: ad6cdf7bef -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7b4e76741c5bc1e14102d0470c58297c59937dcb
2021-06-26 15:10:18 +00:00
TreeHugger Robot 19f63397fc [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: ad6cdf7bef -s ours am: 3cf073ea66 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I945bbbc1d0da4f3b452ce7e3392dacc7ddeec042
2021-06-26 15:10:15 +00:00
Jonathan Miranda ca670425a8 Merge "Fix folder icon text alignment." into sc-dev am: 48dbfcd1c8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15111651

Change-Id: I17cf64b9aa733dbe045626d66b287cbe085edbf5
2021-06-26 15:10:14 +00:00
Jonathan Miranda 0b52655aa6 Merge "Fix folder icon text alignment." into sc-dev am: 48dbfcd1c8 am: 66e6d991df
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15111651

Change-Id: I62991969bea1db6c0166955c3225de9eb7c89c7b
2021-06-26 15:10:11 +00:00
Tracy Zhou 10966ba3de Merge "Wallpaper and non-app targets are not necessary" into sc-dev am: 540723bd05
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15085898

Change-Id: Iea021cdcc976f3ebf1b9160b833ba0bd3e4e8b5d
2021-06-26 15:10:09 +00:00
Tracy Zhou 89b0a538b4 Merge "Wallpaper and non-app targets are not necessary" into sc-dev am: 540723bd05 am: 0785671ceb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15085898

Change-Id: I8882e5517ba1939e04f351d3b20383cc6c3498a2
2021-06-26 15:10:07 +00:00
Vadim Tryshev e3f02c4de6 Merge "Postponing CUJ start by 1 frame" into sc-dev am: e70e6a3b0b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15096971

Change-Id: Iaedc20bb98781ad97b8f72e064cb47e77e7f2975
2021-06-26 15:10:04 +00:00
Vadim Tryshev 7fd5a1d160 Merge "Postponing CUJ start by 1 frame" into sc-dev am: e70e6a3b0b am: 5877fc876a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15096971

Change-Id: Ia63b51c06983c06e851ea36c414b5c3e32e35a6c
2021-06-26 15:10:01 +00:00
Hilary Huo 40a75363a1 Merge "[settings-pixel-search] Flag guard slice logging." into sc-dev am: 7a5a96ea73
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15084513

Change-Id: Id2f7128634bfe31987e9822426bf786b007f16de
2021-06-26 15:09:52 +00:00
Hilary Huo add0ede55c Merge "[settings-pixel-search] Flag guard slice logging." into sc-dev am: 7a5a96ea73 am: 894c29b60d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15084513

Change-Id: I219ccecb50259d62699baaa6afae1a423a4bc787
2021-06-26 15:09:51 +00:00
Yogisha Dixit 35205c1636 Merge "resolve merge conflicts of a2e4c36d1c to sc-v2-dev-plus-aosp" into sc-v2-dev-plus-aosp 2021-06-26 15:09:11 +00:00
Yogisha Dixit 79d95df59d Merge "resolve merge conflicts of 1491ec31c5 to sc-v2-dev" into sc-v2-dev 2021-06-26 15:08:10 +00:00
Android Build Coastguard Worker 36c2fc6b89 Snap for 7495556 from 0bbdee8c6e to tm-release
Change-Id: Ifd45a4d249448ea4f2abf9d58373bb2a1d49faf0
2021-06-26 05:08:04 +00:00
Bill Yi 06b7b3ead2 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-06-26 04:09:44 +00:00
Android Build Coastguard Worker 2c22ffaf92 Snap for 7495312 from 284482a040 to sc-v2-release
Change-Id: I98bb60fc0f34128b42ff722056819539faacce0e
2021-06-26 03:08:50 +00:00
Android Build Coastguard Worker d5b9458ea7 Snap for 7495277 from ad6cdf7bef to sc-release
Change-Id: I99fbbc68346d32bf107b5531aa9bfe6b40d7413d
2021-06-26 03:08:13 +00:00
TreeHugger Robot 564c761bf4 Merge "Enabling screen record for some flaky tests" into sc-dev am: 5c6d7c3a1f am: 35c15d5bd6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15112968

Change-Id: I2901329b33fecbe936302ed9ee1362c941dbfbe8
2021-06-26 00:56:23 +00:00
TreeHugger Robot ca97d699d1 Merge "Enabling screen record for some flaky tests" into sc-dev am: 5c6d7c3a1f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15112968

Change-Id: Ib9553e91694901153b9f5cb5a7f4a8be05d3a306
2021-06-26 00:45:23 +00:00
TreeHugger Robot 35c15d5bd6 Merge "Enabling screen record for some flaky tests" into sc-dev am: 5c6d7c3a1f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15112968

Change-Id: I4c1c7379048473b80f80d59e816c6bd76a4c059e
2021-06-26 00:45:22 +00:00
TreeHugger Robot 5c6d7c3a1f Merge "Enabling screen record for some flaky tests" into sc-dev 2021-06-26 00:33:05 +00:00
Jonathan Miranda 0bbdee8c6e Merge "Update colors for non-v31 devices." into sc-dev am: 7a582f2d7d am: 5714fe9f72
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15096360

Change-Id: Icb235e7ce6c8566440d5117261628c4ab0509c6d
2021-06-26 00:23:19 +00:00
TreeHugger Robot 4dd3f19359 Merge "Improving hierarchy dump for test failure" into sc-dev am: e9d8df54ab am: 521c0f7621
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15097672

Change-Id: I5cd83fa2690e4747edc26800b33b47dcc90ab848
2021-06-26 00:23:04 +00:00
Jonathan Miranda 5714fe9f72 Merge "Update colors for non-v31 devices." into sc-dev am: 7a582f2d7d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15096360

Change-Id: I285ea2085317a954032471d40e5ef1a3e126c24f
2021-06-26 00:12:06 +00:00
TreeHugger Robot 521c0f7621 Merge "Improving hierarchy dump for test failure" into sc-dev am: e9d8df54ab
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15097672

Change-Id: Iab21e52fe134940075ba99e16b1d7132791870f2
2021-06-26 00:12:01 +00:00
Jonathan Miranda 99843fde0d Merge "Update colors for non-v31 devices." into sc-dev am: 7a582f2d7d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15096360

Change-Id: I37b193bc69d2c36177785f9a2c244f7260a0b434
2021-06-26 00:11:14 +00:00