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
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
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
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
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
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
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
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
Lucas Dupin
512f95131c
Merge "Dispatch blur radius for BACKGROUND_APP state" into sc-v2-dev
2021-08-30 20:33:57 +00:00
Vinit Nayak
dd85a9c0a6
Launch multiple tasks at once
...
Bug: 195675206
Change-Id: I31c76e8dfec617092f73e989ce94bf0ab693d0d1
2021-08-30 19:24:43 +00:00
TreeHugger Robot
8153838957
Merge "Fix back button not touchable in SUW" into sc-v2-dev am: aa28886d7b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15717096
Change-Id: If3cda5eccbbde96cebccddaebeb9717a8b54a06a
2021-08-30 18:06:23 +00:00
TreeHugger Robot
aa28886d7b
Merge "Fix back button not touchable in SUW" into sc-v2-dev
2021-08-30 17:55:11 +00:00
Vadim Caen
ab87135b74
Merge "Disable splash screen for launches from widget." into sc-dev am: 97aaa6e5ae am: 2d08ce736b am: a5306eadf9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15685202
Change-Id: If8be62741d0b022eca4131d5eb55c7f3fa26921c
2021-08-30 17:00:28 +00:00
Vadim Caen
9a2f9f7dab
Merge "Disable splash screen for launches from widget." into sc-dev am: 97aaa6e5ae am: 84ec20af98
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15685202
Change-Id: Iaf93cd6b0f1fceba14c74264e2cc346d0cd03f03
2021-08-30 16:47:59 +00:00
Vadim Caen
a5306eadf9
Merge "Disable splash screen for launches from widget." into sc-dev am: 97aaa6e5ae am: 2d08ce736b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15685202
Change-Id: I38e187f55f2b093fbf90897716ebdfdb397fcf1d
2021-08-30 16:47:40 +00:00
Vadim Caen
84ec20af98
Merge "Disable splash screen for launches from widget." into sc-dev am: 97aaa6e5ae
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15685202
Change-Id: Ie2fcf73aaa402706eb369f41c0326c3d641974d5
2021-08-30 16:37:31 +00:00
Vadim Caen
2d08ce736b
Merge "Disable splash screen for launches from widget." into sc-dev am: 97aaa6e5ae
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15685202
Change-Id: I820df5660b67e541def5449b99047e8a7f6be077
2021-08-30 16:35:59 +00:00
Tony Wickham
906def495f
Fix back button not touchable in SUW
...
Since NavbarButtonsViewController already checks visibility of buttons before adding them to the touchableRegion, we can remove teh isThreeButton() check.
Test: run adb shell am start -a android.intent.action.MAIN -n com.google.android.setupwizard/.SetupWizardTestActivity, then press back button and ensure it gives visual feedback (even though there's no page to go back to in this test activity).
Bug: 191846922
Change-Id: I10d3d046cd2d14017638a2c71ea6b9fe228fadfc
2021-08-30 09:23:01 -07:00
Vadim Caen
97aaa6e5ae
Merge "Disable splash screen for launches from widget." into sc-dev
2021-08-30 15:56:26 +00:00
TreeHugger Robot
2d748d92e2
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev
2021-08-28 07:46:53 +00:00
TreeHugger Robot
16ae1d6948
Merge "Code cleanup from rebase" into sc-v2-dev am: 4a5d3f39fa
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15698146
Change-Id: Iec4c2dc7c0cf8ff6233eb9684baf508558d61c99
2021-08-28 01:08:01 +00:00
TreeHugger Robot
4a5d3f39fa
Merge "Code cleanup from rebase" into sc-v2-dev
2021-08-28 00:57:22 +00:00
Vinit Nayak
cdcaf7a2ed
Code cleanup from rebase
...
Bug: 195423591
Change-Id: I623d6ef46458a282e3c63cde0bdc457cb38e4d50
2021-08-27 16:28:12 -07:00
Vinit Nayak
46e9f572b6
Merge "Add GroupedTaskView to recents view only if needed" into sc-v2-dev am: 5025ecb8b6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15694969
Change-Id: I098ec8fc7f5aa0e1e6c450ce76a1bedb1581d538
2021-08-27 22:26:21 +00:00
Vinit Nayak
5025ecb8b6
Merge "Add GroupedTaskView to recents view only if needed" into sc-v2-dev
2021-08-27 22:13:20 +00:00
TreeHugger Robot
adbe29de10
Merge "Revert^3 "Enable input window rotation flag"" into sc-v2-dev am: 50c19490df
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15694002
Change-Id: Ied86f0f49ea9abd60f27b433fdabee2cec9e7932
2021-08-27 20:59:35 +00:00
TreeHugger Robot
50c19490df
Merge "Revert^3 "Enable input window rotation flag"" into sc-v2-dev
2021-08-27 20:46:59 +00:00
Vadim Tryshev
773309717d
Revert^3 "Enable input window rotation flag"
...
4fbd2f2252
Reason for revert: b/197866364
Bug: 197866364
Change-Id: I6b9be180c54ddb4999236a460c5ef4877fab535b
2021-08-27 20:46:45 +00:00
Vinit Nayak
e6d896f1bd
Add GroupedTaskView to recents view only if needed
...
Fixes: 197712963
Test: Got into the state of the exception once, but
didn't seem to repro after change.
Change-Id: Ifebf198ba0d1d0cca83935a700711fb22a8a276a
2021-08-27 12:59:26 -07:00