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
Stevie Kideckel
6d925ca1ae
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: Ideea605496f460b352268c02f33bbea390c95731
2021-06-21 13:13:59 +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
android-build-team Robot
c9582c99f9
Snap for 7476172 from 08252fd4be to tm-release
...
Change-Id: I94e1872ca705d0caa85fc7957512b891d55a1b26
2021-06-21 01:07:59 +00:00
Jonathan Miranda
cf50b6fb9f
Merge "Fix bug where workspace alpha does not get set to 1 when animation gets cancelled." into sc-dev am: f9df8f3682 am: 94df55bada am: 635d79cf54
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15023032
Change-Id: Id39c1e446ac06da1b9b338cabe0850566539a533
2021-06-20 23:27:42 +00:00
Jonathan Miranda
02c83a16cb
Merge "Fix bug where workspace alpha does not get set to 1 when animation gets cancelled." into sc-dev am: f9df8f3682 am: 5e7b499dc7 am: b1cfdbb1aa
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15023032
Change-Id: Ic00635479b7fbb9a85279319440ef613cf3711b6
2021-06-20 23:27:36 +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
db2f0df330
Merge "Fix bug where workspace alpha does not get set to 1 when animation gets cancelled." into sc-dev am: f9df8f3682 am: 24ae397544
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15023032
Change-Id: Icc2e06db004672614609b009ffbdb37d092bc7ae
2021-06-20 23:10:13 +00:00
android-build-team Robot
0653e2d5a5
Snap for 7476082 from 9aa1abc4c7 to sc-v2-release
...
Change-Id: I04551885c0534c7260b3f74427c37048d03815b1
2021-06-20 23:08:32 +00:00
android-build-team Robot
04e94262fb
Snap for 7476063 from 5ca92844d5 to sc-release
...
Change-Id: I4034d675bb1143b3a906d9a87286be10285d4231
2021-06-20 23:08:11 +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
24ae397544
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: I21f9366f93afe6eaf2d9e96927a6a2eef7d5427a
2021-06-20 22:58:15 +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
08252fd4be
Merge "Import translations. DO NOT MERGE ANYWHERE"
2021-06-20 17:10:20 +00:00
Bill Yi
3d106c20ee
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5ca92844d5 -s ours am: b0f48cfcc2 -s ours am: a15d26c5f3 -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: Ib0c7dca22c88f5140b7d4267bd5cd5e9c20b3cfb
2021-06-20 06:19:32 +00:00
Bill Yi
3cdfe47b0d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5ca92844d5 -s ours am: 9aa1abc4c7 -s ours am: 2407d9e8b3 -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: I3890e6e4d6369bba34c9a11b82c4edd239e6e465
2021-06-20 06:19:22 +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
7bf7bd857f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5ca92844d5 -s ours am: 401b52ec95 -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: I4d6ec0a0f7d78d2599f9dce7bc31a35b5386d103
2021-06-20 05:58:25 +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
Bill Yi
bb2266dc95
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 76680262bc -s ours am: 0e263807d3 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15039278
Change-Id: I191e16e00dbfd04b654f9a1e21a4ba6378962583
2021-06-20 05:43:56 +00:00