a1f5081852
resolve merge conflicts of 694b667138 to sc-dev-plus-aosp am: 1ba3704c5f am: 22310b100c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14753367
Change-Id: Idf0dbcad594574cd251cd4986f00b3a65cd75549
2021-05-28 02:58:52 +00:00
ef6f1f2446
Merge "Adds launcher-side support for the SmartSpace shared element transition." into sc-dev am: bdb4ed711c am: 07bf81d6b1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14471950
Change-Id: Ib4867bd971b67da411ad0bc6227fc7edee627176
2021-05-28 02:37:50 +00:00
94aa8376c3
Merge "Add missing call to finish the home animation" into sc-dev am: 9b45bce963 am: de43d21ebb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14729812
Change-Id: I93dd340312b7078f9b3c3fbbf775553238168aa4
2021-05-28 02:37:38 +00:00
1de2721289
Merge "Enable unpausing apps from the workspace." into sc-dev am: a07c2efdf6 am: 112ab6236f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14704506
Change-Id: I8165be64914e8402298e3d75b69be59da8755984
2021-05-28 02:37:34 +00:00
5f8e181748
Merge "Update gesture nav colors and animation for dark/light theming" into sc-dev am: d50d21b602 am: e379d59e4f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14722085
Change-Id: I1d0c313fc75d23e3d5bc20fc7552033143e837ed
2021-05-28 02:37:25 +00:00
111e8a75ea
Merge "Add haptic feedback to Launcher recent apps scrolling" into sc-dev am: b1858afaf2 am: 9abd4fd726
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14678275
Change-Id: I1d44780c57cf6a93b84fd232485c306898edcba4
2021-05-28 02:37:11 +00:00
22310b100c
resolve merge conflicts of 694b667138 to sc-dev-plus-aosp am: 1ba3704c5f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14753367
Change-Id: Ib8467f9c2a54d55277bc57ab35ecfcd2d4022a0b
2021-05-28 02:37:02 +00:00
1349db5daf
Merge "Adding more diags for WellbeingModel" into sc-dev am: db6b24a001
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14706421
Change-Id: Ic6b3838c60b9c4040cb3a25ec1deedaaf1acd3b2
2021-05-28 02:36:55 +00:00
db6b24a001
Merge "Adding more diags for WellbeingModel" into sc-dev
2021-05-28 02:12:42 +00:00
23aa129016
Force initialize task stack callback for gesture modes on init
...
This handles an edge case where RotationTouchHelper#mMode starts as 3 button (by default)
* then changes to gesture nav.
* then onDestroy called
* then on re-initialization mMode will be gesture nav instead of 3-button
(it maintains state because of it being singleton).
The check to register the callback won't happen because we register only if previous mode and
current mode differ.
Don't rely on default value of mMode being 3 button when initializing
Bug: 181928969
Test: Followed repo steps in bug.
Restarted phone in all 3 nav modes and verified
expected quickswitch behavior
Change-Id: I381eba7417c4cde593edf4b9a34da55b50774e98
2021-05-27 19:01:09 -07:00
62769f10d7
Turn off app close flag, Revert back to R implementation.
...
Need more time to experiment with interpolated + springs based approach,
will aim for QPR instead.
Bug: 189120868
Bug: 173107751
Test: manual
Change-Id: I5698bd61c92b4fa719d82f2553125fc7f65b5969
2021-05-27 15:14:52 -07:00
b53a58288a
Merge "Remove AllApps prediction edu" into sc-dev am: bd883ea788
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14682074
Change-Id: Ic51e0fecefab7e8494d012ec4b082c2212550edc
2021-05-27 11:31:02 +00:00
bd883ea788
Merge "Remove AllApps prediction edu" into sc-dev
2021-05-27 11:02:49 +00:00
0a79857e1d
Merge "Migrate trigger logic to fullfill new UI changes for One-handed mode settings." into sc-dev am: 9bc712f267
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14527644
Change-Id: Icf6393dd187c350aa144d421721a778f7a45bcf5
2021-05-27 06:00:07 +00:00
9bc712f267
Merge "Migrate trigger logic to fullfill new UI changes for One-handed mode settings." into sc-dev
2021-05-27 05:31:13 +00:00
b7735b450e
Merge "Adds launcher-side support for the SmartSpace shared element transition." into sc-dev am: bdb4ed711c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14471950
Change-Id: I4812a5728ec39d06aab9350780f86600133555fb
2021-05-27 00:49:58 +00:00
bdb4ed711c
Merge "Adds launcher-side support for the SmartSpace shared element transition." into sc-dev
2021-05-27 00:29:01 +00:00
cfda5b44bf
Merge "Add missing call to finish the home animation" into sc-dev am: 9b45bce963
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14729812
Change-Id: I3035f8f9176c97e3b28d82d25969b9ddf3d74b33
2021-05-27 00:20:11 +00:00
9b45bce963
Merge "Add missing call to finish the home animation" into sc-dev
2021-05-27 00:00:34 +00:00
45ecd6aa7d
Add missing call to finish the home animation
...
- This reset the task view's show-screenshot state to show the
snapshot the next time the task view is visible
Fixes: 186143625
Test: Enter pip w/ autoenter pip app, swipe up to overview
Change-Id: I6a1ec3d0654a33b228f97a6009145450e72e8d48
2021-05-27 00:00:24 +00:00
3bc3f99052
Merge "Enable unpausing apps from the workspace." into sc-dev am: a07c2efdf6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14704506
Change-Id: I81fa5c0d7b9ab73d267e2e1083882854492fbaf1
2021-05-26 22:30:09 +00:00
f8d731a808
Cleanup state properly when interacting during gesture nav transition
...
When the transition is canceled (e.g. when touching the nav bar during the transition), do the following:
- Abort the RecentsView scroll including the edge effects to ensure we get onSettledOnEndTarget() immediately.
- Jump to the current gesture end target state instead of the default rest state.
Test: Swipe up and to the left and hold to go to overview from an app, then swipe up to home during the transition; ensure that the touch down goes to overview rather than home, and subsequently that the swipe is respected and goes to home
Fixes: 189142339
Change-Id: Ie1d7dd05f45ab48968df7fdfd69fa1e1dda36d06
2021-05-26 15:28:38 -07:00
a07c2efdf6
Merge "Enable unpausing apps from the workspace." into sc-dev
2021-05-26 22:24:40 +00:00
66d2c4be93
Merge "Update gesture nav colors and animation for dark/light theming" into sc-dev am: d50d21b602
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14722085
Change-Id: I0b5484ea3f985c9bc5c6c93c62f8ecee1ec2f9eb
2021-05-26 22:22:15 +00:00
d50d21b602
Merge "Update gesture nav colors and animation for dark/light theming" into sc-dev
2021-05-26 22:07:52 +00:00
9909544c8a
Update gesture nav colors and animation for dark/light theming
...
- Added light mode gesture feedback animations
- Added color resources for the fake launcher wallpaper. Also using these color resources in the feedback animations for consistency
- Using fake previous app task color in feedback animations for consistency
Bug: 169687177
Test: manual
Change-Id: I1d28212e02c2ae750ce6241b64aa90f52b827c76
2021-05-26 12:34:29 -07:00
4daf838704
Merge "Add haptic feedback to Launcher recent apps scrolling" into sc-dev am: b1858afaf2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14678275
Change-Id: I99c4b7a85069a187db77d8dc51c6dee532a0681b
2021-05-26 18:21:58 +00:00
b1858afaf2
Merge "Add haptic feedback to Launcher recent apps scrolling" into sc-dev
2021-05-26 18:05:33 +00:00
f262591ab0
Merge changes I6bf48141,I77b7a2e4 into sc-v2-dev
...
* changes:
Taskbar drag starts internal pre-drag before system drag
Let DragView use ActivityContext instead of Launcher
2021-05-26 17:13:49 +00:00
b1ef5e5c55
Add haptic feedback to Launcher recent apps scrolling
...
Add light LOW_TICK effects when the scrolling on RecentsView
snaps to a page, and a stronger TICK effect when the edges
absorb the scroll (by scrolling fast towards one of the edges).
Fix: 182382085
Test: manual
Change-Id: Ifb917ae499f73607707773f9870eb39cd6fe16ef
2021-05-26 13:37:30 +01:00
af76459cc4
Merge "Update Gesture nav tutorial." into sc-dev am: 694b667138
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14669183
Change-Id: Ide38747f0b1a2bcf6f76921fb9650ee7d188dad7
2021-05-26 09:39:53 +00:00
694b667138
Merge "Update Gesture nav tutorial." into sc-dev
2021-05-26 09:20:18 +00:00
da85cb91f1
Migrate trigger logic to fullfill new UI changes for
...
One-handed mode settings.
According to new key visual changes for One-handed mode,
modify the trigger condition to reflect the changes.
Bug: 175851783
Test: manual
Test: atest WMShellUnitTests
Change-Id: I4d734b31cafd5ce884010642b5e613c3deadfb20
2021-05-26 14:39:56 +08:00
794f2af67f
Merge "Fix launcher-in-transition-targets detection" into sc-v2-dev am: a7b9f89e5b am: 604183fb2a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14706420
Change-Id: I2491076af449891bfaf10f097cc03da3f4e86f75
2021-05-26 02:02:14 +00:00
475acf8d15
Merge "[Search] Resolve afterimage when closing allapps" into sc-dev am: 53ec9a4e06 am: 7c6515f59e am: cc14bc248c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14722826
Change-Id: I697940cc5a8d5b3f78c7cddad4abed521d50f581
2021-05-26 01:07:25 +00:00
f7231bb4fc
Merge "Set mEnableDrawingLiveTile = false in RecentsView#reset()" into sc-dev am: e81ac4f170 am: 884c22fb0d am: 60fa4f51f5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14723558
Change-Id: I9cfccbfcf8489b4b77b8b7982a7ef8c7095624ab
2021-05-26 01:06:58 +00:00
c6c7536eb8
Merge "Crossfading splashscreen if icon is themed" into sc-dev am: 55060ca7ea am: a8c8b9d88d am: 60a768ef9b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14687100
Change-Id: Idb8e2139bfa29042a372b2476d9ffda42d898240
2021-05-26 01:06:40 +00:00
a7b9f89e5b
Merge "Fix launcher-in-transition-targets detection" into sc-v2-dev
2021-05-26 01:06:36 +00:00
7c6515f59e
Merge "[Search] Resolve afterimage when closing allapps" into sc-dev am: 53ec9a4e06
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14722826
Change-Id: I78761a5b262e7c182eeeab44aebdcb46e62a7c45
2021-05-26 00:46:06 +00:00
53ec9a4e06
Merge "[Search] Resolve afterimage when closing allapps" into sc-dev
2021-05-26 00:42:58 +00:00
3ed8a62ac3
Merge "Overview - Remove the space withheld for proactive chips" into sc-dev am: d98a784d0e am: 89c8b063eb am: ec0c9a0efa
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14706422
Change-Id: I83ddcc84024cbe998b2ced55f09297f5b1d15e6b
2021-05-26 00:32:57 +00:00
59e7e7cdbb
Merge "TaskMenu in overview UI polish" into sc-dev am: b74b9d2966 am: 60aa661a0f am: a66955d335
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14604156
Change-Id: I074b42ba20c38f3ae0e985847ab0b88315c22342
2021-05-26 00:32:24 +00:00
884c22fb0d
Merge "Set mEnableDrawingLiveTile = false in RecentsView#reset()" into sc-dev am: e81ac4f170
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14723558
Change-Id: Idc93ece04633575d328b1c6575952566485e184d
2021-05-26 00:31:54 +00:00
a8c8b9d88d
Merge "Crossfading splashscreen if icon is themed" into sc-dev am: 55060ca7ea
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14687100
Change-Id: I77a11e42d2704a07c2a3a9307c79dcab6cbdb69c
2021-05-26 00:31:04 +00:00
e81ac4f170
Merge "Set mEnableDrawingLiveTile = false in RecentsView#reset()" into sc-dev
2021-05-26 00:29:11 +00:00
55060ca7ea
Merge "Crossfading splashscreen if icon is themed" into sc-dev
2021-05-26 00:26:22 +00:00
a66955d335
Merge "TaskMenu in overview UI polish" into sc-dev am: b74b9d2966 am: 60aa661a0f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14604156
Change-Id: I7e506cd9d19cd3b19136abfad234abea9174889b
2021-05-26 00:16:53 +00:00
89c8b063eb
Merge "Overview - Remove the space withheld for proactive chips" into sc-dev am: d98a784d0e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14706422
Change-Id: Idaaa1ab0c829f0e65ca6131cceda25f502914b10
2021-05-26 00:16:14 +00:00
d98a784d0e
Merge "Overview - Remove the space withheld for proactive chips" into sc-dev
2021-05-26 00:11:18 +00:00
3716f61615
Merge "TaskMenu in overview UI polish" into sc-dev am: b74b9d2966
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14604156
Change-Id: If7567a5c2639b03d95ffb1b34bf3466858d2f67d
2021-05-26 00:01:48 +00:00
Schneider Victor-tulias
Josh Tsuji
Winson Chung
TreeHugger Robot
Vinit Nayak
Jon Miranda
Samuel Fufa
Jason Chang
Tony Wickham
Lais Andrade
Evan Rosky