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
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
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
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
5c6d7c3a1f
Merge "Enabling screen record for some flaky tests" into sc-dev
2021-06-26 00:33:05 +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
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
ad6cdf7bef
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-06-25 23:03:22 +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
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
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
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
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
Yogisha Dixit
0cc33ba984
resolve merge conflicts of a2e4c36d1c to sc-v2-dev-plus-aosp
...
Change-Id: Icedf6f4eeaa095e8bd013448a6d0e1157a3c0605
2021-06-25 17:18:13 +00:00
Tracy Zhou
936f06e02c
Wallpaper and non-app targets are not necessary
...
Fixes: 191773356
Test: Swipe up to overview, launch another app, and make sure it works
Change-Id: I3f71d90687e18f38ddb17876bf7c56861bc61932
2021-06-25 10:17:50 -07:00
Hilary Huo
894c29b60d
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: I3a4ece927061416e4139ce0c982eb27827a88dc6
2021-06-25 17:11:28 +00:00
Hilary Huo
7a5a96ea73
Merge "[settings-pixel-search] Flag guard slice logging." into sc-dev
2021-06-25 16:54:59 +00:00
Steven Ng
c9ad90b2ec
Merge "Extra logging related to widget removal upon restore" into sc-dev am: 408a73ea76 am: 0d4e57d4f0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15098572
Change-Id: I41f72589fdc83823e36ed5f7ef32745403602291
2021-06-25 16:33:50 +00:00
TreeHugger Robot
3d2415c34b
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 4c979388e2 -s ours am: d7cdd6a9f0 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15098014
Change-Id: I014b50d222d6a8a020b1afe8b771e5b3d4f05c45
2021-06-25 16:33:46 +00:00
TreeHugger Robot
26834af77e
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 00e3efc034 -s ours am: 44ec29405a -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15098012
Change-Id: I754df3c2702762ce5b5a6d3b7c84429005bce6df
2021-06-25 16:33:42 +00:00