Sunny Goyal
e4e7a650d5
Revert "Revert "Revert "Revert "Revert "Revert "Changing GridMigrationTask to use ModelDbController directly"""""" am: 7bc6cdee56
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23219852
Change-Id: Ibae285468c4c9d4f87369d782f13838e8585a75c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-13 11:17:58 +00:00
Sunny Goyal
7bc6cdee56
Revert "Revert "Revert "Revert "Revert "Revert "Changing GridMigrationTask to use ModelDbController directly""""""
...
This reverts commit 09905cfa90 .
Reason for revert: Fixed the crashing issue
Change-Id: Ibcfc28a89356d262e67e8842d6bae37e230a70f5
2023-05-13 01:59:19 -07:00
Treehugger Robot
0c8b5e834e
Merge "Fix bug where unstash animation plays twice." into udc-dev am: ba4fcb0171
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23153653
Change-Id: I3482a796afd3d854ce4f429e0aa1243232b5592f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-13 02:32:41 +00:00
Treehugger Robot
ba4fcb0171
Merge "Fix bug where unstash animation plays twice." into udc-dev
2023-05-13 01:47:20 +00:00
Jeremy Sim
cef431f675
Merge "Allows splitscreen with work & personal version of the same app" into udc-dev am: ab9e66c260
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23200223
Change-Id: Ie25ea075a04945113cb0346c8cbcbb9cc236b6ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-13 00:32:18 +00:00
Sihua Ma
0d52eafea1
Merge "Add logs for deleting widget during restoration" into udc-dev am: 5de8f06d3b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23121815
Change-Id: I3d123697b60d702df1806f43f966e28db7223d4e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-13 00:30:02 +00:00
Jeremy Sim
ab9e66c260
Merge "Allows splitscreen with work & personal version of the same app" into udc-dev
2023-05-13 00:23:23 +00:00
Sihua Ma
5de8f06d3b
Merge "Add logs for deleting widget during restoration" into udc-dev
2023-05-13 00:12:51 +00:00
Jon Miranda
e30a551f93
Fix bug where unstash animation plays twice.
...
Fixes: 282056846
Change-Id: I372444684fafd246369f6bc1e77c5e6fbb651c6f
Flag: ENABLE_TRANSIENT_TASKBAR
Test: open app, then very quickly swipe to unstash taskbar
2023-05-12 16:27:57 -07:00
Schneider Victor-tulias
8658735169
Merge "Fix the overview tutorial step success animation" into udc-dev am: 8f23be7b6f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23122638
Change-Id: I3985478778ffa6c1f043445a908c75ae1cc64103
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-12 22:58:47 +00:00
Schneider Victor-tulias
8f23be7b6f
Merge "Fix the overview tutorial step success animation" into udc-dev
2023-05-12 22:40:14 +00:00
Sihua Ma
eab9f00745
Add logs for deleting widget during restoration
...
Test: N/A
Bug: 234700507
Change-Id: I4161ddd91675950f5f93a62b3c6b388643ec692f
2023-05-12 15:29:56 -07:00
Jeremy Sim
e213e604bd
Merge "Force Taskbar to remain stashed when in 3p launcher or recents" into udc-dev am: d27b06f500
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22961525
Change-Id: I45a54f3694f00f7b84c392cb01bfc362ebade435
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-12 22:18:43 +00:00
Fengjiang Li
b4e245466b
Merge "[Talkback] Focus on "Widget" header when widget bottom sheet is opened" into udc-dev am: aab6875746
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23126920
Change-Id: I7019596fe7ef7e1ceeb2d9d55af89d90980681df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-12 22:18:33 +00:00
Saumya Prakash
9ac9c98286
Merge "Fix UI issues of fake task view in gesture nav tutorial." into udc-dev am: 24aec5e6b0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23120959
Change-Id: Ia900cae2b1da86ccfb829a90d287eb383ed72713
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-12 22:18:12 +00:00
Jeremy Sim
d27b06f500
Merge "Force Taskbar to remain stashed when in 3p launcher or recents" into udc-dev
2023-05-12 22:08:51 +00:00
Fengjiang Li
aab6875746
Merge "[Talkback] Focus on "Widget" header when widget bottom sheet is opened" into udc-dev
2023-05-12 21:46:14 +00:00
Saumya Prakash
24aec5e6b0
Merge "Fix UI issues of fake task view in gesture nav tutorial." into udc-dev
2023-05-12 21:41:38 +00:00
Treehugger Robot
6cfe9d1827
Merge "Cleanup SettingsChangeLogger onClose()" into udc-dev am: 87abc0644b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23159149
Change-Id: I8f2cc9be5a53dc0025e39e0b34eeac23b7e2b9e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-12 18:21:20 +00:00
Treehugger Robot
87abc0644b
Merge "Cleanup SettingsChangeLogger onClose()" into udc-dev
2023-05-12 17:39:19 +00:00
Schneider Victor-tulias
a8ccd542bc
Fix the overview tutorial step success animation
...
- Tapping the screen after a successful overview gesture, but before the delayed success feedbck created a janky experience
- Immediately setting the gesture as successful
Flag: ENABLE_NEW_GESTURE_NAV_TUTORIAL
Fixes: 281742006
Test: tapped the screen quickly after successfully completing the overview gesture
Change-Id: I166060191753d6b95bc223e2be08df2bb4b4ecfd
2023-05-12 10:24:39 -07:00
Brandon Dayauon
14035ceaff
Merge "Separate animations and add dragOffSet points in dragOptions" into udc-dev am: 125e121834
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22862532
Change-Id: Id61315d5e0d15da6354927889fa97ea8eb957528
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-12 15:55:10 +00:00
Brandon Dayauon
125e121834
Merge "Separate animations and add dragOffSet points in dragOptions" into udc-dev
2023-05-12 15:22:48 +00:00
Pavel Grafov
7f8d1be2f8
Merge "Use PROFILE_INACCESSIBLE to track locked profile" into udc-dev am: 5ed0d0ce99
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23155128
Change-Id: Iff180fa693f54f295334b6cce63e1e26853e73dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-12 10:58:16 +00:00
Pavel Grafov
5ed0d0ce99
Merge "Use PROFILE_INACCESSIBLE to track locked profile" into udc-dev
2023-05-12 10:13:41 +00:00
Jeremy Sim
f4835a8884
Force Taskbar to remain stashed when in 3p launcher or recents
...
This patch makes it so that the transient Taskbar cannot unstash when in 3P launcher.
Previously, the user was able to unstash Taskbar when in 3P launcher, causing a janky-looking UI (3P launchers may implement their own version of Taskbar on the home screen. This also caused problems with certain Taskbar commands like split screen, which provide an entry portal to Pixel-specific implementations.
Fixed by forcing the Taskbar to stay stashed when a 3P Launcher is displayed. The Taskbar is still usable inside of other non-launcher apps. This was done by using TopTaskTracker to check for ACTIVITY_TYPE_HOME or ACTIVITY_TYPE_RECENTS, and disabling Taskbar when these activities are running.
Fixes: 277963491
Test: Manual
Change-Id: Ifc0f3c07e3b76eb610f93205978fbc596bab6253
2023-05-12 00:32:24 -07:00
Jeremy Sim
92e1eeb5f0
Allows splitscreen with work & personal version of the same app
...
This patch makes changes in various splitscreen controllers to pass userId to the new shell API, to allow same-app splitting with different users.
Fixes: 274973415
Test: Manual
Change-Id: I810b5353aad738c7c275856586b9c521f1554022
2023-05-11 22:10:51 -07:00
Jerry Chang
d7a75e5b9e
Merge "Fix not tracking splitting tasks correctly" into udc-dev am: 303d6101fb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23149642
Change-Id: Ie7f59ef4c30dcb6275735e4d34c6d9f83ecc0876
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-12 01:02:39 +00:00
Jerry Chang
303d6101fb
Merge "Fix not tracking splitting tasks correctly" into udc-dev
2023-05-12 00:49:21 +00:00
Treehugger Robot
6dcf6f0e42
Merge "Add logs to check which userId is used for workProfile matcher" into udc-dev am: e201480e77
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23174986
Change-Id: I09cff1e8be14c47fbe4e6d1457334d69d4675531
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-12 00:22:52 +00:00
Treehugger Robot
e201480e77
Merge "Add logs to check which userId is used for workProfile matcher" into udc-dev
2023-05-12 00:07:37 +00:00
Winson Chung
485267061f
Merge "Only refresh the launcher resume state when the task launch fails" into udc-dev am: e04071e19c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23151004
Change-Id: I4cb69a140791bceeed78a24bbc43be0a70d1e142
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-12 00:00:45 +00:00
Tony Wickham
bb176e243a
Merge "Consistently multiply touch slop for InputConsumers" into udc-dev am: 8d402efac2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23122637
Change-Id: I0ea3bef525d76dd8801e66d2e35334b39b66e6cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 23:58:27 +00:00
Vinit Nayak
f68f1fa3cc
Cleanup SettingsChangeLogger onClose()
...
* Correct name for San*d*box
Bug: 280463854
Flag: none
Test: v2/gnl-eng/unbundled/launcher/nexus_unit_test_multi_device_platform
Change-Id: I2446871c8ea0b146ccfa2ea7caa1727aec42dd42
2023-05-11 16:32:27 -07:00
Winson Chung
e04071e19c
Merge "Only refresh the launcher resume state when the task launch fails" into udc-dev
2023-05-11 23:31:21 +00:00
Winson Chung
de1b42b957
Only refresh the launcher resume state when the task launch fails
...
- The previous call from TaskbarLauncherStateController caused a
regression due to the inability for the code to distinguish
Normal -> Background -> Normal when tapping on the bar area
or from failing to launch a task, so both cases were triggering
the resumed state to cycle and start an animation. For now we can
only handle the task-launch fail case.
Bug: 268448123
Fixes: 281966662
Test: Quickswitch to an activity that finishes when resumed
Change-Id: Ie4692dd85252540ff47633978c0e6e4adbb1bdd0
2023-05-11 23:31:14 +00:00
Tony Wickham
8d402efac2
Merge "Consistently multiply touch slop for InputConsumers" into udc-dev
2023-05-11 23:21:33 +00:00
Jeremy Sim
37c9f10a26
Merge "Fix animation canceling crash bug (short swipe during split select)" into udc-dev am: 7158d2d0e2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22146539
Change-Id: Ie1a029935d313dd87ad663db298c04aa815f7d46
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 22:55:23 +00:00
Sunny Goyal
71d20b0ed7
Merge "Revert "Revert "Revert "Revert "Revert "Changing GridMigrationTask to use ModelDbController directly"""""" into udc-dev am: c110587dba
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23159152
Change-Id: I3dc4f94a4dc8a9eb00044e23742add37120ed195
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 22:53:34 +00:00
Jeremy Sim
7158d2d0e2
Merge "Fix animation canceling crash bug (short swipe during split select)" into udc-dev
2023-05-11 22:31:34 +00:00
Sunny Goyal
c110587dba
Merge "Revert "Revert "Revert "Revert "Revert "Changing GridMigrationTask to use ModelDbController directly"""""" into udc-dev
2023-05-11 22:24:45 +00:00
Sunny Goyal
09905cfa90
Revert "Revert "Revert "Revert "Revert "Changing GridMigrationTask to use ModelDbController directly"""""
...
This reverts commit bca4e694f0 .
Reason for revert: post submit broken
Change-Id: I8afc63b5aa67ee14127f79e2245ef543bff8cf31
2023-05-11 22:22:16 +00:00
Vinit Nayak
88a91bbd16
Add logs to check which userId is used for workProfile matcher
...
Flag: none
Test: compiles
Bug: 243688989
Change-Id: I0a579203cc0c51f7707180b323ed4828f1dea297
2023-05-11 14:55:00 -07:00
Treehugger Robot
3b7009bc57
Merge "Revert "Modify Taskbar code to accommodate bubble bar gesture to stash/unstash"" into udc-dev am: 52d4764576
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23177739
Change-Id: I203a9bc846ff227ac3b64af44395c81dcf6b0375
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 21:50:50 +00:00
Sunny Goyal
a0db88cee5
Merge "Revert "Revert "Revert "Revert "Changing GridMigrationTask to use ModelDbController directly""""" into udc-dev am: 04a6211120
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23117443
Change-Id: I121d0540ffc6a8ec3084162e4c676cfed7e6287f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 21:50:40 +00:00
Treehugger Robot
52d4764576
Merge "Revert "Modify Taskbar code to accommodate bubble bar gesture to stash/unstash"" into udc-dev
2023-05-11 20:58:02 +00:00
Sunny Goyal
04a6211120
Merge "Revert "Revert "Revert "Revert "Changing GridMigrationTask to use ModelDbController directly""""" into udc-dev
2023-05-11 20:22:51 +00:00
Treehugger Robot
b456274145
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 674ef91120 -s ours am: fa74c1ab70 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23122645
Change-Id: Ic5b132cbac8c7daa4c13f8c444c3897bad1bfc5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 19:11:37 +00:00
Bill Yi
28bc032e14
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4952c38e99 -s ours am: b7b9abc978 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23122645
Change-Id: I5f15bb598c74e405f3bb47ee981bceb97522c0e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 19:11:27 +00:00
Treehugger Robot
fa74c1ab70
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 674ef91120 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23122645
Change-Id: Ic9a41c6c841cf1c3f20cfdb0f3c2e7128cf0fb14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 19:05:24 +00:00