Alex Chau
98d651f5f7
[automerger skipped] Merge "Only call setCurrentPage in applyLoadPlan if mCurrentPage is outdated" into sc-dev am: 464fc41df7 am: eb312ee60b -s ours
...
am skip reason: Merged-In I5f7013ce3ce4d6fe84c67123618c3bebeeffc43a with SHA-1 06c7d0cb56 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15742147
Change-Id: Icbba06a87e6c511cd4f29a960405a364d20b5cb0
2021-09-07 17:58:02 +00:00
Sunny Goyal
580d9735f3
Cleaning up fixed bug am: 1aff018e17
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15778079
Change-Id: I4f817a5b7af9c880b0900ce4f8102db9ab6f4b0e
2021-09-07 17:49:30 +00:00
Alex Chau
32d872b840
Merge "Only call setCurrentPage in applyLoadPlan if mCurrentPage is outdated" into sc-dev am: 464fc41df7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15742147
Change-Id: I13e5176c8f53e176d8e94f418828452019deb8ff
2021-09-07 17:44:44 +00:00
Alex Chau
eb312ee60b
Merge "Only call setCurrentPage in applyLoadPlan if mCurrentPage is outdated" into sc-dev am: 464fc41df7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15742147
Change-Id: I554eb8ef08418a955baa6a0f8da890b05c3115a0
2021-09-07 17:43:56 +00:00
Alex Chau
676892da5a
Merge "Only call setCurrentPage in applyLoadPlan if mCurrentPage is outdated" into sc-dev am: 464fc41df7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15742147
Change-Id: I8cdd82482645c0d0f7c710e5a519a4e5a8f25492
2021-09-07 17:43:46 +00:00
Alex Chau
a8da6905a9
Always reset focusedTask to -1 on reset
...
- Keep old focused task causes old focused task to be restored after applyLoadPlan: http://cs/android/packages/apps/Launcher3/quickstep/src/com/android/quickstep/views/RecentsView.java?l=1365
- This caused the nth task to be focused rather than the first task
- The fix is to reset focusedTask in reset when exiting overview, focused task will be set properly next time through applyLoadPlan when overview is relaunched
Fix: 199150523
Fix: 198420226
Test: TaplTestsNexus.testOverviewActions
Test: Quick switch > launch app > swipe home > swipe up to overview > snap to focused task
Test: split screen > swipe home > swipe up to overview > snap to focused task
Change-Id: I06399626ed3ee033345bd67296d79d59a98a507f
2021-09-07 18:42:39 +01:00
Alex Chau
464fc41df7
Merge "Only call setCurrentPage in applyLoadPlan if mCurrentPage is outdated" into sc-dev
2021-09-07 17:24:05 +00:00
Sunny Goyal
1aff018e17
Cleaning up fixed bug
...
Bug: 192010616
Test: Presubmit
Change-Id: I12d79726852a588cb0ee6b1aaf5ab8bccb9c3cfc
2021-09-07 12:04:44 -04:00
Android Build Coastguard Worker
428a58b0bb
Snap for 7708232 from ce10de7964 to sc-v2-release
...
Change-Id: I9fc355d99cf055dbd8cc90cf7fd22311b3ac2d7a
2021-09-06 23:09:11 +00:00
TreeHugger Robot
f0270040b7
Merge "Fix crash when hotseat icon is dragged onto Workspace" into sc-v2-dev am: ce10de7964 am: fef84dd5ea
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15771582
Change-Id: I99ee908d056147d354dce088e9eb751da3ae6f9f
2021-09-06 17:30:24 +00:00
TreeHugger Robot
fef84dd5ea
Merge "Fix crash when hotseat icon is dragged onto Workspace" into sc-v2-dev am: ce10de7964
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15771582
Change-Id: Ie51e47b2db3ab8a7f121490ef1b8a739f47542f7
2021-09-06 17:18:30 +00:00
TreeHugger Robot
ce10de7964
Merge "Fix crash when hotseat icon is dragged onto Workspace" into sc-v2-dev
2021-09-06 17:07:01 +00:00
TreeHugger Robot
663ebae20c
Merge "Snap to task from other grid row if dismissing non-snapped focused task and not enough tasks remain in current grid row to snap to." into sc-v2-dev am: 13e121e35a am: ea25f8f6e0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15771038
Change-Id: I9ad7a3a19ed7766753f7cb30714cbb2e81bc69a8
2021-09-06 16:37:55 +00:00
TreeHugger Robot
ea25f8f6e0
Merge "Snap to task from other grid row if dismissing non-snapped focused task and not enough tasks remain in current grid row to snap to." into sc-v2-dev am: 13e121e35a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15771038
Change-Id: I778473e10913718cbbf266c1d8335f8f31ae5d37
2021-09-06 16:24:23 +00:00
TreeHugger Robot
13e121e35a
Merge "Snap to task from other grid row if dismissing non-snapped focused task and not enough tasks remain in current grid row to snap to." into sc-v2-dev
2021-09-06 16:16:00 +00:00
Andras Kloczl
d888e77145
Fix crash when hotseat icon is dragged onto Workspace
...
Test: manual
Bug: 198820019
Change-Id: I53bb858feb7aad45472803b133ef3d026dd9f319
2021-09-06 16:43:01 +01:00
Alex Chau
4c946107ea
Merge "Hide overview actions when focused task is not snapped" into sc-v2-dev am: 48621c86ab am: fe7c903c20
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15771567
Change-Id: Ic32c6ddf4879a6f6ca9994c2cb75c567445adcd6
2021-09-06 15:23:05 +00:00
Alex Chau
fe7c903c20
Merge "Hide overview actions when focused task is not snapped" into sc-v2-dev am: 48621c86ab
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15771567
Change-Id: I1ec9e58426b02a3dd578c56fd7a4ca5f0a8e31dc
2021-09-06 15:09:51 +00:00
Alex Chau
48621c86ab
Merge "Hide overview actions when focused task is not snapped" into sc-v2-dev
2021-09-06 14:58:23 +00:00
Pat Manning
017dbbe715
Snap to task from other grid row if dismissing non-snapped focused task
...
and not enough tasks remain in current grid row to snap to.
Test: manual
Fix: 196200215
Change-Id: I611ffc457769d57ac0d13657fafa73a4a741f877
2021-09-06 14:53:00 +00:00
TreeHugger Robot
316ff9e86f
Merge "Remove widget panel related leftover workspace items" into sc-v2-dev am: 69fd5cb959 am: 29ad430f36
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15763353
Change-Id: Ice35fd5a9ca28916a33059ff776ff06db9acef02
2021-09-06 13:05:54 +00:00
TreeHugger Robot
29ad430f36
Merge "Remove widget panel related leftover workspace items" into sc-v2-dev am: 69fd5cb959
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15763353
Change-Id: Iecc4d2a2013a44c278a71e32e3d6c5c4737e289d
2021-09-06 12:52:54 +00:00
TreeHugger Robot
69fd5cb959
Merge "Remove widget panel related leftover workspace items" into sc-v2-dev
2021-09-06 12:39:54 +00:00
Alex Chau
61cb7c0310
Hide overview actions when focused task is not snapped
...
- Overview actions is still click able when focused task is slightly off snap position and the alpha is between 0 and 1
- This is not desired and we should simply hide the actions when focused task is not snapped
Bug: 199040817
Test: manual non grid and non-grid
Change-Id: Ifda800fc4169a05c8128e7b3802d2ab4a5af4ae8
2021-09-06 13:05:35 +01:00
Alex Chau
a643d926f1
Fix getPagesToBindSynchronously returning wrong page pairs am: 62f129b878 am: 5644b4f5fa
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15754330
Change-Id: Ia7e9f4b5861e60baf7859378c3634fb5c075e7bc
2021-09-06 11:42:23 +00:00
Alex Chau
5644b4f5fa
Fix getPagesToBindSynchronously returning wrong page pairs am: 62f129b878
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15754330
Change-Id: I78a1de91289da9cd513fedef57dd10ac42b15722
2021-09-06 11:28:21 +00:00
Andras Kloczl
929e3a2742
Remove widget panel related leftover workspace items
...
Upgrade launcher DB version and remove items with
widget panel IDs from the database.
Test: follow test instructions (in CL comment)
Bug: 198254728
Change-Id: I077a5f70ee93b7eca738b38f6b0e788d49f7ce70
2021-09-06 11:58:32 +01:00
Alex Chau
62f129b878
Fix getPagesToBindSynchronously returning wrong page pairs
...
- Use WorkSpace.getPagePair instead for accurate value
Bug: 191657065
Test: manual
Change-Id: I584f1705fb5ed2f0d2bd776eb6cf4f60c69238ac
2021-09-06 10:58:48 +01:00
András Klöczl
2a93252733
Merge "Add two extra empty pages on two panel launcher home" into sc-v2-dev am: 4926bf706a am: e19b1fb4a2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15727162
Change-Id: I7b7d7f9110dff58ea54d5bce7ae1f28e5ba91e82
2021-09-05 21:33:49 +00:00
András Klöczl
e19b1fb4a2
Merge "Add two extra empty pages on two panel launcher home" into sc-v2-dev am: 4926bf706a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15727162
Change-Id: Ie81a088fc6c945b824c6d04b02782e12a5e673d1
2021-09-05 21:19:43 +00:00
Android Build Coastguard Worker
8747970cd8
Snap for 7706110 from 725ad3c031 to sc-v2-release
...
Change-Id: Id9c8eed67a8cb96b49c5467cb3772976e4038c31
2021-09-05 21:07:59 +00:00
András Klöczl
4926bf706a
Merge "Add two extra empty pages on two panel launcher home" into sc-v2-dev
2021-09-05 21:05:53 +00:00
Andras Kloczl
408a54f2e7
Add two extra empty pages on two panel launcher home
...
Add a new screen ID for the second extra empty page
and add that new screen as well when the existing
extra empty page is added so that users can put items
on both sides of Workspace.
Test: manual
Bug: 196376162
Change-Id: I0b4f2e818407a10d8a7c032788a7bd7a61267779
2021-09-05 22:03:07 +01:00
Android Build Coastguard Worker
5eedab98b5
Snap for 7704922 from 28325b0782 to sc-v2-release
...
Change-Id: I5226ad6e9cdd1cb2a9e7bd7b0220cfe50b4d3306
2021-09-04 21:07:52 +00:00
Winson Chung
2638a542ce
Merge "Use max of corners when deciding gestures and add logs for corners" into sc-v2-dev am: 725ad3c031 am: 90fbb14627
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15758695
Change-Id: I68a794f1426f9be42f7ffc0fe2436c056c222e67
2021-09-04 16:43:41 +00:00
Winson Chung
90fbb14627
Merge "Use max of corners when deciding gestures and add logs for corners" into sc-v2-dev am: 725ad3c031
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15758695
Change-Id: I187b6298819d963ad361a8e6665c10ef41b4d43b
2021-09-04 16:27:16 +00:00
Winson Chung
725ad3c031
Merge "Use max of corners when deciding gestures and add logs for corners" into sc-v2-dev
2021-09-04 16:15:49 +00:00
TreeHugger Robot
d2b38feb6b
Merge "[Work] Fix duplicate work button issue" into sc-qpr1-dev am: 5ea5f90397 am: 28325b0782 am: 6d082a9b04
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15713050
Change-Id: I696b0e34fcfec855e6859d15073f64baab1ff7df
2021-09-04 07:13:23 +00:00
TreeHugger Robot
09f6e78bf7
Merge "[Work] Fix duplicate work button issue" into sc-qpr1-dev am: 5ea5f90397 am: a18c4311b5 am: b55d091885
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15713050
Change-Id: I872808efc510098a55715f94ac23b2ca9a6b18ad
2021-09-04 07:13:15 +00:00
TreeHugger Robot
6d082a9b04
Merge "[Work] Fix duplicate work button issue" into sc-qpr1-dev am: 5ea5f90397 am: 28325b0782
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15713050
Change-Id: I208b66dc37135ae093200e4c6295568a4eb8ae1f
2021-09-04 06:58:37 +00:00
TreeHugger Robot
b55d091885
Merge "[Work] Fix duplicate work button issue" into sc-qpr1-dev am: 5ea5f90397 am: a18c4311b5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15713050
Change-Id: Ia72457945253a965b6b524be87ea5cfc78910aff
2021-09-04 06:58:13 +00:00
TreeHugger Robot
a18c4311b5
Merge "[Work] Fix duplicate work button issue" into sc-qpr1-dev am: 5ea5f90397
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15713050
Change-Id: I08e4ee97b0bac5b3f01bf947922169b96070e442
2021-09-04 06:48:02 +00:00
TreeHugger Robot
28325b0782
Merge "[Work] Fix duplicate work button issue" into sc-qpr1-dev am: 5ea5f90397
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15713050
Change-Id: Ia1bb00f39457595b44e3240b8bd1c5eccc38cc8b
2021-09-04 06:48:02 +00:00
TreeHugger Robot
5ea5f90397
Merge "[Work] Fix duplicate work button issue" into sc-qpr1-dev
2021-09-04 06:36:28 +00:00
TreeHugger Robot
f5d425f085
Merge "Select remote apps based on stagePosition instead of hardcoded values" into sc-v2-dev am: 1e86bd0ec6 am: a0de13e939
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15758691
Change-Id: Ia888167d0d5646ff33f18dcaf8c50beec373e23f
2021-09-04 05:02:55 +00:00
TreeHugger Robot
a0de13e939
Merge "Select remote apps based on stagePosition instead of hardcoded values" into sc-v2-dev am: 1e86bd0ec6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15758691
Change-Id: I7d50882c8edf75add6c85db51031b4c8144e55a7
2021-09-04 04:46:41 +00:00
TreeHugger Robot
1e86bd0ec6
Merge "Select remote apps based on stagePosition instead of hardcoded values" into sc-v2-dev
2021-09-04 04:32:10 +00:00
Vinit Nayak
58dd901bc1
Select remote apps based on stagePosition instead of hardcoded values
...
* LauncherSplitScreenListener returns taskIds guaranteeing index 0
to be leftTop task and index 1 to be rightBottom. Use that
instead of assuming remote target index 0 will be leftTop and
index 1 is right bottom as provided
Bug: 181704764
Change-Id: I2bc358ff3c2f2d127b81e10824e2c13f3ad718df
2021-09-04 04:31:56 +00:00
Tony Wickham
d1daf73397
Call onUserUnlocked() before adding callbacks am: 5a36b919b5 am: 79ff586c10 am: 6e78f77f01
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15756866
Change-Id: Ie2c7327ed0cdfed5719ea87f9725f8cb1c0f0e99
2021-09-04 03:34:35 +00:00
Tony Wickham
a440b1cfdc
Call onUserUnlocked() before adding callbacks am: 5a36b919b5 am: eaca6fd847 am: c5bb728a00
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15756866
Change-Id: Ic6b4d345180ec65d8ad707e16eb0493cb72dfe50
2021-09-04 03:34:28 +00:00