Commit Graph
78507 Commits
Author SHA1 Message Date
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
TreeHugger Robot 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
Jonathan Miranda 7a582f2d7d Merge "Update colors for non-v31 devices." into sc-dev 2021-06-26 00:09:59 +00:00
TreeHugger Robot e9d8df54ab Merge "Improving hierarchy dump for test failure" into sc-dev 2021-06-25 23:55:42 +00:00
TreeHugger Robot 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
TreeHugger Robot 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
TreeHugger Robot 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
Jonathan Miranda 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
TreeHugger Robot ad6cdf7bef Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-06-25 23:03:22 +00:00
Jonathan Miranda 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
Jonathan Miranda 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
Sunny Goyal 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
Jonathan Miranda 48dbfcd1c8 Merge "Fix folder icon text alignment." into sc-dev 2021-06-25 22:31:46 +00:00
zakcohen 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
TreeHugger Robot 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
TreeHugger Robot 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
TreeHugger Robot 284482a040 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2021-06-25 20:02:46 +00:00
Sunny Goyal 420ba54dee Improving hierarchy dump for test failure
Bug: 192003777
Test: Manual
Change-Id: I3223a14cd88beddd76ecae0ae37c6fdce0752bef
2021-06-25 12:41:51 -07:00
Tracy Zhou 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
Tracy Zhou 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
Tracy Zhou 0785671ceb 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: I6268548f20cd19204b9016e5fa8406738d52c658
2021-06-25 19:27:44 +00:00
Tracy Zhou 540723bd05 Merge "Wallpaper and non-app targets are not necessary" into sc-dev 2021-06-25 19:11:57 +00:00
Schneider Victor-tulias 9617332f60 Remove expensive logging.
Removed expensive logs added for debugging. Removed unused code.

Fixes: 168788486
Test: none
Change-Id: I0579275633361d2d67399c773e6376af74c9f1b1
2021-06-25 11:48:15 -07:00
Vadim Tryshev 324ecf9f91 Merge "Postponing CUJ start by 1 frame" into sc-dev am: e70e6a3b0b am: 841e8c56d6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15096971

Change-Id: Ic6b8afd15635b5dd30a5f1285855c17c3b5e09dc
2021-06-25 18:36:22 +00:00
Vadim Tryshev 841e8c56d6 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: I36b5757716c0d326cda42877149a8e13726233a5
2021-06-25 18:21:47 +00:00
Vadim Tryshev 5877fc876a 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: Ieef68819c6fb2ff2f96f256818a2b38bbfe7dce3
2021-06-25 18:21:21 +00:00
Vadim Tryshev e70e6a3b0b Merge "Postponing CUJ start by 1 frame" into sc-dev 2021-06-25 17:56:34 +00:00
Jon Miranda 2be425b6b0 Fix folder icon text alignment.
- We set the parent view padding to be cellYPadding, so we no longer need to
  account for it when setting the text LayoutParams.

Bug: 191954558
Test: grid where scalableGrid=true and scalableGrid=false (4x5, and 5x5)
Change-Id: I8d7578b2589f801ceef229b663446d868d135ad0
2021-06-25 10:33:20 -07:00
Hilary Huo cf5b9ac423 Merge "[settings-pixel-search] Flag guard slice logging." into sc-dev am: 7a5a96ea73 am: dd57c2eff7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15084513

Change-Id: I9b6ffeb550208be4f0423b9889e1d0f32282898b
2021-06-25 17:31:59 +00:00
Yogisha Dixit 3893eefe75 resolve merge conflicts of 1491ec31c5 to sc-v2-dev
Test: manual
Bug: 192076258
Change-Id: I44e02383cd8ce386811e24a1c4fd6ce62e38f90f
2021-06-25 17:23:22 +00:00