Sunny Goyal
2653cd5eb0
Merge "Fixing animation end not-called when cancelling state the animation recursively" into sc-dev am: b3eafe97bb am: a56c1e0617
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15032078
Change-Id: I40c3949b3427e05a0f86f85d6f82c0a325962c6b
2021-06-21 22:53:33 +00:00
Tony Wickham
66b60ab354
Merge "Ensure mConsumer isn't set to null in reset()." into sc-dev am: 82fc5c83a5 am: f0e1e8bf00
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15052402
Change-Id: Icf283921b956e9822ecd7b3fa26755bc809b25da
2021-06-21 22:53:11 +00:00
Sunny Goyal
a56c1e0617
Merge "Fixing animation end not-called when cancelling state the animation recursively" into sc-dev am: b3eafe97bb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15032078
Change-Id: I68c12433ba07dcba23bb9f6ed1ed507ea21484bb
2021-06-21 22:40:34 +00:00
Tony Wickham
f0e1e8bf00
Merge "Ensure mConsumer isn't set to null in reset()." into sc-dev am: 82fc5c83a5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15052402
Change-Id: I8a21b8c6826cda2341bdf2f23698e1c4aa014246
2021-06-21 22:40:09 +00:00
Sunny Goyal
b3eafe97bb
Merge "Fixing animation end not-called when cancelling state the animation recursively" into sc-dev
2021-06-21 22:32:23 +00:00
Tony Wickham
82fc5c83a5
Merge "Ensure mConsumer isn't set to null in reset()." into sc-dev
2021-06-21 22:15:48 +00:00
Sunny Goyal
de644313b0
Fixing animation end not-called when cancelling state the animation recursively
...
Bug: 190856140
Test: Manual
Change-Id: I5d6a00c1d1c0e95e615b7f2115e3e4ebb56b987f
2021-06-21 13:47:49 -07: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
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
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
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
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
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
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
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
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
Stevie Kideckel
4ef613de2e
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: I9753c0eb90f401690954dac6e111a3bda08180a1
2021-06-21 13:13:57 +00:00
Stevie Kideckel
61bc5c6c93
Merge "Fix bug in equals implementation for search headers" into sc-dev
2021-06-21 12:56:17 +00:00
Stevie Kideckel
e99f3c9666
Fix bug in equals implementation for search headers
...
Fix: 191626327
Test: verified locally
Change-Id: I8103059a2759a8533581ff86cb57b28913cf5731
2021-06-21 10:42:16 +00:00
Xin Li
4d0e692bb4
[automerger skipped] Merge "DO NOT MERGE - Merge RQ3A.210605.005" am: e01e5dda78 -s ours am: eed2c3fc67 -s ours
...
am skip reason: Merged-In I5e4b540f169d365c60cf4461e19cda24009f325d with SHA-1 eac11b669d is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/1741538
Change-Id: Ied577142b59fa89f653bb41998193ff734395292
2021-06-21 06:42:44 +00:00
Xin Li
eed2c3fc67
[automerger skipped] Merge "DO NOT MERGE - Merge RQ3A.210605.005" am: e01e5dda78 -s ours
...
am skip reason: Merged-In I5e4b540f169d365c60cf4461e19cda24009f325d with SHA-1 eac11b669d is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/1741538
Change-Id: Ie632fbf17c1938e781d817df57f1c250d8663df0
2021-06-21 06:10:17 +00:00
Xin Li
e01e5dda78
Merge "DO NOT MERGE - Merge RQ3A.210605.005"
2021-06-21 05:49:03 +00:00
Jonathan Miranda
635d79cf54
Merge "Fix bug where workspace alpha does not get set to 1 when animation gets cancelled." into sc-dev am: f9df8f3682 am: 94df55bada
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15023032
Change-Id: I70bc17163c03fa61302ee8ad05212fbefb3d5bb6
2021-06-20 23:22:46 +00:00
Jonathan Miranda
b1cfdbb1aa
Merge "Fix bug where workspace alpha does not get set to 1 when animation gets cancelled." into sc-dev am: f9df8f3682 am: 5e7b499dc7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15023032
Change-Id: Ibfda1e6ab85a49556249d956b7e02fd62a926cae
2021-06-20 23:11:04 +00:00
Jonathan Miranda
94df55bada
Merge "Fix bug where workspace alpha does not get set to 1 when animation gets cancelled." into sc-dev am: f9df8f3682
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15023032
Change-Id: I9ab72caa407fd3e6a2e6130bcf9e924ba2c7726c
2021-06-20 22:59:04 +00:00
Jonathan Miranda
5e7b499dc7
Merge "Fix bug where workspace alpha does not get set to 1 when animation gets cancelled." into sc-dev am: f9df8f3682
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15023032
Change-Id: Iaed06dd41e6932628f33b232ae9f77e2194e55a9
2021-06-20 22:58:01 +00:00
Jonathan Miranda
f9df8f3682
Merge "Fix bug where workspace alpha does not get set to 1 when animation gets cancelled." into sc-dev
2021-06-20 22:46:46 +00:00
Bill Yi
a15d26c5f3
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5ca92844d5 -s ours am: b0f48cfcc2 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15032579
Change-Id: I8d576dcf9398ab7929d956b32c65de6d4a203242
2021-06-20 05:59:19 +00:00
Bill Yi
2407d9e8b3
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5ca92844d5 -s ours am: 9aa1abc4c7 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15032579
Change-Id: I9b0842a999f8aaa4ba5d959bc8145a2e6bec1497
2021-06-20 05:59:00 +00:00
Bill Yi
9aa1abc4c7
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5ca92844d5 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15032579
Change-Id: I6ff99cbb30e8fd8e473a5d54f770cbf2156621d7
2021-06-20 05:44:46 +00:00