Commit Graph

34503 Commits

Author SHA1 Message Date
Hyunyoung Song cbab278489 Merge "When KEYCODE_BACK is received, hide keyboard" into sc-dev am: 24c8ebd88d am: 5d52dc0201
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15107283

Change-Id: I220fbd2740df73b15805300767b0c1a7bf3617d8
2021-06-26 20:33:01 +00:00
Hyunyoung Song 5d52dc0201 Merge "When KEYCODE_BACK is received, hide keyboard" into sc-dev am: 24c8ebd88d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15107283

Change-Id: I53d61df02679024e2362e8e63a02de37b0bbe95a
2021-06-26 20:24:11 +00:00
Hyunyoung Song 24c8ebd88d Merge "When KEYCODE_BACK is received, hide keyboard" into sc-dev 2021-06-26 20:08:55 +00:00
Alina Zaidi b51073fa0f Merge "Compare maxSpanSize for WidgetsListContentEntries when updating visible entries in widget picker." into sc-dev am: 50401e31bd am: b06e92fc83
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15052492

Change-Id: I7a71757f1273737620c0db54931c93f85da80208
2021-06-26 18:22:37 +00:00
Alina Zaidi 2ce9d6f786 Merge "Compare maxSpanSize for WidgetsListContentEntries when updating visible entries in widget picker." into sc-dev am: 50401e31bd am: 391c66260d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15052492

Change-Id: I1a3df4718a9264e52026832d50316d1a98cf7630
2021-06-26 18:22:28 +00:00
Alina Zaidi 8b3230690e Merge "Remove scrim from navigation bar from full widget picker." into sc-dev am: 57cdcceb07 am: b4692ada93
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15095782

Change-Id: I9bfe3dff6598606bdc85b02636f048955ecc6855
2021-06-26 18:22:16 +00:00
Alina Zaidi 21c0fa7db3 Merge "Remove scrim from navigation bar from full widget picker." into sc-dev am: 57cdcceb07 am: de30ace4db
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15095782

Change-Id: Ie0752fa2e27dbf78e5ae5477a13dc1bcf91a9fb0
2021-06-26 18:21:57 +00:00
Alina Zaidi b06e92fc83 Merge "Compare maxSpanSize for WidgetsListContentEntries when updating visible entries in widget picker." into sc-dev am: 50401e31bd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15052492

Change-Id: Id36a1ed53de7fc45cb8f7f9fc2f295f23ca3643d
2021-06-26 18:13:24 +00:00
Alina Zaidi de30ace4db Merge "Remove scrim from navigation bar from full widget picker." into sc-dev am: 57cdcceb07
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15095782

Change-Id: Ia60f26b7a13c8404ad26701c824921ae8da5ec37
2021-06-26 18:13:14 +00:00
Alina Zaidi 391c66260d Merge "Compare maxSpanSize for WidgetsListContentEntries when updating visible entries in widget picker." into sc-dev am: 50401e31bd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15052492

Change-Id: I635a6dfdf2c9d26952c26ac75b4e9f625f6209c1
2021-06-26 18:12:56 +00:00
Alina Zaidi b4692ada93 Merge "Remove scrim from navigation bar from full widget picker." into sc-dev am: 57cdcceb07
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15095782

Change-Id: I9f744f9986fc330e9ffc10c2b321114e3f142300
2021-06-26 18:12:44 +00:00
Alina Zaidi 50401e31bd Merge "Compare maxSpanSize for WidgetsListContentEntries when updating visible entries in widget picker." into sc-dev 2021-06-26 18:04:19 +00:00
Alina Zaidi 57cdcceb07 Merge "Remove scrim from navigation bar from full widget picker." into sc-dev 2021-06-26 18:01:23 +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
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
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