Commit Graph

62200 Commits

Author SHA1 Message Date
Vinit Nayak de44064d2e Merge "Support splitting from workspace with Widgets" into udc-dev am: 955555a314 am: 4e1d6c54f8 am: 39bd8db194
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22727308

Change-Id: I1514c31d4f768087a98880e7a0cfc0a6d3c350c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-22 05:27:02 +00:00
Jeremy Sim 6936b37155 Merge "App Pairs (behind flag): Add new ItemInfo types and DB save functionality" into udc-dev am: 6e0f34cc0a am: 32ca3ae8e3 am: 4d5c8f835c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22347413

Change-Id: Ie2fa388ce61684a0d9af3e398cf0696b0a6a19f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-22 05:26:36 +00:00
Vinit Nayak 99fdda93e7 Merge "Support splitting from workspace with Widgets" into udc-dev am: 955555a314 am: 0ed1e4802a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22727308

Change-Id: I8020f9d39890fdac9252b7c89e4a3610697598d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-22 04:45:43 +00:00
Vinit Nayak 39bd8db194 Merge "Support splitting from workspace with Widgets" into udc-dev am: 955555a314 am: 4e1d6c54f8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22727308

Change-Id: Id41171e735505cd0ea37488122321b89c5168b3d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-22 04:45:32 +00:00
Jeremy Sim 328a338b9b Merge "App Pairs (behind flag): Add new ItemInfo types and DB save functionality" into udc-dev am: 6e0f34cc0a am: b953cb12fc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22347413

Change-Id: I71c29f7a183978afa480d9b1ab7097360b484bae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-22 04:45:19 +00:00
Jeremy Sim 4d5c8f835c Merge "App Pairs (behind flag): Add new ItemInfo types and DB save functionality" into udc-dev am: 6e0f34cc0a am: 32ca3ae8e3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22347413

Change-Id: I47e6f3d3d3a52f9731876623ce090f47fe523c3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-22 04:45:00 +00:00
Vinit Nayak 0ed1e4802a Merge "Support splitting from workspace with Widgets" into udc-dev am: 955555a314
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22727308

Change-Id: I3cfe07ee1207dd0c0dae3a47b4849a2f771d8aef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-22 04:08:24 +00:00
Vinit Nayak 4e1d6c54f8 Merge "Support splitting from workspace with Widgets" into udc-dev am: 955555a314
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22727308

Change-Id: I4512561a1eddece6b5f634ba5ba410cbd2199e82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-22 04:08:23 +00:00
Jeremy Sim 32ca3ae8e3 Merge "App Pairs (behind flag): Add new ItemInfo types and DB save functionality" into udc-dev am: 6e0f34cc0a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22347413

Change-Id: I286066cd7d515362c85c0702a7a3846490f7ba20
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-22 04:07:46 +00:00
Jeremy Sim b953cb12fc Merge "App Pairs (behind flag): Add new ItemInfo types and DB save functionality" into udc-dev am: 6e0f34cc0a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22347413

Change-Id: I8c32e16025cdef614a2dfeb1fae49165ce81ef33
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-22 04:07:43 +00:00
Vinit Nayak 955555a314 Merge "Support splitting from workspace with Widgets" into udc-dev 2023-04-22 03:55:23 +00:00
Jeremy Sim 6e0f34cc0a Merge "App Pairs (behind flag): Add new ItemInfo types and DB save functionality" into udc-dev 2023-04-22 03:21:17 +00:00
Xin Li 0196e6bd2e [automerger skipped] Merge Android 13 QPR3 tm-qpr-dev-plus-aosp-without-vendor@9936994 am: 4f53e8a1c5 -s ours am: e9e2642969 -s ours am: aefb73f9b2 -s ours am: f1079376d1 -s ours
am skip reason: Merged-In I2bb9d93d39215ca3653e2e4353391b50b7ab6417 with SHA-1 ecb55ef471 is already in history

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

Change-Id: I2b55e97599b67fdb42c4a1e21ebf49e961cf04a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-21 23:52:26 +00:00
Xin Li f1079376d1 [automerger skipped] Merge Android 13 QPR3 tm-qpr-dev-plus-aosp-without-vendor@9936994 am: 4f53e8a1c5 -s ours am: e9e2642969 -s ours am: aefb73f9b2 -s ours
am skip reason: Merged-In I2bb9d93d39215ca3653e2e4353391b50b7ab6417 with SHA-1 ecb55ef471 is already in history

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

Change-Id: I9157a665594fa2d4916d2c25eea9699cc1d5bc81
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-21 23:11:47 +00:00
Xin Li aefb73f9b2 [automerger skipped] Merge Android 13 QPR3 tm-qpr-dev-plus-aosp-without-vendor@9936994 am: 4f53e8a1c5 -s ours am: e9e2642969 -s ours
am skip reason: Merged-In I2bb9d93d39215ca3653e2e4353391b50b7ab6417 with SHA-1 ecb55ef471 is already in history

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

Change-Id: I7a7523739caf606e71e36158fafb165066ad35e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-21 22:34:01 +00:00
Fengjiang Li b79a3f3610 Merge "Check build version before using predicitve back API" into udc-dev am: 5068718fe8 am: 1cde001b6e am: 2c98e30750
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22776729

Change-Id: I2cff3abc3c8d9f71b3592b83cdb633b862f78c1e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-21 22:33:15 +00:00
Vadim Tryshev 733efad1f4 Merge "Making it clear that a test sees the keyguard for the first time." into udc-dev am: ca83c69dc4 am: d6bd231fcb am: 962d68b49d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22774796

Change-Id: I8f300e0541fdf4b4bbf01f9d545f6c16b6db3d52
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-21 22:30:39 +00:00
Fengjiang Li 20644bbc71 Merge "Check build version before using predicitve back API" into udc-dev am: 5068718fe8 am: 2ca0d661ab am: ad22227f4b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22776729

Change-Id: I292447ed328a76e27574acbdf12c105a11ffe95a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-21 22:27:08 +00:00
Vadim Tryshev c7c11194dc Merge "Making it clear that a test sees the keyguard for the first time." into udc-dev am: ca83c69dc4 am: 3899fb205b am: db9f8f50d5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22774796

Change-Id: I6524c01fb75601948f1bf8e4b87da9e5ebf8048a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-21 22:23:27 +00:00
Fengjiang Li 2c98e30750 Merge "Check build version before using predicitve back API" into udc-dev am: 5068718fe8 am: 1cde001b6e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22776729

Change-Id: I30d0870cd9fae219b3c736c8c1556aa0e0de5685
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-21 22:13:14 +00:00
Vadim Tryshev 962d68b49d Merge "Making it clear that a test sees the keyguard for the first time." into udc-dev am: ca83c69dc4 am: d6bd231fcb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22774796

Change-Id: If6421e0fe1bd9d7f2e81e35e338e12753252f3ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-21 22:03:43 +00:00
Fengjiang Li 79b9df45d3 Merge "Check build version before using predicitve back API" into udc-dev am: 5068718fe8 am: 36f7ba3944
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22776729

Change-Id: I4d02e3be8675b0e72fc7eb96ac03bbfdef7fefc9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-21 21:46:42 +00:00
Fengjiang Li ad22227f4b Merge "Check build version before using predicitve back API" into udc-dev am: 5068718fe8 am: 2ca0d661ab
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22776729

Change-Id: I2226aaee66f3c3899187025334a8c5907f5d3cb3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-21 21:46:02 +00:00
Vadim Tryshev db9f8f50d5 Merge "Making it clear that a test sees the keyguard for the first time." into udc-dev am: ca83c69dc4 am: 3899fb205b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22774796

Change-Id: I99a39e12eab75d52d73a7e3eae1e9f0968b1a729
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-21 21:44:55 +00:00
Vadim Tryshev 78e33c20cc Merge "Making it clear that a test sees the keyguard for the first time." into udc-dev am: ca83c69dc4 am: 9ee454fc52
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22774796

Change-Id: Id015a7d468c1e409c72c9b54840819fe23523277
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-21 21:39:51 +00:00
Fengjiang Li 1cde001b6e Merge "Check build version before using predicitve back API" into udc-dev am: 5068718fe8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22776729

Change-Id: Id9f116e5bfd78e167f9f3d7f6edb070f2864da71
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-21 21:33:25 +00:00
Vadim Tryshev d6bd231fcb Merge "Making it clear that a test sees the keyguard for the first time." into udc-dev am: ca83c69dc4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22774796

Change-Id: Ib0ab72155370ed78ae28a9da3abb4a3a6f36ab03
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-21 21:24:45 +00:00
Jeremy Sim 7cf0dd9e03 App Pairs (behind flag): Add new ItemInfo types and DB save functionality
This is the second of several patches implementing the App Pairs feature behind a flag.

This patch includes:
- AppPairsController, a new controller that will handle creation, launching, and deletion of app pairs
- ITEM_TYPE_APP_PAIR is a new type of FolderInfo (FolderInfo now can be either a folder or an app pair, and should probably be renamed to CollectionInfo or something more generic in future)
- Necessary plumbing for these new types
- Database code that handles saving a new app pair to the database with the correct schema

Flag: ENABLE_APP_PAIRS (set to false)
Bug: 274189428
Test: Not included in this CL, but will follow
Change-Id: Ie3aefd4eb9171f471789f54876de742849d3013b
2023-04-21 14:23:54 -07:00
Vinit Nayak fd46900b96 Support splitting from workspace with Widgets
* Need to insert widget's icon in animation
* Launching w/ same package app + widget is
broken

Test: Launched apps from predicted apps + widget,
hotseat apps + widget
Flag: ENABLE_SPLIT_FROM_WORKSPACE_TO_WORKSPACE
Bug: 276361926

Change-Id: I3e30189e56536371ebd0acfbdd2c073a882cc731
2023-04-21 14:05:12 -07:00
Fengjiang Li 36f7ba3944 Merge "Check build version before using predicitve back API" into udc-dev am: 5068718fe8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22776729

Change-Id: I690a2b7867f7d210667c12b6b6e4218db94af186
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-21 21:04:36 +00:00
Fengjiang Li 2ca0d661ab Merge "Check build version before using predicitve back API" into udc-dev am: 5068718fe8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22776729

Change-Id: If8f41c311ef1b010d392f24d609428c2f1c086a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-21 21:03:40 +00:00
Vadim Tryshev 9ee454fc52 Merge "Making it clear that a test sees the keyguard for the first time." into udc-dev am: ca83c69dc4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22774796

Change-Id: I32271ad62de46e8782f5e314a13e197edfdeec45
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-21 20:57:42 +00:00
Vadim Tryshev 3899fb205b Merge "Making it clear that a test sees the keyguard for the first time." into udc-dev am: ca83c69dc4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22774796

Change-Id: Ie713cb63fb12653e584338721c1417b9391fdde9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-21 20:57:30 +00:00
Fengjiang Li 5068718fe8 Merge "Check build version before using predicitve back API" into udc-dev 2023-04-21 20:22:09 +00:00
Vadim Tryshev ca83c69dc4 Merge "Making it clear that a test sees the keyguard for the first time." into udc-dev 2023-04-21 19:16:43 +00:00
Xin Li e9e2642969 [automerger skipped] Merge Android 13 QPR3 tm-qpr-dev-plus-aosp-without-vendor@9936994 am: 4f53e8a1c5 -s ours
am skip reason: Merged-In I2bb9d93d39215ca3653e2e4353391b50b7ab6417 with SHA-1 ecb55ef471 is already in history

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

Change-Id: Ie80f2b81547004b04368d4a25b074342821b70fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-21 18:15:10 +00:00
Andrew Cole 710b25e411 Merge "Screen recording flakey test" into udc-dev am: d59c600411 am: 3d9bc987f3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22532491

Change-Id: Icc7a599c2ed796a3d325dcad1427dc7e402ac8d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-21 18:02:34 +00:00
Andrew Cole 3d9bc987f3 Merge "Screen recording flakey test" into udc-dev am: d59c600411
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22532491

Change-Id: I7d3ddde7ac1ba4f26b943f74f4c0a12f501cf3e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-21 18:01:57 +00:00
Andrew Cole b4c5a1bf08 Merge "Screen recording flakey test" into udc-dev am: d59c600411 am: bdf10634dd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22532491

Change-Id: Ie04f347273d2140113946497c31bf141b5eb474e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-21 18:01:23 +00:00
Andrew Cole bdf10634dd Merge "Screen recording flakey test" into udc-dev am: d59c600411
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22532491

Change-Id: Iec5672aadc87d07cb5859d487992064dfd059c04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-21 18:01:13 +00:00
Holly Jiuyu Sun b9628d0334 Merge "Override INTERPOLATOR_WITHIN_ALL_APPS when app restarts." into udc-dev am: 7c836923b9 am: 675bcd6ae8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22432465

Change-Id: I48e857cb424fdd09e0d4dd3d7d4bf2886e694778
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-21 17:58:53 +00:00
Holly Jiuyu Sun 855f348249 Merge "Override INTERPOLATOR_WITHIN_ALL_APPS when app restarts." into udc-dev am: 7c836923b9 am: c3943c2971
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22432465

Change-Id: Ibff27ae174165801f035cf8809739b423f36ff77
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-21 17:57:00 +00:00
Andrew Cole d59c600411 Merge "Screen recording flakey test" into udc-dev 2023-04-21 17:51:56 +00:00
Holly Jiuyu Sun 675bcd6ae8 Merge "Override INTERPOLATOR_WITHIN_ALL_APPS when app restarts." into udc-dev am: 7c836923b9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22432465

Change-Id: I200fe6b2c33ba09aa7e86b0ad46c5cecf5333f37
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-21 17:40:06 +00:00
Holly Jiuyu Sun c3943c2971 Merge "Override INTERPOLATOR_WITHIN_ALL_APPS when app restarts." into udc-dev am: 7c836923b9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22432465

Change-Id: I8c9ce716308f2c04c3f9b7bf3ba76a47bef69f7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-21 17:39:57 +00:00
Automerger Merge Worker 093de43e39 Merge "Merge "Exposing functionality to pin Taskbar from TaskbarDividerPopupView." into udc-dev am: 64b79a9fad am: b66808c026" 2023-04-21 17:36:43 +00:00
Jagrut Desai f76496369d Merge "Exposing functionality to pin Taskbar from TaskbarDividerPopupView." into udc-dev am: 64b79a9fad am: dc22d38d4b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22519946

Change-Id: I98bf2cc5dc1dd19875e4f1c8d4d9f75283299748
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-21 17:36:36 +00:00
Jagrut Desai 0bed809e33 Merge "Exposing functionality to pin Taskbar from TaskbarDividerPopupView." into udc-dev am: 64b79a9fad am: b66808c026
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22519946

Change-Id: I6327293e7f243f03de7d9da99f27a29e124479f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-21 17:36:36 +00:00
Holly Jiuyu Sun 7c836923b9 Merge "Override INTERPOLATOR_WITHIN_ALL_APPS when app restarts." into udc-dev 2023-04-21 17:13:03 +00:00
Jagrut Desai b66808c026 Merge "Exposing functionality to pin Taskbar from TaskbarDividerPopupView." into udc-dev am: 64b79a9fad
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22519946

Change-Id: I5e833b4fe492e7cade8aa7b5244a8fd256763565
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-21 17:00:40 +00:00