Commit Graph

49170 Commits

Author SHA1 Message Date
Automerger Merge Worker 1d0e30a5ff Merge "Merge "Update app icon shadows" into tm-dev am: 2b6700a94c am: 8ffee245be" into tm-d1-dev-plus-aosp am: 7cbd4a0803
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17937870

Change-Id: Ida4d879d2b08f1f97461810621393f59a52aec45
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-27 20:54:47 +00:00
James O'Leary 0416393c5e Merge "Update app icon shadows" into tm-dev am: 2b6700a94c am: 5131a1a203 am: 5b56d72d03
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17937870

Change-Id: I83204766779c24e38c799562d7b541c92e4fddec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-27 20:53:05 +00:00
James O'Leary 5f4db0ffe8 Merge "Update app icon shadows" into tm-dev am: 2b6700a94c am: 5131a1a203 am: ef64789d0a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17937870

Change-Id: I9329e4b84ddc480029285485f48f98cc2182dd0e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-27 20:35:28 +00:00
Automerger Merge Worker 7cbd4a0803 Merge "Merge "Update app icon shadows" into tm-dev am: 2b6700a94c am: 8ffee245be" into tm-d1-dev-plus-aosp 2022-05-27 20:29:58 +00:00
James O'Leary 5b56d72d03 Merge "Update app icon shadows" into tm-dev am: 2b6700a94c am: 5131a1a203
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17937870

Change-Id: I8c0149d616dd4fd7430b07ab127fb50951a08a65
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-27 20:29:41 +00:00
James O'Leary 9f8d2f62f8 Merge "Update app icon shadows" into tm-dev am: 2b6700a94c am: 8ffee245be
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17937870

Change-Id: I4beebe975bbe755ef07129420d9646a5d748e806
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-27 20:29:41 +00:00
James O'Leary ef64789d0a Merge "Update app icon shadows" into tm-dev am: 2b6700a94c am: 5131a1a203
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17937870

Change-Id: I16cb7b30a5219d196427bedbbe0c3adbb66c1360
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-27 20:29:31 +00:00
James O'Leary 5131a1a203 Merge "Update app icon shadows" into tm-dev am: 2b6700a94c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17937870

Change-Id: Ie4eaa9e8cd699849487bfe99bb37eeab10dcce40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-27 20:05:31 +00:00
James O'Leary 8ffee245be Merge "Update app icon shadows" into tm-dev am: 2b6700a94c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17937870

Change-Id: I73d4ceaa27def3f885febf87e000d39e8baf6e70
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-27 20:04:05 +00:00
James O'Leary 2b6700a94c Merge "Update app icon shadows" into tm-dev 2022-05-27 19:44:39 +00:00
Winson Chung c980da6642 Merge "Ensure page scrolls are initialized even for 0 children." into tm-dev am: 1e211e0c03 am: 0a3ef79f06 am: af5ac4984f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18625747

Change-Id: Ib86922f8f662f325cd346485ae3ae1b651bdac7d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-27 18:40:39 +00:00
Brian Isganitis 435d6c797f [automerger skipped] Merge "Have separate DeviceProfile instances for taskbar and all apps windows." into tm-dev am: deaf8985f6 am: a01e52e7c7 -s ours am: 38578a53b8 -s ours
am skip reason: Merged-In Ia09f674ada9e445c1d7278fa94c536ea9de13ef9 with SHA-1 a9a78117c7 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18618746

Change-Id: I9683a226a13cd55c3135a9eb68b175fe8e23094c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-27 18:40:22 +00:00
Winson Chung 8cf1315578 Merge "Ensure page scrolls are initialized even for 0 children." into tm-dev am: 1e211e0c03 am: 0a3ef79f06 am: d57b486dbe
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18625747

Change-Id: I47d586f1c8bb9f6ef5680277fb14d4ef397c16d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-27 18:32:23 +00:00
Brian Isganitis 9161f35f0b [automerger skipped] Merge "Have separate DeviceProfile instances for taskbar and all apps windows." into tm-dev am: deaf8985f6 am: a01e52e7c7 -s ours am: f2d81fc339 -s ours
am skip reason: Merged-In Ia09f674ada9e445c1d7278fa94c536ea9de13ef9 with SHA-1 afd72f0726 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18618746

Change-Id: Ie6419c5cd89f64966e1424ae6fc08615f107cb19
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-27 18:32:17 +00:00
Winson Chung f5fa6adc99 Merge "Ensure page scrolls are initialized even for 0 children." into tm-dev am: 1e211e0c03 am: 251a3e8b51 am: 27c7322f2c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18625747

Change-Id: Ife93c3dde1ac0bc50df4c5d1fce1228d8c2ca5e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-27 18:32:11 +00:00
Brian Isganitis 0f507a7169 [automerger skipped] Merge "Have separate DeviceProfile instances for taskbar and all apps windows." into tm-dev am: deaf8985f6 am: ea0cc00256 am: 8cb0d94d41 -s ours
am skip reason: Merged-In Ia09f674ada9e445c1d7278fa94c536ea9de13ef9 with SHA-1 a9a78117c7 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18618746

Change-Id: I3a12ef5742aa2c805c44d1439160004ca5078aa9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-27 18:31:42 +00:00
Winson Chung d57b486dbe Merge "Ensure page scrolls are initialized even for 0 children." into tm-dev am: 1e211e0c03 am: 0a3ef79f06
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18625747

Change-Id: I447bfc5989f4ab05530b5c8bcf98dfc71b45a792
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-27 18:24:41 +00:00
Brian Isganitis f2d81fc339 [automerger skipped] Merge "Have separate DeviceProfile instances for taskbar and all apps windows." into tm-dev am: deaf8985f6 am: a01e52e7c7 -s ours
am skip reason: Merged-In Ia09f674ada9e445c1d7278fa94c536ea9de13ef9 with SHA-1 afd72f0726 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18618746

Change-Id: Ia48c873a6a738079af4d455af997eb63f4ca297d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-27 18:24:34 +00:00
Winson Chung af5ac4984f Merge "Ensure page scrolls are initialized even for 0 children." into tm-dev am: 1e211e0c03 am: 0a3ef79f06
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18625747

Change-Id: Ie10aeebc4e8f53f5c8882317e48a14b2b4fa8794
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-27 18:24:33 +00:00
Brian Isganitis 38578a53b8 [automerger skipped] Merge "Have separate DeviceProfile instances for taskbar and all apps windows." into tm-dev am: deaf8985f6 am: a01e52e7c7 -s ours
am skip reason: Merged-In Ia09f674ada9e445c1d7278fa94c536ea9de13ef9 with SHA-1 a9a78117c7 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18618746

Change-Id: Ic0a09d431747f07749418b507ac18c1731cdcafa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-27 18:24:18 +00:00
Winson Chung 27c7322f2c Merge "Ensure page scrolls are initialized even for 0 children." into tm-dev am: 1e211e0c03 am: 251a3e8b51
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18625747

Change-Id: Ifaab3ee1711a5d6447951c1e5d1e368f34a17302
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-27 18:15:14 +00:00
Brian Isganitis 8cb0d94d41 Merge "Have separate DeviceProfile instances for taskbar and all apps windows." into tm-dev am: deaf8985f6 am: ea0cc00256
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18618746

Change-Id: I75508dd60f31207279352d678e5303e98c439267
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-27 18:14:39 +00:00
Winson Chung 0a3ef79f06 Merge "Ensure page scrolls are initialized even for 0 children." into tm-dev am: 1e211e0c03
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18625747

Change-Id: Ib158460fdc41861dfd50a23c7d38ae0153e04af6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-27 17:58:46 +00:00
Brian Isganitis a01e52e7c7 Merge "Have separate DeviceProfile instances for taskbar and all apps windows." into tm-dev am: deaf8985f6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18618746

Change-Id: I11684206fb5177d0f00e4ce891e15eedc1aa3865
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-27 17:58:26 +00:00
Winson Chung 251a3e8b51 Merge "Ensure page scrolls are initialized even for 0 children." into tm-dev am: 1e211e0c03
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18625747

Change-Id: Id1b58a29c45c98b8ef5b0792688120a83e672d00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-27 17:57:37 +00:00
Brian Isganitis ea0cc00256 Merge "Have separate DeviceProfile instances for taskbar and all apps windows." into tm-dev am: deaf8985f6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18618746

Change-Id: Idf5f156ab8fca8a0fce460fbba96574ee3a3a12f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-27 17:56:24 +00:00
Winson Chung 1e211e0c03 Merge "Ensure page scrolls are initialized even for 0 children." into tm-dev 2022-05-27 17:42:22 +00:00
Brian Isganitis deaf8985f6 Merge "Have separate DeviceProfile instances for taskbar and all apps windows." into tm-dev 2022-05-27 17:25:16 +00:00
Vinit Nayak 24b8fcc4b6 Merge "Limit starting bounds of swipe to animation start rect" into tm-dev am: e8a4e0e2dc am: e9e0800fd7 am: 08ef06fc4c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18607508

Change-Id: Ie89494c8a8361d5abdfaa8dc9995692355c4d7c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-27 05:03:15 +00:00
Vinit Nayak f9cab5fff6 Merge "Limit starting bounds of swipe to animation start rect" into tm-dev am: e8a4e0e2dc am: 4e40207246 am: 67e8418e29
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18607508

Change-Id: Ib96f2b14d86d2c7f119a0070b38518e6c025797e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-27 05:03:09 +00:00
Automerger Merge Worker 4c95fb1b14 Merge "Merge "Moves Search results into a separate RV (take 2)." into tm-dev am: 4ca247a6bb am: f79a5cf7da" into tm-d1-dev-plus-aosp am: 78798a9999
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18420827

Change-Id: Ia5655be2d46cb01fc084c3f57e44f4b2a9f30172
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-27 05:02:59 +00:00
TreeHugger Robot be33123c2f Merge "[conflict] Merge "Moves Search results into a separate RV (take 2)." into tm-dev am: 4ca247a6bb am: 15dc59f8b1 am: 9fe363f16d" into tm-qpr-dev-plus-aosp 2022-05-27 05:02:05 +00:00
Vinit Nayak 2cbc0e03b2 Merge "Limit starting bounds of swipe to animation start rect" into tm-dev am: e8a4e0e2dc am: e9e0800fd7 am: 1eb79473aa
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18607508

Change-Id: I9ceb653c6dbce157a0fb385ad281b456fa3c211d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-27 03:42:50 +00:00
Vinit Nayak 08ef06fc4c Merge "Limit starting bounds of swipe to animation start rect" into tm-dev am: e8a4e0e2dc am: e9e0800fd7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18607508

Change-Id: I29baca76f464479026809e39edde20f21ae24783
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-27 03:29:24 +00:00
Vinit Nayak 67e8418e29 Merge "Limit starting bounds of swipe to animation start rect" into tm-dev am: e8a4e0e2dc am: 4e40207246
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18607508

Change-Id: Ie28807f7dd01e702f103493edccf9c5c41531632
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-27 03:29:18 +00:00
Vinit Nayak 1eb79473aa Merge "Limit starting bounds of swipe to animation start rect" into tm-dev am: e8a4e0e2dc am: e9e0800fd7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18607508

Change-Id: I7b4afd0d4eae8853e15c06c8f7f6472ef5035bf0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-27 03:29:15 +00:00
Vinit Nayak e9e0800fd7 Merge "Limit starting bounds of swipe to animation start rect" into tm-dev am: e8a4e0e2dc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18607508

Change-Id: Idfabce2fada6528db39af475b21a1f464717da33
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-27 03:11:59 +00:00
Vinit Nayak 4e40207246 Merge "Limit starting bounds of swipe to animation start rect" into tm-dev am: e8a4e0e2dc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18607508

Change-Id: I7524fc3777b7db298adf846862f7184dfdb689c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-27 03:10:27 +00:00
Vinit Nayak e8a4e0e2dc Merge "Limit starting bounds of swipe to animation start rect" into tm-dev 2022-05-27 02:52:36 +00:00
TreeHugger Robot 731978a0a5 Merge "[conflict] Merge "Moves Search results into a separate RV (take 2)." into tm-dev am: 4ca247a6bb am: 15dc59f8b1" into tm-qpr-dev am: a7b4152e90
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18624669

Change-Id: Ib4926dde7f34e27029b868663cb441641ef53b64
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-27 02:36:47 +00:00
TreeHugger Robot a7b4152e90 Merge "[conflict] Merge "Moves Search results into a separate RV (take 2)." into tm-dev am: 4ca247a6bb am: 15dc59f8b1" into tm-qpr-dev 2022-05-27 02:13:14 +00:00
Hyunyoung Song 8c456d6248 Merge "Convert make to bp" into tm-qpr-dev am: 7eee15f400
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18457406

Change-Id: I4b5d0658538a01c9086269f617dd7490c4af9e4d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-26 23:39:49 +00:00
Winson Chung 359cb5d1b6 Ensure page scrolls are initialized even for 0 children.
Bug: 233713180
Test: Walk through CtsVerifier Lock Task UI flow as described in the bug
Change-Id: I49cb942a37a202b3e1b7ee00479d68402fcaf8b0
2022-05-26 23:38:48 +00:00
Andy Wickham 49fb8efbd3 [conflict] Merge "Moves Search results into a separate RV (take 2)." into tm-dev am: 4ca247a6bb am: 15dc59f8b1 am: 9fe363f16d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18420827

Change-Id: Idda9dad08cb939a8e4ada7dc46b4af2ce103fdd7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-26 23:38:38 +00:00
Andy Wickham a1ec03bdfe [conflict] Merge "Moves Search results into a separate RV (take 2)." into tm-dev am: 4ca247a6bb am: 15dc59f8b1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18420827

Change-Id: Ic7e380e21342011afcbd1ada0eb453dc83eff4be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-26 23:31:31 +00:00
Hyunyoung Song 7eee15f400 Merge "Convert make to bp" into tm-qpr-dev 2022-05-26 23:14:04 +00:00
Automerger Merge Worker 78798a9999 Merge "Merge "Moves Search results into a separate RV (take 2)." into tm-dev am: 4ca247a6bb am: f79a5cf7da" into tm-d1-dev-plus-aosp 2022-05-26 22:16:26 +00:00
Andy Wickham dfea4d8672 Merge "Moves Search results into a separate RV (take 2)." into tm-dev am: 4ca247a6bb am: f79a5cf7da
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18420827

Change-Id: I01cd4f53cac1259e6d1fdf0ce2cedd5c32a4b195
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-26 22:16:15 +00:00
Andy Wickham 9fe363f16d Merge "Moves Search results into a separate RV (take 2)." into tm-dev am: 4ca247a6bb am: 15dc59f8b1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18420827

Change-Id: I97bef5b17f15cf500e545cc1d1ccd3e6031abadd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-26 22:16:09 +00:00
Andy Wickham 15dc59f8b1 Merge "Moves Search results into a separate RV (take 2)." into tm-dev am: 4ca247a6bb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18420827

Change-Id: Ibcc128ec5f74a96978e0c65af79283997ac1db50
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-26 22:00:44 +00:00