Commit Graph

49925 Commits

Author SHA1 Message Date
Samuel Fufa 25da7f3548 Merge "Remove HotseatEduActivity from AOSP" into sc-qpr1-dev am: b5a33b2d34 am: a19a807888 am: 89bf24b7b6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15748897

Change-Id: Idea5e55ac056bf0e87e04f30e6966e28975026c5
2021-09-07 22:42:12 +00:00
Tony Wickham abaa481bfb Update taskbar color in onConfigurationChanged()
Test: Change wallpaper, ensure taskbar updates to match
Fixes: 199045474
Change-Id: I7ec8bbec8e31d2d03c09bf487ab55c86b95917e7
2021-09-07 15:39:53 -07:00
vadimt 352c0035cb Adding Winscope Launcher trace artifact
Bug: 197991109
Test: local runs
Change-Id: I8fe718570e1400e97ea107bc25e169f39257ff43
2021-09-07 15:26:52 -07:00
Samuel Fufa 8788f72cdf Merge "Remove HotseatEduActivity from AOSP" into sc-qpr1-dev am: b5a33b2d34 am: f6542d4e64
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15748897

Change-Id: Ib6e82fc073e0ad54defa3a49fc21e6fcbc0668b6
2021-09-07 22:26:19 +00:00
Samuel Fufa 89bf24b7b6 Merge "Remove HotseatEduActivity from AOSP" into sc-qpr1-dev am: b5a33b2d34 am: a19a807888
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15748897

Change-Id: Ie2042e33f14ea4a6036f853b2bed7338263d3a6e
2021-09-07 22:25:47 +00:00
Samuel Fufa a19a807888 Merge "Remove HotseatEduActivity from AOSP" into sc-qpr1-dev am: b5a33b2d34
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15748897

Change-Id: Ib6fe3e66017c71f02487b08d6e49153a968e657d
2021-09-07 22:11:44 +00:00
Samuel Fufa f6542d4e64 Merge "Remove HotseatEduActivity from AOSP" into sc-qpr1-dev am: b5a33b2d34
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15748897

Change-Id: Ib046c5f5577ad280a1efa621be30ddee409d4c51
2021-09-07 22:11:43 +00:00
TreeHugger Robot 6b37bffd5c Merge "Fixing leak in model tests" into sc-v2-dev am: d213914214 am: 8dbae16629
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15777966

Change-Id: I210bc76082112c716432dcc00ffe398722a1fe48
2021-09-07 22:06:32 +00:00
Samuel Fufa b5a33b2d34 Merge "Remove HotseatEduActivity from AOSP" into sc-qpr1-dev 2021-09-07 21:55:23 +00:00
TreeHugger Robot 8dbae16629 Merge "Fixing leak in model tests" into sc-v2-dev am: d213914214
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15777966

Change-Id: If0a45c0b0e7eec4b94676f5868590dbb123c1c75
2021-09-07 21:49:51 +00:00
Vinit Nayak 7f4f499515 Show all nav buttons when IME showing
* Keep home and recents button, and rotate back button
to be down when IME shows in 3 button task bar.
* Move IME switcher to left side of taskbar for 3 button,
keep on right side for gesture nav.

Bug: 191399224
Test: Tested RTL and LTR, gesture + button nav
with and w/o IME.

Change-Id: I7959d26986e546596e2436b8b5eb7668f44b55cf
2021-09-07 14:43:17 -07:00
TreeHugger Robot d213914214 Merge "Fixing leak in model tests" into sc-v2-dev 2021-09-07 21:31:34 +00:00
Tony Wickham 6bc2bc1a02 Merge "Fix wallpaper picker crash if folder is in hotseat" into sc-v2-dev am: 437e44810d am: 15c653c65c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15779378

Change-Id: Idcee3d0543efaad86a0dbd0409ed5f1596971369
2021-09-07 21:22:59 +00:00
Tony Wickham 15c653c65c Merge "Fix wallpaper picker crash if folder is in hotseat" into sc-v2-dev am: 437e44810d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15779378

Change-Id: Ibc3b3979c98c2c7f92e32a58ab00495e4ee4e40d
2021-09-07 21:08:23 +00:00
Tony Wickham 437e44810d Merge "Fix wallpaper picker crash if folder is in hotseat" into sc-v2-dev 2021-09-07 20:52:44 +00:00
Samuel Fufa c7defb5751 Merge "[Search] Update AllApps header protection" into sc-qpr1-dev am: 832043d1c9 am: c09a130f89 am: 86356d71bd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15748885

Change-Id: I54e8d1c25288786df5cd0237e6b67c92d6beada1
2021-09-07 20:42:17 +00:00
Samuel Fufa a28fc85ae2 Merge "[Search] Update AllApps header protection" into sc-qpr1-dev am: 832043d1c9 am: bfaf09ebef am: 85dccfb8cc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15748885

Change-Id: I9d15fdbedb3b04f58c7429242f52a73f50f4d357
2021-09-07 20:41:52 +00:00
TreeHugger Robot cf8dc2b3d1 Merge "Always reset focusedTask to -1 on reset" into sc-v2-dev am: 915f6a0995 am: f598f6d3de
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15757128

Change-Id: I6d9941df048e380a80abd8e166365ef5d9314968
2021-09-07 20:41:41 +00:00
Samuel Fufa 86356d71bd Merge "[Search] Update AllApps header protection" into sc-qpr1-dev am: 832043d1c9 am: c09a130f89
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15748885

Change-Id: I0db516a5094406cf326830a819f14851aa2debe9
2021-09-07 20:41:37 +00:00
Samuel Fufa 85dccfb8cc Merge "[Search] Update AllApps header protection" into sc-qpr1-dev am: 832043d1c9 am: bfaf09ebef
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15748885

Change-Id: Ia2acdc316d5955cdc39451e5a5ae68da0c0477e9
2021-09-07 20:29:40 +00:00
Samuel Fufa bfaf09ebef Merge "[Search] Update AllApps header protection" into sc-qpr1-dev am: 832043d1c9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15748885

Change-Id: I705d99ad29127f65726332aaa2599ad19475bb54
2021-09-07 20:26:45 +00:00
Samuel Fufa c09a130f89 Merge "[Search] Update AllApps header protection" into sc-qpr1-dev am: 832043d1c9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15748885

Change-Id: I957242db826e9aff4fc814791fece468a54c7367
2021-09-07 20:26:35 +00:00
TreeHugger Robot f598f6d3de Merge "Always reset focusedTask to -1 on reset" into sc-v2-dev am: 915f6a0995
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15757128

Change-Id: Ie77630d642ec336b71eead9522449d37ea0cf1a1
2021-09-07 20:25:38 +00:00
Samuel Fufa 832043d1c9 Merge "[Search] Update AllApps header protection" into sc-qpr1-dev 2021-09-07 19:57:31 +00:00
Sunny Goyal b45aef3f1c Fixing leak in model tests
> InstallSessionTracker is not released immediately causing large memory objects
  being held by tests

Bug: 198719724
Test: Presubmit
Change-Id: I1d19a2a498a9f255077818dc7d78422367ec1749
2021-09-07 15:34:48 -04:00
TreeHugger Robot 915f6a0995 Merge "Always reset focusedTask to -1 on reset" into sc-v2-dev 2021-09-07 19:25:44 +00:00
Tony Wickham 302eff9c84 Fix wallpaper picker crash if folder is in hotseat
Only use mWorkspaceScreens if info.container == CONTAINER_DESKTOP, otherwise assume it's in mHotseat instead.

Test: have a folder in hotseat, open wallpaper picker and can see the preview and set wallpaper
Fixes: 199179718
Change-Id: I6f1dbd8dc387783bb8b76e2bc469508c079a85f8
2021-09-07 12:04:47 -07:00
Alex Chau 6523bfd4c7 [automerger skipped] Merge "Only call setCurrentPage in applyLoadPlan if mCurrentPage is outdated" into sc-dev am: 464fc41df7 am: 32d872b840 -s ours am: 71e766dcea -s ours am: c0a44a9c7f -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: I6af6f4551958ecc947c4f1c2f1ab95cab58dc251
2021-09-07 18:33:01 +00:00
Alex Chau cc1865462b [automerger skipped] Merge "Only call setCurrentPage in applyLoadPlan if mCurrentPage is outdated" into sc-dev am: 464fc41df7 am: 32d872b840 -s ours am: a91e919440 -s ours am: b4dda15fd5 -s ours
am skip reason: Merged-In I5f7013ce3ce4d6fe84c67123618c3bebeeffc43a with SHA-1 dacb37c143 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15742147

Change-Id: I25ecac5334c06aa94011af344a652c1abd6fc56a
2021-09-07 18:32:55 +00:00
Alex Chau 11ade82992 [automerger skipped] Merge "Only call setCurrentPage in applyLoadPlan if mCurrentPage is outdated" into sc-dev am: 464fc41df7 am: 676892da5a am: 24a0615192 -s ours am: c5e4d2c989 -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: I385f4b93c4cee837b64634e4fdd077ad6821b6b6
2021-09-07 18:32:24 +00:00
Alex Chau c0a44a9c7f [automerger skipped] Merge "Only call setCurrentPage in applyLoadPlan if mCurrentPage is outdated" into sc-dev am: 464fc41df7 am: 32d872b840 -s ours am: 71e766dcea -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: I1b52a809df6c7d55a6e0b23f8f0389e897e4da1c
2021-09-07 18:13:41 +00:00
Alex Chau b4dda15fd5 [automerger skipped] Merge "Only call setCurrentPage in applyLoadPlan if mCurrentPage is outdated" into sc-dev am: 464fc41df7 am: 32d872b840 -s ours am: a91e919440 -s ours
am skip reason: Merged-In I5f7013ce3ce4d6fe84c67123618c3bebeeffc43a with SHA-1 dacb37c143 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15742147

Change-Id: I80eeed87afad4c3ccfaf4d2c21c1eb412c1b0df3
2021-09-07 18:13:27 +00:00
Alex Chau c5e4d2c989 [automerger skipped] Merge "Only call setCurrentPage in applyLoadPlan if mCurrentPage is outdated" into sc-dev am: 464fc41df7 am: 676892da5a am: 24a0615192 -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: Ic2366d5c7ff983f1640df3cc64224db9e3392788
2021-09-07 18:13:21 +00:00
Sunny Goyal ece0504e35 Cleaning up fixed bug am: 1aff018e17 am: 580d9735f3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15778079

Change-Id: I91bbc6068af6e5e3f540072aece0dbebe81bf358
2021-09-07 18:01:41 +00:00
Alex Chau 71e766dcea [automerger skipped] Merge "Only call setCurrentPage in applyLoadPlan if mCurrentPage is outdated" into sc-dev am: 464fc41df7 am: 32d872b840 -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: I0a4e0c60e734b3dcd04ea7caffca390ed793938c
2021-09-07 17:58:48 +00:00
Alex Chau a91e919440 [automerger skipped] Merge "Only call setCurrentPage in applyLoadPlan if mCurrentPage is outdated" into sc-dev am: 464fc41df7 am: 32d872b840 -s ours
am skip reason: Merged-In I5f7013ce3ce4d6fe84c67123618c3bebeeffc43a with SHA-1 dacb37c143 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15742147

Change-Id: If0fc6a945b27a091501e4290be34ed2b21dad203
2021-09-07 17:58:48 +00:00
Alex Chau 24a0615192 Merge "Only call setCurrentPage in applyLoadPlan if mCurrentPage is outdated" into sc-dev am: 464fc41df7 am: 676892da5a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15742147

Change-Id: Ie6638945a9d1ffc37b59ae6ec695a748065aff72
2021-09-07 17:58:40 +00:00
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