Commit Graph

36570 Commits

Author SHA1 Message Date
Samuel Fufa 5cabd79737 Merge "Remove HotseatEduActivity from AOSP" into sc-v2-dev am: d74703d63d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15729849

Change-Id: Ib13f49b0a41fcbaa49f4ce5c8ba1a9ff68372dd1
2021-09-02 18:34:22 +00:00
Samuel Fufa d74703d63d Merge "Remove HotseatEduActivity from AOSP" into sc-v2-dev 2021-09-02 18:18:19 +00:00
Vinit Nayak 2417191a15 Merge "Hide overview and app icon split option when appropriate" into sc-v2-dev am: fb624f8501
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15733659

Change-Id: I5db96c01c54a0bbf75eb09ae675d58df99a9f40c
2021-09-02 17:55:21 +00:00
Vinit Nayak fb624f8501 Merge "Hide overview and app icon split option when appropriate" into sc-v2-dev 2021-09-02 17:42:53 +00:00
Jonathan Miranda f0ba4d6754 Merge "Allow users to dismiss notifications in popup view." into sc-qpr1-dev am: 2f9f6378be am: 8bcbb662bb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15690344

Change-Id: I867a334b953f45d4d5600ce9652c243d3d1f7e4b
2021-09-02 17:04:54 +00:00
Jonathan Miranda 44b3eed902 Merge "Allow users to dismiss notifications in popup view." into sc-qpr1-dev am: 2f9f6378be am: eed0520799
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15690344

Change-Id: I9da12885327677e30f505ef91a741238c4be7bda
2021-09-02 17:03:39 +00:00
Jonathan Miranda eed0520799 Merge "Allow users to dismiss notifications in popup view." into sc-qpr1-dev am: 2f9f6378be
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15690344

Change-Id: Ic13a38f8e5ea7c250b476f0e0751de7898ca4d84
2021-09-02 16:49:06 +00:00
Jonathan Miranda 8bcbb662bb Merge "Allow users to dismiss notifications in popup view." into sc-qpr1-dev am: 2f9f6378be
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15690344

Change-Id: I438d4193b9a4ef33613f37e7a4ae30d3f663e6bb
2021-09-02 16:48:46 +00:00
Jonathan Miranda 2f9f6378be Merge "Allow users to dismiss notifications in popup view." into sc-qpr1-dev 2021-09-02 16:34:03 +00:00
Alex Chau df7f42c60a Merge "Logging for drop bar not appearing for dragged widget" into sc-v2-dev am: 6bad4d8877
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15741222

Change-Id: Ifb33f4bfcea3135a97c0143dcf85e167a68d9f0f
2021-09-02 09:48:29 +00:00
Alex Chau 6bad4d8877 Merge "Logging for drop bar not appearing for dragged widget" into sc-v2-dev 2021-09-02 09:35:13 +00:00
y 0115d73890 Remove HotseatEduActivity from AOSP
Bug: 191882450
Test: manual
Change-Id: Ic60ef6fec6c3d8162cb3d11b0ed3c9f89f6b5704
2021-09-01 16:59:47 -07:00
TreeHugger Robot 5e1589e47f Merge "Only call setCurrentPage in applyLoadPlan if mCurrentPage is outdated" into sc-v2-dev am: 7b313224e9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15739983

Change-Id: I10432d5cea2f573a7c83f3e3bae8c77b3717f8d7
2021-09-01 21:49:10 +00:00
TreeHugger Robot 7b313224e9 Merge "Only call setCurrentPage in applyLoadPlan if mCurrentPage is outdated" into sc-v2-dev 2021-09-01 21:25:09 +00:00
Samuel Fufa 2376d37da1 Merge "[AllApps] Polish views according to specs" into sc-v2-dev am: c9d09cac98
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15663383

Change-Id: I77da2208999e15df3e574b01019847ad901915e6
2021-09-01 21:13:26 +00:00
Samuel Fufa c9d09cac98 Merge "[AllApps] Polish views according to specs" into sc-v2-dev 2021-09-01 20:58:44 +00:00
vadimt 89d9423321 Logging for drop bar not appearing for dragged widget
Test: presubmit
Bug: 195031154
Change-Id: I19494fc3d6d9db252570697c057fdee7f7d44521
2021-09-01 12:33:00 -07:00
Vadim Tryshev 90cedcc741 Merge "Revert "Band-aid for getHomeActivities returning null"" into sc-v2-dev am: fc88784f8d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15732511

Change-Id: Iafe1ed7f8800fd01f06f7f93b3013d8c17f4c438
2021-09-01 17:46:03 +00:00
Alex Chau 06c7d0cb56 Only call setCurrentPage in applyLoadPlan if mCurrentPage is outdated
- Apply the same for all 3 setCurrentPage cases as they can all causes page jumping

Bug: 197493120
Test: manual
Change-Id: I5f7013ce3ce4d6fe84c67123618c3bebeeffc43a
2021-09-01 18:43:40 +01:00
Vadim Tryshev fc88784f8d Merge "Revert "Band-aid for getHomeActivities returning null"" into sc-v2-dev 2021-09-01 17:30:55 +00:00
Alex Chau eb47ebddb1 Only restore previous currentPage in applyLoadPlan if mCurrentPage is outdated am: f0b8ef9dfd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15736956

Change-Id: I03350faefc6da9545c57b282bc7c2f67f3b87741
2021-09-01 17:24:33 +00:00
Alex Chau f0b8ef9dfd Only restore previous currentPage in applyLoadPlan if mCurrentPage is outdated
Bug: 197493120
Test: manual
Change-Id: I196088c848f9fa8ec23f6c803226d674ba3e088b
2021-09-01 15:10:37 +01:00
Jerry Chang 4009f13212 Merge "Always refresh device profile when multi window mode changed" into sc-v2-dev am: 125158232e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15683895

Change-Id: I1fa26967ff4614cbe4d915fc5041fa67e5165d65
2021-09-01 06:53:23 +00:00
Jerry Chang 125158232e Merge "Always refresh device profile when multi window mode changed" into sc-v2-dev 2021-09-01 06:27:05 +00:00
Vinit Nayak 0b73d1014f Hide overview and app icon split option when appropriate
Don't show app menu icon split option or overview
action split option when current taskView is already in
split or there are not at least 2 tasks with which to
invoke split

Fixes: 197245395
Test: Tested with small and large screen,
dismissing tasks in overview, with and without
GroupedTaskView as main running task

Change-Id: I90cc3c39e4d94662cb87314a210d45d145b6e026
2021-08-31 20:23:36 -07:00
Evan Rosky e0729a2cef Merge "Fix NPE that happens occasionally on start-up" into sc-v2-dev am: 8a0e91b330
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15730945

Change-Id: I20c2eea060fc170e888d4aa8ec9e834507f85ee5
2021-09-01 01:48:16 +00:00
Evan Rosky 8a0e91b330 Merge "Fix NPE that happens occasionally on start-up" into sc-v2-dev 2021-09-01 01:29:06 +00:00
vadimt 5cca2265b6 Revert "Band-aid for getHomeActivities returning null"
This reverts commit 42a7d1af83.
REASON FOR REVERT: the underlying framework bug is fixed

Test: presubmit
Bug: 187080582

Change-Id: If580a35196ba9a9c5e3a5da642a2ea3aa3d9048e
2021-08-31 18:04:59 -07:00
y bd8d9150e0 [AllApps] Polish views according to specs
Bug: 196391749 Update work edu button stroke color
Bug: 195497351 Update header font size for work apps paused state
Bug: 192673256 Show ArrowTip elevation
Bug: 192668800 Support for two line PopupOption view
Test: visual
Change-Id: I65f8c6152f54306756d6cb66de2581aff45b8d47
2021-08-31 17:04:46 -07:00
TreeHugger Robot a30438a13f Merge "Preventing workspace scroll over QSB area" into sc-v2-dev am: cb776ca518
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15694303

Change-Id: Ie2ac07e5e41ee98d1eb439c752724fb2b2936d7b
2021-08-31 23:31:56 +00:00
TreeHugger Robot cb776ca518 Merge "Preventing workspace scroll over QSB area" into sc-v2-dev 2021-08-31 23:17:52 +00:00
TreeHugger Robot 6cdcc25465 Merge "Fix some taskbar stashing issues" into sc-v2-dev am: ff705eabe6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15728603

Change-Id: I049ff420aad926df7b1a3fd78510ae26e616ebdc
2021-08-31 22:51:51 +00:00
TreeHugger Robot ff705eabe6 Merge "Fix some taskbar stashing issues" into sc-v2-dev 2021-08-31 22:38:01 +00:00
Tony Wickham 0e3a685ce4 Merge "Fix NPEs when swiping up from keyguard" into sc-v2-dev am: ff2171d232
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15728602

Change-Id: Ief83226aee6b9ee7cc0f1d58fb14d9bfce0934dd
2021-08-31 22:13:01 +00:00
Evan Rosky c12b7355b1 Fix NPE that happens occasionally on start-up
Was not checking if topActivity was null.

Bug: 189935087
Test: boot phone thousands of times.
Change-Id: I3c779be5f09d82d52a3df9478c801a1963e0a5c2
2021-08-31 15:10:47 -07:00
Tony Wickham ff2171d232 Merge "Fix NPEs when swiping up from keyguard" into sc-v2-dev 2021-08-31 21:59:54 +00:00
Tony Wickham 42b0395fee Fix some taskbar stashing issues
- Don't allow long press to stash between taskbar icons
- Ensure taskbar_icon_touch_size is respected; previously it wasn't, because BubbleTextView@shouldIgnoreTouchDown() was returning true in the padding region. For taskbar, we want the whole icon size to be touchable.
- Cancel long press when passing touch slop to avoid swipe down being detected as long press

Test: long press on taskbar background, both between icons and not; swipe down on taskbar
Fixes: 198305464
Change-Id: I36f1d792e91da9a3bf57a2bef1e974b299c4e25c
2021-08-31 14:06:09 -07:00
Samuel Fufa 7f8e1c7213 Merge "[Search] Update AllApps header protection" into sc-v2-dev am: e34c2f8272
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15619042

Change-Id: Idb864ce8f0214f5a00cf03cfcffb667b3349d772
2021-08-31 18:27:27 +00:00
Samuel Fufa e34c2f8272 Merge "[Search] Update AllApps header protection" into sc-v2-dev 2021-08-31 18:08:34 +00:00
Tony Wickham b922452bf5 Fix NPEs when swiping up from keyguard
- In onRecentsAnimationCanceled
- In applyLoadPlan

Test: Lock screen from home screen, swipe up from bottom of keyguard
Fixes: 197622171
Change-Id: Ibb6b292cb99ad2f08e402c1a6e311b819c5f7d73
2021-08-31 10:02:59 -07:00
TreeHugger Robot b855314c6d Merge "Revert "Revert "Migrating all model tests to Instrumentation tests""" into sc-v2-dev am: 667bda8448
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15696989

Change-Id: Id456f71d5772f565f8ff37d2fca99d4833529e01
2021-08-31 11:04:15 +00:00
TreeHugger Robot 667bda8448 Merge "Revert "Revert "Migrating all model tests to Instrumentation tests""" into sc-v2-dev 2021-08-31 10:52:02 +00:00
Sunny Goyal 777d49062f Revert "Revert "Migrating all model tests to Instrumentation tests""
This reverts commit 7a4a30d86d.

Test: Presubmit
Reason for revert: Fixing original bug

Bug: 196825541
Change-Id: Id4b1eb24a89564d264266d305aebea52917dfcd9
2021-08-31 10:51:52 +00:00
TreeHugger Robot 05b8c10cab Merge "Enables Taskbar Edu by default." into sc-v2-dev am: a0426f9743
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15687335

Change-Id: I706c751df5240a4b5c737f2d1ac1ead8abb87230
2021-08-31 04:24:55 +00:00
TreeHugger Robot a0426f9743 Merge "Enables Taskbar Edu by default." into sc-v2-dev 2021-08-31 04:14:28 +00:00
Thiru Ramasamy 950e1be83f Merge "Add RESERVE_NEW_UI_EVENT_ID field to EventEnum interface." into sc-v2-dev am: e55c0feb43
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15669032

Change-Id: Ifb94d49a8ca3a82eab474816b0b6c0ca89b84cb1
2021-08-30 21:31:45 +00:00
TreeHugger Robot e764643f0b Merge "Launch multiple tasks at once" into sc-v2-dev am: 438f796626
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15705481

Change-Id: I79b5fc2781fd6746cdcf4ee08c7216548c2479fa
2021-08-30 21:31:39 +00:00
Thiru Ramasamy e55c0feb43 Merge "Add RESERVE_NEW_UI_EVENT_ID field to EventEnum interface." into sc-v2-dev 2021-08-30 21:22:15 +00:00
TreeHugger Robot 438f796626 Merge "Launch multiple tasks at once" into sc-v2-dev 2021-08-30 21:18:28 +00:00
Lucas Dupin 04f5147e15 Merge "Dispatch blur radius for BACKGROUND_APP state" into sc-v2-dev am: 512f95131c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15694306

Change-Id: I0b5a6ab8da1e1f31814fc5facc30aa1cb78da028
2021-08-30 20:48:57 +00:00