Commit Graph

14892 Commits

Author SHA1 Message Date
Jordan Silva 50a7ef7f16 Merge "Fix digital wellbeing toast being initialized multiple times" into udc-dev am: a68cd72a3c am: 66c4d281c9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22821459

Change-Id: If2898fee19a1f34805cefa92a8f091b41c11ec6c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-26 18:28:58 +00:00
Jordan Silva 66c4d281c9 Merge "Fix digital wellbeing toast being initialized multiple times" into udc-dev am: a68cd72a3c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22821459

Change-Id: Ic137f6cb79c9a4dffc1ed75d6a625b74aaff14be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-26 17:51:00 +00:00
Sebastián Franco 0f669c9863 Merge "Prevent null pointer exception by return from setBackToLauncherCallback when mBackToLauncherCallback is null" into udc-dev am: 3538deee10 am: c48be5d6b0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22774999

Change-Id: I77080888dd485ab26808465d1d615e35a525dc51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-26 17:25:45 +00:00
Jordan Silva a68cd72a3c Merge "Fix digital wellbeing toast being initialized multiple times" into udc-dev 2023-04-26 17:15:09 +00:00
Sebastián Franco c48be5d6b0 Merge "Prevent null pointer exception by return from setBackToLauncherCallback when mBackToLauncherCallback is null" into udc-dev am: 3538deee10
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22774999

Change-Id: Ie9ce8f91686593d37968bafd77b5306547ffd302
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-26 16:47:39 +00:00
Sebastián Franco 3538deee10 Merge "Prevent null pointer exception by return from setBackToLauncherCallback when mBackToLauncherCallback is null" into udc-dev 2023-04-26 16:06:35 +00:00
Jordan Silva f03e5f3778 Fix digital wellbeing toast being initialized multiple times
Digital Wellbeing toast state was being updated several times together with the app icon unnecessarily. This was causing a recreation of the Digital Wellbeing and replacing the banner attached to the TaskView multiple times, leading to heavy UI thread work and jumpy animations in some cases.

Bug: 271428408
Test: manual
Change-Id: I1a2a1423924efb0fb3c1e66826e3ab11211dcfb7
2023-04-26 11:40:47 +01:00
Tracy Zhou 7df386f6d6 Merge "Commit to OtherActivityInputConsumer when swiping up in app" into udc-dev am: c8f0ac0cd8 am: 5d0d488ed9 am: 2bafc51acd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22863002

Change-Id: I1547e38de8b1828168f7dab6220f5a9aa2a72ddb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-26 07:38:07 +00:00
Tracy Zhou 8d4f883329 Merge "Commit to OtherActivityInputConsumer when swiping up in app" into udc-dev am: c8f0ac0cd8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22863002

Change-Id: Ic9673eeddb575f64a38118e60fd72169205f1a63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-26 06:59:54 +00:00
Tracy Zhou 5d0d488ed9 Merge "Commit to OtherActivityInputConsumer when swiping up in app" into udc-dev am: c8f0ac0cd8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22863002

Change-Id: I120dfff079269ad7a75ff6e2b099a1fcc1fc1a30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-26 06:55:41 +00:00
Fengjiang Li da95a0a5f4 Merge "Fix NPE of predictive back in TaskbarAllAppsSlideInView" into udc-dev am: 216ae0f7ec am: 8832e8c7b2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22717961

Change-Id: I1f6ac62d72fbc42dc13674a8da8fab04b853d5d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-26 06:35:32 +00:00
Tracy Zhou c8f0ac0cd8 Merge "Commit to OtherActivityInputConsumer when swiping up in app" into udc-dev 2023-04-26 06:22:50 +00:00
Fengjiang Li 8832e8c7b2 Merge "Fix NPE of predictive back in TaskbarAllAppsSlideInView" into udc-dev am: 216ae0f7ec
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22717961

Change-Id: I02dc06e7f1a11bad94aa7037343e15bf10795751
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-26 05:58:31 +00:00
Fengjiang Li d49e5e06da Merge "Fix NPE of predictive back in TaskbarAllAppsSlideInView" into udc-dev am: 216ae0f7ec
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22717961

Change-Id: I483fc364cfed0f6ce1c7e6f86c72786dc2bf6373
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-26 05:54:16 +00:00
Fengjiang Li 216ae0f7ec Merge "Fix NPE of predictive back in TaskbarAllAppsSlideInView" into udc-dev 2023-04-26 05:15:33 +00:00
Vinit Nayak a5e869febd Merge "Route PredictedAppIcon clicks through launcher" into udc-dev am: 80a3213d6b am: 1b107d290d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22727510

Change-Id: I2dcce8fec980dd300c35976e4706a825ce3713b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-26 00:35:44 +00:00
Vinit Nayak 1b107d290d Merge "Route PredictedAppIcon clicks through launcher" into udc-dev am: 80a3213d6b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22727510

Change-Id: I976a145a9354b14be45accc2b2c2fef10ed224e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25 23:56:40 +00:00
Vinit Nayak e3433e03ca Merge "Route PredictedAppIcon clicks through launcher" into udc-dev am: 80a3213d6b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22727510

Change-Id: Iae96e86b7ebcb2114eacd4ca9e5d56d385643c0b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25 23:52:28 +00:00
Vinit Nayak 80a3213d6b Merge "Route PredictedAppIcon clicks through launcher" into udc-dev 2023-04-25 23:20:41 +00:00
Saumya Prakash bfa0791b39 Merge "Update the mock hotseat for the Gesture Navigation tutorial" into udc-dev am: 773c5c1760 am: f9754974a4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22725235

Change-Id: I778e3685e0930e0e611b412036541592c947cf36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25 21:40:59 +00:00
Saumya Prakash f9754974a4 Merge "Update the mock hotseat for the Gesture Navigation tutorial" into udc-dev am: 773c5c1760
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22725235

Change-Id: I8ae31b1ec38bfb24fffb984cf0369e87df73ea8e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25 21:01:03 +00:00
Saumya Prakash 5d5c48934a Merge "Update the mock hotseat for the Gesture Navigation tutorial" into udc-dev am: 773c5c1760
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22725235

Change-Id: Ieb02037f183bfca8375735f65297fa865059355f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25 20:56:16 +00:00
Tracy Zhou 8bcc8d0676 Merge "Support 4-finger gesture to quick switch" into udc-dev am: eb55f83d88 am: 5258d08f9d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22233664

Change-Id: I41e757ee155444fe9185964094c7a097dda1e27a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25 20:18:19 +00:00
Saumya Prakash 773c5c1760 Merge "Update the mock hotseat for the Gesture Navigation tutorial" into udc-dev 2023-04-25 20:14:32 +00:00
Tracy Zhou 33bcdbbb9d Commit to OtherActivityInputConsumer when swiping up in app
Fixes: 279634432
Test: swipe up and then immediately down, making sure that the notification shade is not brought down
Change-Id: I5ffdab6cef8162d0f0783c5d4a761197952209dd
2023-04-25 13:10:47 -07:00
Vinit Nayak 1bb594c72b Route PredictedAppIcon clicks through launcher
* This allows us to intercept launching predicted apps for
split-screen if user is in split selection flow
* Defaults to existing behavior of ItemClickHandler.INSTANCE
if we do not need to intercept the click

Bug: 276361926
Flag: ENABLE_SPLIT_FROM_WORKSPACE_TO_WORKSPACE
Test: Launches as expected when not in split, launches in
split when selected as second app to initiate split with

Change-Id: Ieb45137ae89da340d314e995f4f6eb1f8b49a42f
2023-04-25 12:31:56 -07:00
Tracy Zhou 5258d08f9d Merge "Support 4-finger gesture to quick switch" into udc-dev am: eb55f83d88
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22233664

Change-Id: I2fe70691dd7b3f370c72251dee5401b0dc8620eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25 18:54:11 +00:00
Tracy Zhou ffbd3908b0 Merge "Support 4-finger gesture to quick switch" into udc-dev am: eb55f83d88
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22233664

Change-Id: Ia84538108b258e05044ec39aaa6369e3ad9059f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25 18:48:54 +00:00
Tracy Zhou eb55f83d88 Merge "Support 4-finger gesture to quick switch" into udc-dev 2023-04-25 18:21:37 +00:00
Robin Lee 062d73eaed Merge "Remove keyguard state from onAnimationCancelled" into udc-dev am: 52b4c77770
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22779727

Change-Id: I2bc69b9def524dfba69733935e40337d95dfe1e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25 17:54:57 +00:00
Robin Lee afd04013b6 Merge "Remove keyguard state from onAnimationCancelled" into udc-dev am: 52b4c77770
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22779727

Change-Id: If1c79c3c5e8ca72302e2a20de9fef98145e77a8d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25 17:48:38 +00:00
Robin Lee 52b4c77770 Merge "Remove keyguard state from onAnimationCancelled" into udc-dev 2023-04-25 17:35:59 +00:00
Mady Mellor 546a977a77 Merge "Creates BubbleBarController" into udc-dev am: d6430d17ac am: 74edc95947
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22691162

Change-Id: I3af26e8621a209b14e25b0f9d6f8f4e2424a2610
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25 17:21:20 +00:00
Sebastian Franco 3bb1c1c125 Prevent null pointer exception by return from setBackToLauncherCallback when mBackToLauncherCallback is null
This change is needed because of ag/22360314

Fix: 277964328
Test: Compiles
Change-Id: Ib03bbf9d60b2a2b0a8207d3ba2a4c1019cc1b8f7
2023-04-25 09:55:30 -07:00
Mady Mellor 80d7503eb3 Merge "Creates BubbleBarController" into udc-dev am: d6430d17ac
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22691162

Change-Id: I782aefbbe24766df0f9d0d0300ca9344ea3f3d7e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25 16:39:45 +00:00
Mady Mellor 74edc95947 Merge "Creates BubbleBarController" into udc-dev am: d6430d17ac
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22691162

Change-Id: I38a9d989c80b6e90c0ecc11dfe0939fac1f39d35
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25 16:37:10 +00:00
Mady Mellor d6430d17ac Merge "Creates BubbleBarController" into udc-dev 2023-04-25 15:49:46 +00:00
Treehugger Robot 9956861db1 Merge "Import translations. DO NOT MERGE ANYWHERE" 2023-04-25 01:16:29 +00:00
Bill Yi 474586a38f Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev 2023-04-24 21:58:48 +00:00
Liana Kazanova dd8f7e5dd0 Merge "Revert "Introduce library for public animation APIs"" into udc-dev am: a6a0867b65 am: 05e1c20bc0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22791267

Change-Id: I06347abfc38e79e323ee11e1162715dcee352520
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-24 18:46:52 +00:00
Liana Kazanova 05e1c20bc0 Merge "Revert "Introduce library for public animation APIs"" into udc-dev am: a6a0867b65
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22791267

Change-Id: Ib24fb1e4e1448744e66d827c70cf5c913e7529f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-24 18:30:21 +00:00
Liana Kazanova a6a0867b65 Merge "Revert "Introduce library for public animation APIs"" into udc-dev 2023-04-24 17:58:45 +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
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
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
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
Bill Yi 1df61c9f4b Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I16d758db3725eca5c664de76792a59b3550b80ac
2023-04-21 18:33:52 -07:00
Bill Yi acdcfe4731 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I5628eb71f48452a705d8c1a1e41390a847809385
2023-04-21 16:04:39 -07:00