Brian Isganitis
45444e1727
Merge "Revert "Fix home settings landing page"" into sc-dev am: fe139cdf69 am: c3d74c43b0 am: 592e4b1146
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15030323
Change-Id: I7a0b46a41620844b403abc9f88d5cf1eef60af7a
2021-06-21 20:31:19 +00:00
Schneider Victor-tulias
2a322833bd
Merge "Update All set screen icon" into sc-dev am: 689d69572b am: b9528fb046 am: f76dfa7916
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15031481
Change-Id: I62503092078dc0e022ffa708f8c03a979c8ab1bc
2021-06-21 20:24:40 +00:00
Tony Wickham
9c10d08e1e
Ensure mConsumer isn't set to null in reset().
...
mResetGestureInputConsumer is not initialized until onUserUnlocked(), meaning it might still be null in reset(). Use NO_OP input consumer in that case.
Test: none
Bug: 191669813
Change-Id: Ib9edde50fba0b6164390ec2b5c877d3db74ddfeb
2021-06-21 13:24:01 -07:00
Brian Isganitis
592e4b1146
Merge "Revert "Fix home settings landing page"" into sc-dev am: fe139cdf69 am: c3d74c43b0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15030323
Change-Id: I6e293adf34dda0ea532ff7b8f5352c7fb8a69af8
2021-06-21 20:22:23 +00:00
Schneider Victor-tulias
f76dfa7916
Merge "Update All set screen icon" into sc-dev am: 689d69572b am: b9528fb046
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15031481
Change-Id: I11cd7bb5d9f712771d10b07cd81528fe1565fc51
2021-06-21 20:22:17 +00:00
Stevie Kideckel
1353235e69
Merge "Add spacing between items as decorations instead of margins" into sc-dev am: e03784478d am: 84176d5601 am: 37a6723100
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15028527
Change-Id: I35993b225da950ccf66f85d2244c9235621fb09e
2021-06-21 20:20:27 +00:00
Brian Isganitis
b9a0985522
Merge "Revert "Fix home settings landing page"" into sc-dev am: fe139cdf69 am: 7d7b5e6106
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15030323
Change-Id: I59aa61468b63a03c6ea7207f97d4f9a2980fd809
2021-06-21 20:19:37 +00:00
Schneider Victor-tulias
2c546d1ce0
Merge "Update All set screen icon" into sc-dev am: 689d69572b am: ebc85f672d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15031481
Change-Id: If57af21e6ed93997c3c4915d6316fd043ecf52de
2021-06-21 20:18:15 +00:00
Stevie Kideckel
37a6723100
Merge "Add spacing between items as decorations instead of margins" into sc-dev am: e03784478d am: 84176d5601
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15028527
Change-Id: Ib630fd7189e737a23b3628a04fe69cfa09229ea5
2021-06-21 20:17:58 +00:00
Steven Ng
8165eaecdf
Merge "Copy minSpanX & minSpanY when copying from an existing ItemInfo" into sc-dev am: 95c969530c am: 2087d7ee47 am: f36497af38
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15046761
Change-Id: I28de9cf1b26eff7ea4b648772d19022129161568
2021-06-21 20:16:46 +00:00
Stevie Kideckel
2cecea84d1
Merge "Add spacing between items as decorations instead of margins" into sc-dev am: e03784478d am: 2306ce3bdb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15028527
Change-Id: Ie012d057b025460a7468919fcf9b866880982fd4
2021-06-21 20:16:30 +00:00
Steven Ng
f36497af38
Merge "Copy minSpanX & minSpanY when copying from an existing ItemInfo" into sc-dev am: 95c969530c am: 2087d7ee47
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15046761
Change-Id: I10ba565b363b2cdec5a161dc6b0e8b3b3ecec782
2021-06-21 20:16:00 +00:00
Brian Isganitis
95438e9ae7
Merge "Revert "Fix home settings landing page"" into sc-dev am: fe139cdf69 am: 96f496df03 am: aed37b05e7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15030323
Change-Id: I70498e9ce47e28a8d76023b62b8635bafc20bb30
2021-06-21 20:15:46 +00:00
Steven Ng
2c9170f07a
Merge "Copy minSpanX & minSpanY when copying from an existing ItemInfo" into sc-dev am: 95c969530c am: 15ce3292fe
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15046761
Change-Id: I81d432137f9f0a26c70916788ebdb65da95a4975
2021-06-21 20:15:11 +00:00
Schneider Victor-tulias
abfca747bc
Merge "Update All set screen icon" into sc-dev am: 689d69572b am: ad65347a98 am: d431b9cd0c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15031481
Change-Id: I8d932671942957a8e7ab802bf5a2c8b8762b3ff3
2021-06-21 20:15:03 +00:00
Stevie Kideckel
4ef9cc99ab
Merge "Add spacing between items as decorations instead of margins" into sc-dev am: e03784478d am: f792c64c6a am: dbfded01db
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15028527
Change-Id: I796fee16073dfd2f1a6054fa117b4810579cbd2a
2021-06-21 20:14:52 +00:00
Brian Isganitis
aed37b05e7
Merge "Revert "Fix home settings landing page"" into sc-dev am: fe139cdf69 am: 96f496df03
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15030323
Change-Id: I1083b778cbf1fe743a9f4d336fd9953363d08639
2021-06-21 20:14:15 +00:00
Schneider Victor-tulias
d431b9cd0c
Merge "Update All set screen icon" into sc-dev am: 689d69572b am: ad65347a98
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15031481
Change-Id: Ib89e8eca1810273ece698c67bf66466fcee913ee
2021-06-21 20:13:23 +00:00
Steven Ng
4fab7d8030
Merge "Copy minSpanX & minSpanY when copying from an existing ItemInfo" into sc-dev am: 95c969530c am: 99db0b2bd1 am: 011d1f70d8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15046761
Change-Id: Ie34d5f0895a4b745a3ae284f91787499cacafe4c
2021-06-21 20:11:56 +00:00
Brian Isganitis
96f496df03
Merge "Revert "Fix home settings landing page"" into sc-dev am: fe139cdf69
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15030323
Change-Id: I7a9b72f099c4e8908615cc8a7b13aa69b72e0f41
2021-06-21 20:08:20 +00:00
Schneider Victor-tulias
ad65347a98
Merge "Update All set screen icon" into sc-dev am: 689d69572b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15031481
Change-Id: Ib1864113e4ec2942eeb111d6b2b9277bf13e59ec
2021-06-21 20:07:59 +00:00
Stevie Kideckel
dbfded01db
Merge "Add spacing between items as decorations instead of margins" into sc-dev am: e03784478d am: f792c64c6a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15028527
Change-Id: I5d99c26d1a2473b474947c5b5926ba0496013744
2021-06-21 20:07:29 +00:00
Steven Ng
011d1f70d8
Merge "Copy minSpanX & minSpanY when copying from an existing ItemInfo" into sc-dev am: 95c969530c am: 99db0b2bd1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15046761
Change-Id: I61c08dffb442c18096df10a574286a82280433b0
2021-06-21 20:06:22 +00:00
Stevie Kideckel
f792c64c6a
Merge "Add spacing between items as decorations instead of margins" into sc-dev am: e03784478d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15028527
Change-Id: Iccc9f7d9b3add624b47557350cd85567b17206b1
2021-06-21 19:59:36 +00:00
Steven Ng
99db0b2bd1
Merge "Copy minSpanX & minSpanY when copying from an existing ItemInfo" into sc-dev am: 95c969530c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15046761
Change-Id: Icb87afa869ba70652911b779ec8163fc12f2ba92
2021-06-21 19:58:41 +00:00
Brian Isganitis
c3d74c43b0
Merge "Revert "Fix home settings landing page"" into sc-dev am: fe139cdf69
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15030323
Change-Id: I04d964a3e0a37b36d73e2cc97e3a573de47dc6a7
2021-06-21 19:58:09 +00:00
Schneider Victor-tulias
b9528fb046
Merge "Update All set screen icon" into sc-dev am: 689d69572b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15031481
Change-Id: Ibc35be313e6f53042157daf4a8ced190e74092f7
2021-06-21 19:58:00 +00:00
Stevie Kideckel
84176d5601
Merge "Add spacing between items as decorations instead of margins" into sc-dev am: e03784478d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15028527
Change-Id: I122ee61d9ab7ccbf4b722285896c0b90e399f245
2021-06-21 19:57:56 +00:00
Brian Isganitis
7d7b5e6106
Merge "Revert "Fix home settings landing page"" into sc-dev am: fe139cdf69
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15030323
Change-Id: I68403eb068a5a29617869cc5e20b196c2d795759
2021-06-21 19:57:55 +00:00
Tony Wickham
29d762fb82
Merge "Initial commit of taskbar stashing" into sc-v2-dev am: 0ac023196d am: a2be8926bd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14941111
Change-Id: I3da658073e4ad181c872021f3b4faa8d6a2d1160
2021-06-21 19:56:54 +00:00
Schneider Victor-tulias
ebc85f672d
Merge "Update All set screen icon" into sc-dev am: 689d69572b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15031481
Change-Id: Ia29d12a91ae58ee0d01118406c1fa82e5aa9d0e6
2021-06-21 19:56:38 +00:00
Stevie Kideckel
2306ce3bdb
Merge "Add spacing between items as decorations instead of margins" into sc-dev am: e03784478d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15028527
Change-Id: I11efd3684d285c3baaef3675683aa8bd2506962d
2021-06-21 19:56:07 +00:00
Steven Ng
15ce3292fe
Merge "Copy minSpanX & minSpanY when copying from an existing ItemInfo" into sc-dev am: 95c969530c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15046761
Change-Id: I6a075ab272c5312a4637757ca6328f6341e2273b
2021-06-21 19:55:28 +00:00
Stevie Kideckel
1ec634624c
Merge "Fix bug in equals implementation for search headers" into sc-dev am: 61bc5c6c93 am: 4ef613de2e am: 38b4cac326
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15046752
Change-Id: Ic9de5067c6a5413b632fbd95c193bd0b06c88e4a
2021-06-21 19:55:22 +00:00
Tony Wickham
a2be8926bd
Merge "Initial commit of taskbar stashing" into sc-v2-dev am: 0ac023196d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14941111
Change-Id: I42a6e727f8b2500c69e9542cc182d8386a4365cd
2021-06-21 19:54:24 +00:00
Steven Ng
2087d7ee47
Merge "Copy minSpanX & minSpanY when copying from an existing ItemInfo" into sc-dev am: 95c969530c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15046761
Change-Id: Ie2a753e07f695efa6bd737bdba37eee058f6cb92
2021-06-21 19:53:49 +00:00
Brian Isganitis
fe139cdf69
Merge "Revert "Fix home settings landing page"" into sc-dev
2021-06-21 19:27:24 +00:00
Schneider Victor-tulias
689d69572b
Merge "Update All set screen icon" into sc-dev
2021-06-21 17:35:15 +00:00
Xin Li
324a7f9eab
[automerger skipped] Merge "DO NOT MERGE - Merge RQ3A.210605.005" am: e01e5dda78 -s ours am: eed2c3fc67 -s ours am: 4d0e692bb4 -s ours am: 3545408b5e -s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/1741538
Change-Id: I25b1f1d24e0699d57469b1b20ec095598fecf810
2021-06-21 17:22:53 +00:00
Stevie Kideckel
e03784478d
Merge "Add spacing between items as decorations instead of margins" into sc-dev
2021-06-21 16:47:30 +00:00
Stevie Kideckel
38b4cac326
Merge "Fix bug in equals implementation for search headers" into sc-dev am: 61bc5c6c93 am: 4ef613de2e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15046752
Change-Id: Iee5a0c4d045ec62a9cbaf48091460828f049a1be
2021-06-21 16:25:29 +00:00
Steven Ng
95c969530c
Merge "Copy minSpanX & minSpanY when copying from an existing ItemInfo" into sc-dev
2021-06-21 16:20:39 +00:00
Xin Li
3545408b5e
[automerger skipped] Merge "DO NOT MERGE - Merge RQ3A.210605.005" am: e01e5dda78 -s ours am: eed2c3fc67 -s ours am: 4d0e692bb4 -s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/1741538
Change-Id: I5c3ccc92c794b11147ddb2e3fd48b6d3c730b5e4
2021-06-21 16:14:33 +00:00
Tony Wickham
0ac023196d
Merge "Initial commit of taskbar stashing" into sc-v2-dev
2021-06-21 15:56:12 +00:00
Stevie Kideckel
ded80076db
Add spacing between items as decorations instead of margins
...
There are bugs in the accounting for the margins if we manipulate the
view directly, causing the wrong top to be reported and the view to be
shifted when we call scrollToPosition. Item decorations ensure that the
layout system for the recycler view always has the right details about
the spacing.
Fix: 191642682
Test: verified locally
Change-Id: Ie80563757079e885c8178883ab16e314d01c5b32
2021-06-21 15:11:33 +00:00
Steven Ng
7b27e7d061
Copy minSpanX & minSpanY when copying from an existing ItemInfo
...
Test: Drop Gmail widget to home screen and configure it. Then, drop
the widget to a home screen that doesn't have sufficient space
to accommodate it. The gmail widget can't be dropped to that
home page and is returned to its original position.
Fix: 190582606
Change-Id: I177c09562d059b658e835cbb7fdde0d7bc6565d2
2021-06-21 15:38:26 +01:00
Stevie Kideckel
f03f2fedbe
Merge "Fix bug in equals implementation for search headers" into sc-dev am: 61bc5c6c93 am: 222a315351 am: 040e9ba8bb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15046752
Change-Id: I2b1c000b9bceb426e98fbda461d04192215a90ce
2021-06-21 13:34:52 +00:00
Stevie Kideckel
040e9ba8bb
Merge "Fix bug in equals implementation for search headers" into sc-dev am: 61bc5c6c93 am: 222a315351
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15046752
Change-Id: Ia6beb26c16f0904af326c4ef2c06e5cb0e1b80f4
2021-06-21 13:24:26 +00:00
Stevie Kideckel
0e9d4dd65b
Merge "Fix bug in equals implementation for search headers" into sc-dev am: 61bc5c6c93 am: 6d925ca1ae
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15046752
Change-Id: I471e77592cee723bb529a0c79fb71ad3ff195ef8
2021-06-21 13:23:55 +00:00
Stevie Kideckel
222a315351
Merge "Fix bug in equals implementation for search headers" into sc-dev am: 61bc5c6c93
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15046752
Change-Id: I8ec156650e0ff98c2b32a5d5c96e8483558b97f6
2021-06-21 13:14:40 +00:00