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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
79d95df59d
Merge "resolve merge conflicts of 1491ec31c5 to sc-v2-dev" into sc-v2-dev
2021-06-26 15:08:10 +00:00
06b7b3ead2
Merge "Import translations. DO NOT MERGE ANYWHERE"
2021-06-26 04:09:44 +00:00
2c22ffaf92
Snap for 7495312 from 284482a040 to sc-v2-release
...
Change-Id: I98bb60fc0f34128b42ff722056819539faacce0e
2021-06-26 03:08:50 +00:00
d5b9458ea7
Snap for 7495277 from ad6cdf7bef to sc-release
...
Change-Id: I99fbbc68346d32bf107b5531aa9bfe6b40d7413d
2021-06-26 03:08:13 +00:00
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
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
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
5c6d7c3a1f
Merge "Enabling screen record for some flaky tests" into sc-dev
2021-06-26 00:33:05 +00:00
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
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
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
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
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
af357f13cd
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: I8bd0b9412faaac8f14c66f920ca20ed99f1da86a
2021-06-26 00:11:09 +00:00
7a582f2d7d
Merge "Update colors for non-v31 devices." into sc-dev
2021-06-26 00:09:59 +00:00
e9d8df54ab
Merge "Improving hierarchy dump for test failure" into sc-dev
2021-06-25 23:55:42 +00:00
2cca80485a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: ad6cdf7bef -s ours am: f1079a4142 -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: I7bb946f76b8c9c7fc5cb1ae237ff84f17b8fe6fa
2021-06-25 23:33:00 +00:00
3cf073ea66
[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: I77d92fefd4f0fa9a6f3b5e559a2071ada7e86b4e
2021-06-25 23:16:58 +00:00
f1079a4142
[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: Ic95f6d7a1a87ac4095c6d84f6dd0d23442f318c0
2021-06-25 23:16:55 +00:00
40d823397e
Merge "Fix folder icon text alignment." into sc-dev am: 48dbfcd1c8 am: e75d07cff9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15111651
Change-Id: I7406da39c9a8535a34082905be7a313bf54aae01
2021-06-25 23:12:13 +00:00
ad6cdf7bef
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-06-25 23:03:22 +00:00
e75d07cff9
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: Ia14c006e30628d5557785128756ee60101c0d073
2021-06-25 22:44:57 +00:00
66e6d991df
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: I81d0163155d57a2e37064f3317dedd1b2839c064
2021-06-25 22:44:34 +00:00
85a84e52cc
Enabling screen record for some flaky tests
...
Bug: 187080582
Bug: 192005114
Bug: 192018189
Bug: 192010616
Test: Manual
Change-Id: I32fc0e4c9848c4def1aa6254139579bc631862cc
2021-06-25 15:40:55 -07:00
48dbfcd1c8
Merge "Fix folder icon text alignment." into sc-dev
2021-06-25 22:31:46 +00:00
ef252d85ad
Make OverviewActions tests more robust, wait for enabled
...
Wait for buttons to be enabled before trying to click on them.
Bug: 192006530
Test: TaplTestQuickstep
Change-Id: I80e050dcd93b8aae195677f2cd1fed3b53682581
2021-06-25 15:28:38 -07:00
5b1e6f21e1
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 284482a040 -s ours am: d0b2d95129 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15109692
Change-Id: Ie005e29512546dfba94cf79218e0d0b07f8bbed9
2021-06-25 20:34:04 +00:00
d0b2d95129
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 284482a040 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15109692
Change-Id: I96c6ba0f3206367951d8074b660def4f4da6c332
2021-06-25 20:15:30 +00:00
284482a040
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev
2021-06-25 20:02:46 +00:00
420ba54dee
Improving hierarchy dump for test failure
...
Bug: 192003777
Test: Manual
Change-Id: I3223a14cd88beddd76ecae0ae37c6fdce0752bef
2021-06-25 12:41:51 -07:00
7bfde1b635
Merge "Wallpaper and non-app targets are not necessary" into sc-dev am: 540723bd05 am: 5157fc7750
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15085898
Change-Id: I6e37a9bf294f49acc08397bc5fd6f210727505a1
2021-06-25 19:38:07 +00:00
5157fc7750
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: I2edc7d49688a9b29490c4777524e48248bc8071e
2021-06-25 19:27:52 +00:00
Yogisha Dixit
TreeHugger Robot
Jonathan Miranda
Tracy Zhou
Vadim Tryshev
Hilary Huo
Bill Yi
Android Build Coastguard Worker
Sunny Goyal
zakcohen