Vinit Nayak
9475a6d6c3
Merge "Add null check for null task in getItemInfo()" into sc-v2-dev am: a75f2ce2d2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16828919
Change-Id: Ic7c7ca77ed75c4eef40eac325d7cc1fc3e78eb1e
2022-02-16 21:43:53 +00:00
Vinit Nayak
afd9bfebe1
Merge changes from topic "presubmit-am-a8c798abe8b24577a107553295b8cd0f" into sc-v2-dev-plus-aosp am: 0dffbfcba6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16828919
Change-Id: I0e30b14ef15fde94a27369f3c76f975c8272736f
2022-02-16 21:43:27 +00:00
Vinit Nayak
a75f2ce2d2
Merge "Add null check for null task in getItemInfo()" into sc-v2-dev
2022-02-16 21:23:47 +00:00
Vinit Nayak
0dffbfcba6
Merge changes from topic "presubmit-am-a8c798abe8b24577a107553295b8cd0f" into sc-v2-dev-plus-aosp
...
* changes:
[automerge] Add null check for null task in getItemInfo() 2p: 73c6288038
Add null check for null task in getItemInfo()
2022-02-16 21:23:47 +00:00
Schneider Victor-tulias
76d56ee5a1
Re-enable bulk icon loading
...
Bug: 195674813
Test: manual
Change-Id: I8cc02cb8648797e55a83bbb184ed2cd5088a1626
2022-02-16 12:23:34 -08:00
Winson Chung
daf801c69e
[automerger skipped] Merge "Prevent lingering divider animators in AbsSwipeUpHandler" into sc-v2-dev am: 144b0504ad -s ours am: aa2161ba53 -s ours
...
am skip reason: Merged-In I078a7d0f22c2ef2ba847796ec79e740c789ce1ae with SHA-1 7faaffa56a is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16693066
Change-Id: I7af7fcbb2fca9ea87e3f73f9e976d1613768ca4a
2022-02-16 19:32:53 +00:00
Winson Chung
aa2161ba53
[automerger skipped] Merge "Prevent lingering divider animators in AbsSwipeUpHandler" into sc-v2-dev am: 144b0504ad -s ours
...
am skip reason: Merged-In I078a7d0f22c2ef2ba847796ec79e740c789ce1ae with SHA-1 7faaffa56a is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16693066
Change-Id: I1b6a0ed933a11473744d2d6b8cabffc3765bb983
2022-02-16 19:32:40 +00:00
Presubmit Automerger Backend
66dcc4be32
[automerger skipped] [automerge] Prevent lingering divider animators in AbsSwipeUpHandler 2p: 7faaffa56a am: 21e44c56bb -s ours
...
am skip reason: Merged-In I078a7d0f22c2ef2ba847796ec79e740c789ce1ae with SHA-1 26031b0dd2 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16693066
Change-Id: Ia44c549d11847f5fc38537935a0da57996f78fd5
2022-02-16 19:32:40 +00:00
Schneider Victor-tulias
ee9a54b470
Merge "Fix blank workspce icons on Launcher data refresh."
2022-02-16 19:31:33 +00:00
Winson Chung
144b0504ad
Merge "Prevent lingering divider animators in AbsSwipeUpHandler" into sc-v2-dev
2022-02-16 19:12:27 +00:00
Vinit Nayak
95686cd9be
Merge "Ensure starting split animation scale is always 1"
2022-02-16 18:49:40 +00:00
TreeHugger Robot
64162f1e05
Merge "Update TAPL object hierarchy in preparation for Taskbar TAPL tests"
2022-02-16 18:20:06 +00:00
TreeHugger Robot
b63aad9de8
Merge "Use correct text size for settings collapsed toolbar in landscape."
2022-02-16 18:01:39 +00:00
Presubmit Automerger Backend
21e44c56bb
[automerge] Prevent lingering divider animators in AbsSwipeUpHandler 2p: 7faaffa56a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16693066
Bug: 213403679
Change-Id: I628b14fb01461a103dd0cdd7168835197a28f1c5
Merged-In: I078a7d0f22c2ef2ba847796ec79e740c789ce1ae
2022-02-16 17:13:58 +00:00
Winson Chung
7faaffa56a
Prevent lingering divider animators in AbsSwipeUpHandler
...
- Refactor the util method to create the animator and track the existing
animation in AbsSwipeUpHandler to be able to cancel it if another call
to change the visbility comes in. Note that this doesn't address
the case where the launch animation overlaps with swipe up (though that
hopefully shouldn't happen in normal usage)
Bug: 213403679
Test: Tap in the gesture space while split
Change-Id: I078a7d0f22c2ef2ba847796ec79e740c789ce1ae
Merged-In: I078a7d0f22c2ef2ba847796ec79e740c789ce1ae
2022-02-16 17:13:48 +00:00
TreeHugger Robot
19fff8cb74
Merge "Do not theme icons when the original view is not themed."
2022-02-16 17:13:10 +00:00
Andras Kloczl
659cfbe1f6
Fix two panel tapl test dragging issue
...
It seems if the dragging target position's X coordinate is 0
then there is a weird bug in portrait mode.
Test: atest TwoPanelWorkspaceTest
Bug: 197631877
Change-Id: I7d8702b06e5ed396814339080f8e814e9f8a6a65
2022-02-16 13:47:50 +00:00
Winson Chung
4c23cce276
1b/ Replace removed shared lib calls with direct calls
...
Bug: 219861883
Test: Builds
Change-Id: I7831d0de14286c9fa39fed59b168535e0a70d94d
2022-02-16 06:44:37 +00:00
Tony Huang
b39ef58493
Merge "Refactor startIntentAndTaskWithLegacyTransition"
2022-02-16 03:45:02 +00:00
Brian Isganitis
860e675abe
Merge "Remove popup container drag listener on close complete."
2022-02-16 03:33:49 +00:00
Android Build Coastguard Worker
4524e1a585
Snap for 8185746 from b70131e1dd to tm-release
...
Change-Id: I4fb78db1d2876074535fd407ec8810830846a333
2022-02-16 02:09:05 +00:00
TreeHugger Robot
770bd08b6b
Merge "Reverse order of long-press menu."
2022-02-15 23:49:15 +00:00
TreeHugger Robot
940e5c7328
Merge "Cover thumbnail view instead of TaskView for split animation"
2022-02-15 23:22:32 +00:00
Brian Isganitis
6f1bd180f0
Use correct text size for settings collapsed toolbar in landscape.
...
Test: Manual
Fix: 213919433
Change-Id: I159015f425ae615d0abac076f04a100057a7237f
2022-02-15 15:12:02 -08:00
Evan Rosky
0a2f5b0baa
Merge "Switch pip to fixed-rotation in shell transitions"
2022-02-15 22:34:34 +00:00
TreeHugger Robot
da762c6ba3
Merge "Add null check for mRemoteTargetHandles for side task launch" into sc-v2-dev am: a6c2e3f263 am: 949f9763bb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16828915
Change-Id: I85480ddb976bf34f2759ddbd6ad8f8a235716ae9
2022-02-15 22:33:42 +00:00
TreeHugger Robot
949f9763bb
Merge "Add null check for mRemoteTargetHandles for side task launch" into sc-v2-dev am: a6c2e3f263
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16828915
Change-Id: Ibec0c5987cecc92827896f41031f2359010955dd
2022-02-15 22:33:08 +00:00
TreeHugger Robot
451e468678
Merge changes from topic "presubmit-am-cc24ad26c93446a690f8a34ffde58aa3" into sc-v2-dev-plus-aosp am: 3a6a78f7b0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16828915
Change-Id: Icfc37fdb5858352e77628959ed7e627712620cdd
2022-02-15 22:32:43 +00:00
TreeHugger Robot
a6c2e3f263
Merge "Add null check for mRemoteTargetHandles for side task launch" into sc-v2-dev
2022-02-15 22:12:28 +00:00
TreeHugger Robot
3a6a78f7b0
Merge changes from topic "presubmit-am-cc24ad26c93446a690f8a34ffde58aa3" into sc-v2-dev-plus-aosp
...
* changes:
[automerge] Add null check for mRemoteTargetHandles for side task launch 2p: 90e0fe3923
Add null check for mRemoteTargetHandles for side task launch
2022-02-15 22:12:27 +00:00
Schneider Victor-tulias
d6279ae641
Update TAPL object hierarchy in preparation for Taskbar TAPL tests
...
See design at: go/taskbar-tapl-tests
Test: Ran tests remotely
Bug: 215218813
Change-Id: I1c2ceac8954973ea3ae5b2f797fdfb96ba7a6ec4
2022-02-15 13:33:26 -08:00
Brian Isganitis
8350fbdc39
Reverse order of long-press menu.
...
Test: Manual
Bug: 219777079
Change-Id: I161f10a5e7491aaa3926eba714ae2b46a10a2e62
2022-02-15 13:31:40 -08:00
Brian Isganitis
1f7afc7740
Remove popup container drag listener on close complete.
...
The drag listener is never removed causing a memory leak over time.
Bug: 217162588
Test: Verified removal once drag is finished and close complete is
called.
Change-Id: Iff7bac8724e76e5dec98edaffe2d8853516f6c87
2022-02-15 13:24:09 -08:00
Jon Miranda
0aa263c5a0
Do not theme icons when the original view is not themed.
...
Fixes bug where animations uses themed icons in All Apps, where the
icons are not themed.
We want the DragView themed since all valid drop locations will have it
appear themed.
Bug: 215650713
Test: open/close an app from All Apps
Change-Id: I9969ce4921831dd12858ed9b0fe64379e9e3b188
2022-02-15 13:16:22 -08:00
Vinit Nayak
12a24dca8d
Cover thumbnail view instead of TaskView for split animation
...
Fixes: 219622592
Test: Slowed down animation and verified same as before
refactor was done.
Change-Id: Iec8dc9ea1d7925575c3a3b84e12653829a00d8dd
2022-02-15 12:41:11 -08:00
Vinit Nayak
181f4b2c40
Ensure starting split animation scale is always 1
...
Bug: 194414938
Test: After second app selected, first split placeholder
view doesn't jumpcut to arbitrary Y bounds.
Change-Id: Ic8b809f147bf38f78198ef4224d810faf5e3c5ba
2022-02-15 12:01:37 -08:00
Brian Isganitis
7b046e7e27
Merge "Add predictions row to taskbar all apps."
2022-02-15 19:24:53 +00:00
TreeHugger Robot
fccae60a24
Merge "Add Z scaling during unfold to launcher"
2022-02-15 17:49:11 +00:00
Nicolo' Mazzucato
12131a40fe
Add Z scaling during unfold to launcher
...
The unfold progresses are mapped to 0.85 - 1 range and set as a scale for launcher.
In case of multiple scale animations for workspace and hotseat, they are combined using MultiScaleProperty (e.g. opening an app while unfolding/going to all apps while unfolding). Note that this is a pretty difficult scenario to be in. If that happens, we multiply all values and bound the result between the max and min values.
Bug: 217368525
Test: atest MultiScalePropertyTest and manually
Change-Id: I6131c39f36deade0b7280c72edda2d72045344e9
2022-02-15 17:02:36 +01:00
Tony Huang
3a2d621429
Refactor startIntentAndTaskWithLegacyTransition
...
Param intentFirst is not necessary because we could use stagePosition
to ensure intent side is left or right.
Remove it and ensure start task on main stage at split side.
Bug: 218613028
Test: pass existing tests
Test: manual
Change-Id: I3b8fc74b18c4d48fe73b501be696c3d59677183b
2022-02-15 15:57:02 +08:00
Winson Chung
6fe89eafa4
Fix issue with two back buttons showing during SUW
...
- We should also hide the back button when the IME is
showing during SUW
Bug: 205803355
Test: Enter SUW, show IME and verify we hide it
Change-Id: I79b8061f01754e79508d82cdd265a97f218b13cc
2022-02-15 06:46:00 +00:00
Jon Miranda
baf1ef55ab
Revert "Clear all DragView in onSaveInstanceState"
...
This reverts commit 14d6771aae
to fix bootline regression.
Bug: 210383463
Test: manual
Change-Id: I5a0dadee59bfd6b5a164fd2ca3ecdd1885cb4134
2022-02-14 20:26:40 -08:00
TreeHugger Robot
b70131e1dd
Merge "Use config_imeDrawsImeNavBar in Launcher"
2022-02-15 02:50:21 +00:00
Android Build Coastguard Worker
fc94bd0412
Snap for 8183382 from 8c3cb4e324 to tm-release
...
Change-Id: I4412e98e211d07ffc0e1bdb346b61565beb1ef44
2022-02-15 02:09:08 +00:00
Benno Lin
978d646864
Merge "Implemnet methods to drag a icon to given Workspace cell"
2022-02-15 01:49:21 +00:00
Benno Lin
7738cac424
Implemnet methods to drag a icon to given Workspace cell
...
The CL implements public methods to drag an Icon from AllApps to a
given cell in the workspace.
Bug: 199120092
Test: Launcher3Tests:com.android.launcher3.ui.TaplTestsLauncher3#testDragAppIconToWorkspaceCell
Test: https://android-build.googleplex.com/builds/abtd/run/L89300000953052361
Test: https://android-build.googleplex.com/builds/abtd/run/L44500000953013792
Change-Id: Ife16d1f1b55b809763dd40f5afee6711049a4729
2022-02-15 01:48:45 +00:00
Jon Miranda
cd191165c4
Merge "Init FloatingIconView properties before fetching drawable. & Make sure properties are reset when recycled."
2022-02-15 01:10:54 +00:00
Xin Li
652b9b55d8
[automerger skipped] Merge SP2A.220305.012 am: 11a0454879 -s ours am: 2f4f77fdbc -s ours
...
am skip reason: Merged-In I51cb81718a489ad7568c5e05ace0b3dbc6ca5443 with SHA-1 0077caa15d is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16872102
Change-Id: Ifb4f453ee15abcbd88169810dac11164a9cc8a20
2022-02-15 00:35:24 +00:00
Xin Li
2f4f77fdbc
[automerger skipped] Merge SP2A.220305.012 am: 11a0454879 -s ours
...
am skip reason: Merged-In I51cb81718a489ad7568c5e05ace0b3dbc6ca5443 with SHA-1 0077caa15d is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16872102
Change-Id: Ife61a6188c19b497fda7df645caa549e4d90835a
2022-02-15 00:14:51 +00:00
Android Build Coastguard Worker
62d30d71f4
Merge cherrypicks of [16685428, 16688543, 16684091] into sc-v2-release.
...
Change-Id: If86b1acade6ad30900ecf35f9dc7b9afa223723e
2022-02-14 23:13:59 +00:00