Commit Graph

14731 Commits

Author SHA1 Message Date
TreeHugger Robot
dfd6d8876b Merge "Force persistent taskbar all apps icon to light version." into tm-qpr-dev am: 858092151c am: f114ad9fa4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21164239

Change-Id: I1fc1ca1a807d3d23448e456dddc9de91af0fced6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-02 04:43:12 +00:00
TreeHugger Robot
f114ad9fa4 Merge "Force persistent taskbar all apps icon to light version." into tm-qpr-dev am: 858092151c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21164239

Change-Id: If868dcfa656fcba965f5bd0e9e8fbd30f3c7e951
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-02 03:45:08 +00:00
Jeremy Sim
6c40e8548e Refactor getIndexOfTask() to getTaskAttributesById()
This change is a minor cleanup to make a function more streamlined.

Bug: 265244769
Test: Manual, confirmed no regression
Change-Id: I557246a7633b10701adf75aaba6930f25e1c30aa
2023-02-02 11:27:56 +08:00
TreeHugger Robot
858092151c Merge "Force persistent taskbar all apps icon to light version." into tm-qpr-dev 2023-02-02 03:14:23 +00:00
Vinit Nayak
5a6863f14a Unify split options into single option
* No more split left/right/top, only have
splitscreen and icon shows vertical or horizontal
split windows
* Replace existing split icon for FreeForm

Fixes: 264930810
Test: Tested landscape and portrait, workspace,
overview, allapps

Change-Id: I443f93b6b01760b726bf9f024fb1324fdf0ed03c
2023-02-01 17:27:57 -08:00
Jon Miranda
cfd807e587 Merge "New taskbar threhsolds 30/100/180/300" into tm-qpr-dev am: 9443403104 am: d479d8bef5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21108227

Change-Id: I3f7c98fda1cf47bb720243bc977f203998215e40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-02 00:36:15 +00:00
Hongwei Wang
f8f5486acb Implement app icon overlay for entering PiP
Video: http://recall/-/aaaaaabFQoRHlzixHdtY/cyuEoL0G1HOS8hjfRmlyPt
Bug: 265998256
Test: turn on the flag and enter PiP, see video
Change-Id: Ia7d007ad49574a926a1e25351adf7194210729bf
2023-02-01 16:34:51 -08:00
Vinit Nayak
bc685e9a5a Merge "Fix bug with selecting a secondary task as second splitscreen app via Taskbar" into tm-qpr-dev am: 5be7cde8fa am: 98fb659aec
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21168146

Change-Id: Iae39f53172f74a8c4c6a44f46b4eb997bd2ae5b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-02 00:33:01 +00:00
Jon Miranda
d479d8bef5 Merge "New taskbar threhsolds 30/100/180/300" into tm-qpr-dev am: 9443403104
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21108227

Change-Id: I5e108c418eb5364828f0a26b88a96281458f2430
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-02 00:01:45 +00:00
Vinit Nayak
98fb659aec Merge "Fix bug with selecting a secondary task as second splitscreen app via Taskbar" into tm-qpr-dev am: 5be7cde8fa
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21168146

Change-Id: I2254294f59428f7b8e46f143f9d9778af7accd33
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-02 00:01:03 +00:00
Jon Miranda
9443403104 Merge "New taskbar threhsolds 30/100/180/300" into tm-qpr-dev 2023-02-01 23:46:40 +00:00
Vinit Nayak
5be7cde8fa Merge "Fix bug with selecting a secondary task as second splitscreen app via Taskbar" into tm-qpr-dev 2023-02-01 22:47:51 +00:00
TreeHugger Robot
da6ba58dc2 Merge "Dispatch onAnimationStart and End to maintain proper state" into tm-qpr-dev am: 8baae80cdf am: be539a692d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21150244

Change-Id: Ic6440fd9256a8a9336d13e06dcb9699a2345d03b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-01 21:32:25 +00:00
TreeHugger Robot
be539a692d Merge "Dispatch onAnimationStart and End to maintain proper state" into tm-qpr-dev am: 8baae80cdf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21150244

Change-Id: I463f969d05b6e26e8d69cd906674a9c6a92be611
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-01 20:47:39 +00:00
Stefan Andonian
1d7f703514 Migrate "isRotationAllowed" setting to LauncherPrefs.
This semi-complicated case requires use of a context in order to get the
default value. That is why it was migrated by itself.

Bug: 261635315
Test: Manually tested all the base functionality of the launcher.
Change-Id: I40d8ccd414402b55921a0a224264414d3245871b
2023-02-01 20:26:41 +00:00
Brian Isganitis
748094b185 Force persistent taskbar all apps icon to light version.
Persistent taskbar background is always dark regardless of device theme,
so we should make the icon always light for now.

Test: Manual
Fix: 262837720
Change-Id: I8f66af874e07f68e1943245e9cd49c3b3107915f
2023-02-01 12:07:58 -08:00
TreeHugger Robot
8baae80cdf Merge "Dispatch onAnimationStart and End to maintain proper state" into tm-qpr-dev 2023-02-01 18:58:56 +00:00
Nicolo' Mazzucato
06578ff8b1 Improve launcher tracing around unfold animation
This will make it explicit in a trace when we're waiting for one additional frame after onResume to start processing unfold animation related progresses

Bug: 267287854
Test: recorded trace locally after unfolding
Change-Id: I3b13842f018c6f23cbb5bc1c1cfd77e5c38dad98
2023-02-01 17:46:56 +00:00
Tony Wickham
4edce0100a Dispatch onAnimationStart and End to maintain proper state
The AnimatorPlaybackController from createLauncherStateFromSuwAnimation
does not ever get started (it's all user-driven) and thus some internal
state is not updated properly, namely mIsStashed is never set to false
even though the animation unstashes visually. This will break the first
"real" unstash animation after SUW. Thus, when the animation from SUW is
completed, we now dispatch onAnimationStart() and End() to ensure the
proper state is updated.

Test: adb shell am start -a android.intent.action.MAIN -n com.google.android.setupwizard/.SetupWizardTestActivity
  Then, skip to the end and swipe to home; ensure first app launch
  properly stashes taskbar
Fixes: 263533070
Change-Id: I9553b8a884fb84303e2e97f14b9a7051e9de4709
2023-02-01 16:18:18 +00:00
Jeremy Sim
0b4b89bdcf Fix bug with selecting a secondary task as second splitscreen app via Taskbar
This patch makes it so that the correct task will be chosen when selecting a second splitscreen app via Taskbar.

Prior to this patch, the Taskbar app selection function -- which attempts to match the tapped icon to a running TaskView -- assumed that the TaskView in question was always a solo (non-grouped) Task. This resulted in the wrong app being selected for split when the desired Task happened to be the secondary app in a pair.

Fixed by checking to see if the desired app is primary or secondary, and returning the correct Task, IconView, and ThumbnailView for the split operation.

Fixes: 265244769
Test: Manual
Change-Id: Ie1122d1b49151d70dec9711fe558fba7752b7d8e
2023-02-01 15:40:06 +08:00
Tony Huang
eb8c32e009 Merge "Fix divider hidden delay if quick swipe to home" into tm-qpr-dev am: c3cb117b01 am: 8d3e1dbed9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21152801

Change-Id: I2c36ceb9bdca9c463014ac645d92af4578d7e0d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-01 05:23:22 +00:00
Tony Huang
8d3e1dbed9 Merge "Fix divider hidden delay if quick swipe to home" into tm-qpr-dev am: c3cb117b01
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21152801

Change-Id: Ifcb574e76cad43d8163a0d602f711c21f8a0a3b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-01 04:03:13 +00:00
Tony Huang
c3cb117b01 Merge "Fix divider hidden delay if quick swipe to home" into tm-qpr-dev 2023-02-01 03:31:00 +00:00
Brian Isganitis
ad68c00288 Merge changes Iaf02a42a,I8daf3c08 into tm-qpr-dev am: 1a4eb297ee am: 69fcae1207
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21161656

Change-Id: Id2bf69377541fe94d6fbb1c8cf45eb1ae6b94057
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-01 02:52:29 +00:00
Brian Isganitis
69fcae1207 Merge changes Iaf02a42a,I8daf3c08 into tm-qpr-dev am: 1a4eb297ee
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21161656

Change-Id: Ifa1ade1b50a767bdb4385c283848f6269b51d71b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-01 02:10:03 +00:00
Brian Isganitis
1a4eb297ee Merge changes Iaf02a42a,I8daf3c08 into tm-qpr-dev
* changes:
  Enable taskbar EDU tooltip flag.
  Add settings asset to persistent Taskbar tooltip.
2023-02-01 01:34:59 +00:00
TreeHugger Robot
91ee8468f8 Merge "Fix bug with trying to split an app with itself" into tm-qpr-dev am: 5107dff0eb am: a2edf995e1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21152798

Change-Id: Ie2136fa614da3429e41d6a93ad2fe7e35a956bae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-01 00:52:34 +00:00
TreeHugger Robot
a2edf995e1 Merge "Fix bug with trying to split an app with itself" into tm-qpr-dev am: 5107dff0eb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21152798

Change-Id: I8f102c0c6a0bc14ba9a4cd47f966a656acca194a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-01 00:10:55 +00:00
TreeHugger Robot
5107dff0eb Merge "Fix bug with trying to split an app with itself" into tm-qpr-dev 2023-01-31 23:42:29 +00:00
Alex Chau
37a866f317 Merge "Clear PredictorState targets when it's re-registered" into tm-qpr-dev am: 2eacb5c601 am: 09ee64d7ec
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21150242

Change-Id: I209168e80c2efddb7a44fa7e9db00f8e207ce326
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-31 23:13:36 +00:00
Alex Chau
09ee64d7ec Merge "Clear PredictorState targets when it's re-registered" into tm-qpr-dev am: 2eacb5c601
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21150242

Change-Id: Ic043045cfc8e72e542e790f44cbb746b5f3c000b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-31 22:29:24 +00:00
Pat Manning
39ed8eecfd Merge "Make showing back for bouncer only rely on back disable status, not home and recents as well." into tm-qpr-dev am: f667823a8e am: 23aa4f8022
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21136526

Change-Id: Iec722d8821b90e3cb7021ba7d0a8d4076782f88a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-31 22:13:26 +00:00
Brian Isganitis
7881b81aa7 Add settings asset to persistent Taskbar tooltip.
Test: Manual (3 button)
Bug: 263157739
Change-Id: I8daf3c08e48ef1f9ec190af301333d279878aa59
2023-01-31 14:07:34 -08:00
Alex Chau
2eacb5c601 Merge "Clear PredictorState targets when it's re-registered" into tm-qpr-dev 2023-01-31 21:59:14 +00:00
Ats Jenk
f32f51794b Remove desktop tile from proto 1 of desktop windowing
Separate desktop tile in overview that groups together all open desktop
tasks, is only available with prototype 2. In prototype 1 of desktop
windowing, each task will show up as a separate tile.

Bug: 266711786
Test: with proto1 enabled, launch some apps, open overview and observe each
  app having their own tile
Test: with proto1 enabled, tap on any tile in overview and observe that
  task is added to existing apps on desktop
Change-Id: Ic9385ff047e0c8908a74d88f88ae5c46e0309cfd
2023-01-31 13:49:44 -08:00
Pat Manning
23aa4f8022 Merge "Make showing back for bouncer only rely on back disable status, not home and recents as well." into tm-qpr-dev am: f667823a8e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21136526

Change-Id: I116f965bdd77c65e7a82abb55e7aa0ce6dadcf19
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-31 21:21:15 +00:00
Pat Manning
f667823a8e Merge "Make showing back for bouncer only rely on back disable status, not home and recents as well." into tm-qpr-dev 2023-01-31 21:13:46 +00:00
Sunny Goyal
5fc8131b60 Merge "Introducing CellPosMapper which allows mapping between UI position and model position" into tm-qpr-dev am: 126ac14112 am: a19f661961
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21128574

Change-Id: Id2cdf2a5262def0401cd2a60fbe89044f55a9c98
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-31 19:30:30 +00:00
TreeHugger Robot
5bce035bb7 Merge changes I865871e5,Ie655de7a into tm-qpr-dev am: 6e21d310c1 am: 21c3aab5b3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21074655

Change-Id: I5485085b18ffb98354d05ead2f3c9fc802ac4d1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-31 19:29:11 +00:00
Alex Chau
e5c1edb31b Clear PredictorState targets when it's re-registered
- After SUW, registerPredictor is called for hotseat, and then BaseLauncherBinder will call bindExtraContainerItems with empty items. A subsequent registerPredictor will then be triggered by LoadTask, but handleUpdate will skip the update due to no diff in PredictorState targets. As a result, HotseatPredictionController always have no items after SUW
- Clearing PredictorState when it's re-registerted will allow the respective prediction controller to receive new prediction items that comes with the registration.

Fix: 265340241
Test: Factory reset, pass SUW, prediction items are in hotseat
Test: Reboot, prediction items are in hotseat
Change-Id: Ie6e219028e7fde42854459d34806a04052dc41ba
2023-01-31 19:24:31 +00:00
Stefan Andonian
89d425ccae Move ViewCapture On/Off controls to QuickSettings Tile. am: 526e168906 am: ba7ed6c66c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20946024

Change-Id: I15edf5c9064893e8b07b55179b2d3546f7e1af7d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-31 19:22:16 +00:00
Sunny Goyal
a19f661961 Merge "Introducing CellPosMapper which allows mapping between UI position and model position" into tm-qpr-dev am: 126ac14112
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21128574

Change-Id: Ia74b38af165fa317c4d562730652f960026912a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-31 18:47:36 +00:00
Sunny Goyal
126ac14112 Merge "Introducing CellPosMapper which allows mapping between UI position and model position" into tm-qpr-dev 2023-01-31 18:20:35 +00:00
TreeHugger Robot
21c3aab5b3 Merge changes I865871e5,Ie655de7a into tm-qpr-dev am: 6e21d310c1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21074655

Change-Id: I3253ef6d326b7b0dc2c20ee9f3679ca969bd39b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-31 18:04:58 +00:00
Stefan Andonian
ba7ed6c66c Move ViewCapture On/Off controls to QuickSettings Tile. am: 526e168906
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20946024

Change-Id: I49c50822242162c940a6bbe7ac9a6487b500823b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-31 18:02:19 +00:00
TreeHugger Robot
6e21d310c1 Merge changes I865871e5,Ie655de7a into tm-qpr-dev
* changes:
  Fixes to VoiceInteractionWindowController
  Fix TaskbarBackgroundRenderer not being applied correctly in 2 cases
2023-01-31 17:52:55 +00:00
Pat Manning
7462c2ab62 Make showing back for bouncer only rely on back disable status, not home and recents as well.
Fix: 260655218
Test: manual. Create second user, switch to three button nav, set lockscreen password, lock and show IME on lockscreen.
Change-Id: I1d874196afc24d5bae86d525a81ae199152fc750
2023-01-31 14:57:26 +00:00
Jeremy Sim
c779ae54ce Fix bug with trying to split an app with itself
This patch fixes the following user flow:
1) App is already running
2) User initiates splitscreen from Home with that app
3) User selects the same app from Taskbar or AllApps

Previously, this caused a crash because the split-from-home initiation removed the corresponding app tile, causing a null pointer exception when the same task ID was used as a split target.

Fixed by adding a null check: if the target TaskView can't be found for any reason, fall back to launching the second app via Intent instead. If the app doesn't support multi-instance, the UI will now show an attempted split, followed by the message "This app can only be opened in 1 window."

Fixes: 263041522
Fixes: 266218404
Test: Manual
Change-Id: I39ed60c9ac758ac215391f0618f44f7fcee4f32c
2023-01-31 17:58:12 +08:00
Tony Huang
36baf82028 Fix divider hidden delay if quick swipe to home
We didn't handle such case if transient bar enable and divider is
hidden by split side so it will have a delay.
Catch up it on handleNormalGestureEnd if end target is home.

Fix: 265755388
Test: manual
Test: pass existing tests
Change-Id: I09ac2a3a57c51473daf2b6887cd23bca505378f7
2023-01-31 09:03:09 +00:00
Tony Wickham
c3963a7ff4 Fixes to VoiceInteractionWindowController
- Make temporary taskbar background behind assistant non-touchable
  (fail-safe in case the window isn't removed for some reason)
- Give temporary taskbar background a different window title and
  add a couple more dump statements to help debugging
- Only show the taskbar background for persistent taskbar; transient
  taskbar can skip most of the special casing and just hide it
- Fix bug where we weren't drawing the separate taskbar background in 3
  button mode
- Fix bug where we weren't actually synchronizing
  separateWindowForTaskbarBackground with TaskbarDragLayer, since the
  former wasn't attached to the window yet; now we wait until it is
  attached before calling synchronizeNextDraw()
- Also added dump logs for TaskbarDragLayerController alpha channels

Test: manual in 3 button and gesture nav (with and without
FORCE_PERSISTENT_TASKBAR enabled)
Fixes: 243652789
Bug: 262664266

Change-Id: I865871e57dd4cb255a916317a7e5d35cfde97df5
2023-01-31 00:58:22 +00:00