7690d00322
Merge changes If2c82082,I03532b80 into udc-dev am: 66e7ec721b am: 1b12262d07 am: ae2aab9217
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23159151
Change-Id: I297608452156efc8a4e885e3b6a12414d9bc86ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-18 23:19:05 +00:00
f20ce8405e
Merge "Show a persistent toast when selecting desktop apps on home screen" into udc-qpr-dev am: 7377639653
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23298604
Change-Id: Id97cf7fe0e82ebddb11f2cdb1069580266d9cd98
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-18 23:18:10 +00:00
ae2aab9217
Merge changes If2c82082,I03532b80 into udc-dev am: 66e7ec721b am: 1b12262d07
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23159151
Change-Id: I31b599f7b1e3cd4a3ed6dc659ba9b3f5b258334b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-18 23:13:58 +00:00
7377639653
Merge "Show a persistent toast when selecting desktop apps on home screen" into udc-qpr-dev
2023-05-18 22:24:26 +00:00
66e7ec721b
Merge changes If2c82082,I03532b80 into udc-dev
...
* changes:
Update Lottie animations for gesture navigation tutorial to enable custom colors
Update gesture tutorial colors
2023-05-18 22:01:49 +00:00
0c1509f3f4
Merge "Fix TaplTestsTaskbar" into udc-dev am: 20c26a4a6c am: 9d642cbaec am: 2949f11b2f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23288804
Change-Id: I0be82f22a087caf0f317e1454d9ab4dc534cf201
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-18 21:43:47 +00:00
631ddfabc6
Merge "Fix widget clipping in widget back animation" into udc-dev am: 80e9a3b64e am: 43f6b63317 am: e15ad0087f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23267682
Change-Id: Ic965fe160c1caea636679cfd09253309cb4532a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-18 21:43:08 +00:00
2949f11b2f
Merge "Fix TaplTestsTaskbar" into udc-dev am: 20c26a4a6c am: 9d642cbaec
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23288804
Change-Id: I37d870ee929244d9ae3680b7897a946eb5ac1052
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-18 21:14:31 +00:00
1967be3a1f
Merge "Fix widget clipping in widget back animation" into udc-dev am: 80e9a3b64e am: 43f6b63317
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23267682
Change-Id: I234f78049ce344eb46c72cc978504a1395918eb0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-18 21:12:50 +00:00
e15ad0087f
Merge "Fix widget clipping in widget back animation" into udc-dev am: 80e9a3b64e am: 43f6b63317
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23267682
Change-Id: I7348124c4f18c5bdcf4ff2b5beff22fdea11bc01
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-18 21:11:29 +00:00
0e1642a5af
Merge "Fixing spacing between folder icon and folder itself" into udc-dev am: b9a88db27c am: 59802b88ae am: 68cfb08557
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23269297
Change-Id: Iaaa7bd06a5ec636e5f0ba0f3b413805137f8bda4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-18 20:48:54 +00:00
20c26a4a6c
Merge "Fix TaplTestsTaskbar" into udc-dev
2023-05-18 20:11:59 +00:00
8c78798b26
Merge "Fixing spacing between folder icon and folder itself" into udc-dev am: b9a88db27c am: 59802b88ae
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23269297
Change-Id: I37848a59e92af89b9c1732c28f6e2966523a9531
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-18 20:02:16 +00:00
68cfb08557
Merge "Fixing spacing between folder icon and folder itself" into udc-dev am: b9a88db27c am: 59802b88ae
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23269297
Change-Id: I8b0c2d0012cc9574ea5c904f26d0c5c6429298ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-18 20:00:31 +00:00
80e9a3b64e
Merge "Fix widget clipping in widget back animation" into udc-dev
2023-05-18 19:59:21 +00:00
0fa764fa4e
Merge "Disallow two finger gesture nav behaviors when the cursor is in the zones" into udc-qpr-dev am: 6e40620f68
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23295794
Change-Id: I8737c2ff646f16aacdd0c263029524b89255142a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-18 18:41:43 +00:00
0a6fb2c9e1
Update Lottie animations for gesture navigation tutorial to enable custom colors
...
This change introduces tokens for all the lottie animations in the
gesture navigation tutorial so that the colors can be changed to match
with the current design spec at http://shortn/_aig7n8W7rF
Flag: ENABLE_NEW_GESTURE_NAV_TUTORIAL
Bug: 279823249
Bug: 281764891
Test: Tried changing colors and verified that lottie animations changed
appropriately.
Change-Id: If2c820826603fb1cf424f5f0c97d83b195d26606
2023-05-18 10:47:44 -07:00
474f3c4e90
Update gesture tutorial colors
...
- Updated all redesigned gesture nav menu and tutorial colors to dynamic color spec
Flag: ENABLE_NEW_GESTURE_NAV_TUTORIAL
Bug: 281764891
Bug: 279823249
Test: launched tutorial menu and tutorial steps
Change-Id: I03532b80c6e14867c1374bbdf9f984c1cece9809
2023-05-18 10:47:33 -07:00
b9a88db27c
Merge "Fixing spacing between folder icon and folder itself" into udc-dev
2023-05-18 17:21:33 +00:00
9f11519936
Show a persistent toast when selecting desktop apps on home screen
...
When desktop stashed state changes, show a persistent popup on home
screen to select an app that will be launched on desktop.
Flag: persist.wm.debug.desktop_mode_2
Bug: 261234402
Test: launch an app on desktop, swipe home, observe the popup, launch an
app, observe app is launched on desktop and popup is hidden
Test: stash desktop apps by going home while on desktop, press on the
"exit desktop" button in the popup, observe popup is hidden, launch an
app, observe it is launched in fullscreen
Change-Id: I66fe0ab977fa7b2059f149d7d0ab0cf92192c967
2023-05-18 09:31:27 -07:00
18c5fcc316
Merge "Re-enable testOverviewForTablet for persistent taskbar." into udc-dev am: 4b941231ce am: d4df5d9f19 am: 60136287ec
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23267632
Change-Id: Ib31997c2a7cc86c9907e32da7c1e029c1ebfff8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-18 01:19:32 +00:00
d7c00cb8b4
Disallow two finger gesture nav behaviors when the cursor is in the zones
...
- This change addresses swipe up and quick switch from the nav bar area using two fingers
- Separate changes will be implemented in SysUI to disable two finger swipe down from the status bar area and two finger swipe edge swipe for back
Bug: 283112069
Test: manual
Change-Id: I67c7ba31e759d5693d89112fd8f37f3d2a9eaa41
2023-05-18 00:33:04 +00:00
60136287ec
Merge "Re-enable testOverviewForTablet for persistent taskbar." into udc-dev am: 4b941231ce am: d4df5d9f19
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23267632
Change-Id: I4f715c5c8a54bd2c7eecf683400f77369d4423df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-18 00:08:28 +00:00
9ee8414c97
Merge "Re-enable testOverviewForTablet for persistent taskbar." into udc-dev am: 4b941231ce am: d4df5d9f19
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23267632
Change-Id: I66b5254a7566b08268a58457603d0403c7da21ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-18 00:06:20 +00:00
4b941231ce
Merge "Re-enable testOverviewForTablet for persistent taskbar." into udc-dev
2023-05-17 23:33:59 +00:00
e3622a4b74
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev
2023-05-17 22:08:53 +00:00
f8acb23e1f
Fix widget clipping in widget back animation
...
Test: Manual
Fix: 280261814
Change-Id: I4db24ca624d50b1d860df428fdab9d591f35ac5e
2023-05-17 13:32:20 -07:00
6bb7f13ab0
Merge "Removing support for lagacy shortcuts" into udc-qpr-dev am: e607fdb2a2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23269302
Change-Id: I9841c38decf5d68230a4ab39def4c96b12570b7e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-17 20:08:00 +00:00
3ad0b1aefc
Merge "Display app icons in quick switch task view when there are no updates." into udc-dev am: e212779ffd am: 289de879b9 am: 24e27f4c7d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23270250
Change-Id: I349b949c421c3be1392d5b38f7a8b1801e322242
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-17 19:57:20 +00:00
e607fdb2a2
Merge "Removing support for lagacy shortcuts" into udc-qpr-dev
2023-05-17 19:25:45 +00:00
7d7a07590a
Merge "Display app icons in quick switch task view when there are no updates." into udc-dev am: e212779ffd am: 289de879b9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23270250
Change-Id: I1aec6d672a6d2a9e967796256dd99b7b4dff0854
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-17 19:02:27 +00:00
24e27f4c7d
Merge "Display app icons in quick switch task view when there are no updates." into udc-dev am: e212779ffd am: 289de879b9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23270250
Change-Id: Ib7d6ae9d021fbacbef9a2b55454ceaa1305db4e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-17 19:00:29 +00:00
23d752779b
Fix TaplTestsTaskbar
...
we were going to overview and clearing tasks before splitscren test are broken because of it.
Test: Presubmit
Bug: 281772186
Flag: not needed
Change-Id: I79addec3cfa0adf41581be72fed2ca3cd024a904
2023-05-17 11:51:41 -07:00
e212779ffd
Merge "Display app icons in quick switch task view when there are no updates." into udc-dev
2023-05-17 17:11:49 +00:00
e274d97fe5
Removing support for lagacy shortcuts
...
> Addition/removal of shortcus is already removed. This just
cleans up the unused code path
Bug: 275875209
Test: Updated tests
Flag: N/A
Change-Id: I8ab7f57b693f996920e50e8beecafcffab5167e9
2023-05-17 09:20:45 -07:00
e25e1b145a
Merge "DisplayController should deep compare mPerDisplayBounds" into udc-qpr-dev am: ab926886f7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23280645
Change-Id: I5373845347a55a71793ead9d77c45d2183688fe2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-17 14:34:30 +00:00
7af659da9e
DisplayController should deep compare mPerDisplayBounds
...
- In CHANGE_SUPPORTED_BOUNDS check, it uses Map.equals, but as the value is a primitive array WindowBounds[], equals check does not deep compare the arrays and may result in false negative
- One example is when fontScale changes, DisplayController re-create bounds from WindowManagerProxy, result in new WindowBounds[] created, and the shallow compare results in unexpected CHANGE_SUPPORTED_BOUNDS
Fix: 282736623
Test: DisplayControllerTest
Change-Id: I3897595c58559192b951ecfee7c9f62a07dafe1f
2023-05-17 09:40:46 +00:00
24db98d962
Merge "Only set drag shadow params if they are valid" into udc-dev am: 2e1ce4c72f am: 1275b898ba am: 4cfbf8f7fd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23249924
Change-Id: I31769f609d2f2acc6cb71ac9a2ebf2da99a99e39
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-17 08:09:15 +00:00
9c794e8888
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I728a62de1f496fda0f63f395de6b1f69159fd19b
2023-05-17 01:05:36 -07:00
fb51c85cae
Merge "Only set drag shadow params if they are valid" into udc-dev am: 2e1ce4c72f am: 1275b898ba
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23249924
Change-Id: Ice6a5f215f5fbe64b27fa4308b7c3e3e5f0d6968
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-17 06:49:25 +00:00
4cfbf8f7fd
Merge "Only set drag shadow params if they are valid" into udc-dev am: 2e1ce4c72f am: 1275b898ba
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23249924
Change-Id: Ia66ec2fa0af3980029eeb40f9119ca7450bd49fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-17 06:44:15 +00:00
2e1ce4c72f
Merge "Only set drag shadow params if they are valid" into udc-dev
2023-05-17 03:44:42 +00:00
9ed5b17d42
Merge "Stash desktop apps on home gesture or taskbar home button press" into udc-qpr-dev am: c6cbcbcd74
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23249922
Change-Id: I3605493579948356a2cd61387ad0ce85b18fbdb6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-17 00:23:20 +00:00
c6cbcbcd74
Merge "Stash desktop apps on home gesture or taskbar home button press" into udc-qpr-dev
2023-05-17 00:16:04 +00:00
479b247372
Re-enable testOverviewForTablet for persistent taskbar.
...
Will enable for transient taskbar separately.
Bug: 281812199
Test: verified passes locally
Change-Id: I25ddc8bd80b8e06e983d0add0d1b354083d1870a
2023-05-16 16:13:09 -07:00
033412a892
Display app icons in quick switch task view when there are no updates.
...
Flag: ENABLE_KEYBOARD_QUICK_SWITCH
Fix: 275629107
Test: Launched keyboard quick switch view and changed focus back and forth
Change-Id: I6ce39e7842bb04c80d49d871002ef957708a8e59
2023-05-16 23:00:46 +00:00
172266fb4e
Fixing spacing between folder icon and folder itself
...
Test: Manual
Bug: 282990506
Flag: not needed
Change-Id: I4a873495ffdf6210b496a4d7d18546dc7483e66e
2023-05-16 14:04:14 -07:00
7cd5a681f7
Stash desktop apps on home gesture or taskbar home button press
...
When we detect the home gesture or tap on home button in taskbar,
check if desktop apps are visible. If they are, signal WMShell
to stash the desktop apps.
Flag: persist.wm.debug.desktop_mode_2
Bug: 261234402
Test: have gesture nav enabled, put an app on desktop and swipe up to
home, verify toast is shown, and next app launches to desktop
Test: have 3-button nav enabled, put an app on desktop and press home,
verify toast is shown, and next app launches to desktop
Change-Id: I824e640bfafa20cb3451cbd8f035fe9dca18094f
2023-05-16 11:57:50 -07:00
40a6dbe767
Merge "Adding a new Edit Mode LauncherState" into udc-dev am: afb447ee0d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22890120
Change-Id: If9e66bf14995d4f4fa3adb045463192a6c2a0cc3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-16 18:44:43 +00:00
afb447ee0d
Merge "Adding a new Edit Mode LauncherState" into udc-dev
2023-05-16 18:42:34 +00:00
Saumya Prakash
Ats Jenk
Jagrut Desai
Treehugger Robot
Tracy Zhou
Schneider Victor-tulias
Bill Yi
Sihua Ma
TreeHugger Robot
Sunny Goyal
Alex Chau
Winson Chung
Jon Miranda
Charlie Anderson