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
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
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
5107dff0eb
Merge "Fix bug with trying to split an app with itself" into tm-qpr-dev
2023-01-31 23:42:29 +00:00
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
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
2eacb5c601
Merge "Clear PredictorState targets when it's re-registered" into tm-qpr-dev
2023-01-31 21:59:14 +00:00
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
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
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
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
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
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
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
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
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
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
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
ac906553d9
Merge "Revert "Revert "Add debug logs for hotseat disapperaed bug""" into tm-qpr-dev am: ba73400fe1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21147358
Change-Id: Ideccac6c81d2021b4b8fd4f5672c3e2bbe5ac191
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-30 23:16:40 +00:00
526e168906
Move ViewCapture On/Off controls to QuickSettings Tile.
...
Rather than use a feature flag for this feature, the on/off state will
be stored as a system setting and will be changed via a QuickSettings
tile.
Bug: b/264452057
Test: Verified that the new QuickSettings tile doesn't crash via normal
interactions (pressing, long-pressing, etc.). Also verified that
ViewCapture is turned on when the QuickSettings tile is in the enabled
state and is turned off when it is in the disabled state.
Change-Id: I90551511ac2766dc30c51a25aec2c96e3e552ce9
2023-01-30 22:51:26 +00:00
ba73400fe1
Merge "Revert "Revert "Add debug logs for hotseat disapperaed bug""" into tm-qpr-dev
2023-01-30 22:41:41 +00:00
e6068a501e
Merge "Update the gesture nav tutorial to use a mock transient taskbar" into tm-qpr-dev am: 2980adb209
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21062344
Change-Id: I390f2562dbed33d85d479fb76ae268774a54868d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-30 21:56:12 +00:00
030ba11d8c
Merge "Revert "Revert^2 "Cancel gestures on launcher destroy""" into tm-qpr-dev am: 7d346bf90b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21100567
Change-Id: I813c4ccadb4bb063a844229004c2fdab4a4f9784
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-30 21:55:56 +00:00
2980adb209
Merge "Update the gesture nav tutorial to use a mock transient taskbar" into tm-qpr-dev
2023-01-30 21:40:44 +00:00
7d346bf90b
Merge "Revert "Revert^2 "Cancel gestures on launcher destroy""" into tm-qpr-dev
2023-01-30 21:39:50 +00:00
90c8076e28
Merge "Let createSetStateAnimator return null when needed" into tm-qpr-dev am: b42c293a82
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21136525
Change-Id: I512e0ee056a57a91f781ed022f0ca6f37472800e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-30 21:38:33 +00:00
f37c33cd50
Merge "Remove ALPHA_INDEX_IME_BUTTON_NAV" into tm-qpr-dev am: d9dd02b451
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21122190
Change-Id: I0a5c3b86d81dd17258913895b34b63fe6c7a3028
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-30 21:37:14 +00:00
b42c293a82
Merge "Let createSetStateAnimator return null when needed" into tm-qpr-dev
2023-01-30 21:19:10 +00:00
669b71f5b3
Introducing CellPosMapper which allows mapping between UI position
...
and model position
Test: atest CellPosMapperTest
Bug: 188081026
Change-Id: If5c6b3df5ad240317bb535c675f6ead94084238e
2023-01-30 12:17:09 -08:00
84ba9fb5fe
Revert "Revert "Add debug logs for hotseat disapperaed bug""
...
This reverts commit f4269f01d7
2023-01-30 19:29:45 +00:00
d9dd02b451
Merge "Remove ALPHA_INDEX_IME_BUTTON_NAV" into tm-qpr-dev
2023-01-30 19:11:47 +00:00
c41fba5541
Merge "Fix issue with floating rotation button being in the wrong corner (launcher)" into tm-qpr-dev am: 0cf4c14fe0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21118628
Change-Id: I70d1c6aeafe79ae26fae148becb5455d9d7c68fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-30 18:42:12 +00:00
3e25594560
Merge "Refactor to use the PipContentOverlay" into tm-qpr-dev am: 7bf3a9bffc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21118637
Change-Id: I6e38c8f8c308d95e655de177e6c65a70e9c799f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-30 18:06:52 +00:00
0cf4c14fe0
Merge "Fix issue with floating rotation button being in the wrong corner (launcher)" into tm-qpr-dev
2023-01-30 17:54:14 +00:00
3f97668e2f
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2023-01-30 17:44:52 +00:00
7bf3a9bffc
Merge "Refactor to use the PipContentOverlay" into tm-qpr-dev
2023-01-30 17:43:45 +00:00
f6c231d575
Let createSetStateAnimator return null when needed
...
- This is to fix a regression from http://ag/20968628 . Instead of returning null and change the behavior, return null and do null checks on callers
Fix: 266109700
Test: Swipe AllApps from home on tablets, no flicker on taskbar, for gesture and 3-button
Change-Id: Ic1900ef396b00187ce9eced906c4628436481213
2023-01-30 16:59:43 +00:00
20650ab555
Merge "[Toast] Introduce SysUI's animation library to the transition manager." into tm-qpr-dev am: f70e2f0a95
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20836638
Change-Id: Ic4f5610fe4c04a5b876356d9912bf8f9eabc35b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-30 14:51:12 +00:00
f70e2f0a95
Merge "[Toast] Introduce SysUI's animation library to the transition manager." into tm-qpr-dev
2023-01-30 14:25:48 +00:00
3b67bcd0f9
Merge "Include SysUI state in stashing check" into tm-qpr-dev am: 0a381d4115
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21120299
Change-Id: Ie35303e08e9658497be60b193fd405ddcea89c63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-29 06:24:23 +00:00
0a381d4115
Merge "Include SysUI state in stashing check" into tm-qpr-dev
2023-01-29 05:57:50 +00:00
62c74f9633
Include SysUI state in stashing check
...
Fixes: 266890635
Test: Open home controls over lockscreen, go back
Change-Id: Ic486ccdc4698f53507bc56875ccebef06826a6a4
2023-01-29 05:57:39 +00:00
fd185e6402
Merge "Launch initial split from taskbar in overview app menu" into tm-qpr-dev am: d710773889
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20956773
Change-Id: I65ec9dbc148013ed6143f868398078e4f32bf4a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-28 06:26:13 +00:00
d710773889
Merge "Launch initial split from taskbar in overview app menu" into tm-qpr-dev
2023-01-28 05:25:12 +00:00
617cb7c4e1
Merge "Add divider line into taskbar." into tm-qpr-dev am: 307b6e2475
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20968623
Change-Id: Iebee8c1a98ff8f5ee1bc60cd72921fe417878dd5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-28 01:54:25 +00:00
307b6e2475
Merge "Add divider line into taskbar." into tm-qpr-dev
2023-01-28 01:22:03 +00:00
73ca7868cd
Merge "Capitalize Taskbar in EDU tooltip and update strings." into tm-qpr-dev am: 1b840c2af9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21072844
Change-Id: I672f8c70ac238aac6c013b1c60f721033693d6c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-28 01:01:00 +00:00
49dc6d2712
Launch initial split from taskbar in overview app menu
...
* Consolidated init calls in SplitSelectStateController
* Also add support to launch from taskbar all apps
* Add logic in SplitSelectStateController to know whether
or not we need to dismiss existing TaskView vs relying
on mSplitHiddenTaskView null check
* Default click handling for SplitShortcut is to start
split selection mode
Bug: 251747761
Test: Initiated split from smart actions, thumbnail app
icon, home, taskbar in overview, all apps. Saw it choose
the latest thumbnail
Change-Id: Ib4f64e619c97615af458a19a9c0efd86c92979d9
2023-01-27 16:46:14 -08:00
1b840c2af9
Merge "Capitalize Taskbar in EDU tooltip and update strings." into tm-qpr-dev
2023-01-28 00:34:15 +00:00
ece659d11a
Revert "Revert^2 "Cancel gestures on launcher destroy""
...
This reverts commit 377eb40985
2023-01-27 14:38:19 -08:00
Brian Isganitis
TreeHugger Robot
Alex Chau
Pat Manning
Sunny Goyal
Stefan Andonian
Jeremy Sim
Tony Wickham
Schneider Victor-tulias
Winson Chung
Hongwei Wang
Luca Zuccarini
Vinit Nayak
Jagrut Desai