5bf4f8d3fb
Merge "Adding more diags for WellbeingModel" into sc-dev am: db6b24a001 am: e162ec3d06
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14706421
Change-Id: I38f0477187ece99fe11429c9e1be039ad9ffa320
2021-05-28 03:30:28 +00:00
ab1a95b43f
Merge "Remove AllApps prediction edu" into sc-dev am: bd883ea788 am: a86a6cc097
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14682074
Change-Id: Ie3ca21e28451886c50afd2d35e504086865fd58d
2021-05-28 03:29:22 +00:00
d46df5915f
Merge "Migrate trigger logic to fullfill new UI changes for One-handed mode settings." into sc-dev am: 9bc712f267 am: 92f45a5019
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14527644
Change-Id: I35790ebb84f2ba2c0b06a8622efb945399bab598
2021-05-28 03:29:15 +00:00
e162ec3d06
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: I9322e8080e996cca74f7c22487293e0253717fbc
2021-05-28 03:05:06 +00:00
674bcd815f
Merge "Adds launcher-side support for the SmartSpace shared element transition." into sc-dev am: bdb4ed711c am: 07bf81d6b1 am: ef6f1f2446
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14471950
Change-Id: I4f7a38cc87c0720bee515407d5f4783d84a310ac
2021-05-28 02:59:44 +00:00
dc639b50b4
Merge "Add missing call to finish the home animation" into sc-dev am: 9b45bce963 am: de43d21ebb am: 94aa8376c3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14729812
Change-Id: I3f94fdfc3311c29c798f2279c15e9774310d8e2e
2021-05-28 02:59:32 +00:00
cb565470d6
Merge "Enable unpausing apps from the workspace." into sc-dev am: a07c2efdf6 am: 112ab6236f am: 1de2721289
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14704506
Change-Id: I3faaab65a17c7abf49f94119dd49007f31e3c56d
2021-05-28 02:59:27 +00:00
b56166c8f8
Merge "Update gesture nav colors and animation for dark/light theming" into sc-dev am: d50d21b602 am: e379d59e4f am: 5f8e181748
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14722085
Change-Id: I520a57c47e8068b4a56265de970ec802f56c4129
2021-05-28 02:59:17 +00:00
c8fee48cf0
Merge "Update colors for Digital Wellbeing Toast." into sc-dev am: 3558f084f3 am: 3c8f1056fd am: ced533bba0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14737897
Change-Id: I9294d475bc86e0f729d8331b08a2605d7cb2490d
2021-05-28 02:59:07 +00:00
abd9f05843
Merge "Add haptic feedback to Launcher recent apps scrolling" into sc-dev am: b1858afaf2 am: 9abd4fd726 am: 111e8a75ea
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14678275
Change-Id: Iadbc253319b13fad2dab03b4ab67e7cdbb46d57e
2021-05-28 02:59:02 +00:00
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
a86a6cc097
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: If9da4e26a2d1b292f7b5952be9807d6df055398e
2021-05-28 02:53:27 +00:00
92f45a5019
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: Ida84ecf49b830e34ac9b63183c2653dd7264dca0
2021-05-28 02:46:03 +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
ced533bba0
Merge "Update colors for Digital Wellbeing Toast." into sc-dev am: 3558f084f3 am: 3c8f1056fd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14737897
Change-Id: I2287a6528bf002b0af26c2610608ec0ed60833d4
2021-05-28 02:37:16 +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
07bf81d6b1
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: I93e7a6948103cf0986ebbb9f8f3e0987905efd61
2021-05-28 02:22:20 +00:00
de43d21ebb
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: Ie115cc2d9fb75d3c6c9437a2c8363bc5c1b75005
2021-05-28 02:22:10 +00:00
112ab6236f
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: I69c797b5aa1f55c5f4b74a165a19862c4a7f59a1
2021-05-28 02:22:06 +00:00
e379d59e4f
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: Ie7579c5e466d397709299dab5441cc4cac49a435
2021-05-28 02:21:57 +00:00
3c8f1056fd
Merge "Update colors for Digital Wellbeing Toast." into sc-dev am: 3558f084f3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14737897
Change-Id: Ibe1372b4d4bb172ace05f5b694d44a6c0ee0e737
2021-05-28 02:21:48 +00:00
9abd4fd726
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: I60e16620373ef8ef806ad18c750f3f6fd9d29158
2021-05-28 02:21:44 +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
1ba3704c5f
resolve merge conflicts of 694b667138 to sc-dev-plus-aosp
...
Test: manual
Bug: none
Change-Id: I2264c2dd3e0152186b7b14f76fa52126cbefe984
2021-05-28 00:03:31 +00:00
3b6f781c73
resolve merge conflicts of 694b667138 to sc-mainline-prod
...
Test: manual
Bug: none
Change-Id: Id03c870b62f6a6a73ddc7669a1ec2eef6ba07460
2021-05-28 00:02:53 +00:00
30adb97c13
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-05-27 22:28:57 +00: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
6b4fa91035
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev
2021-05-27 04:16:18 +00:00
64543c0dad
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I4e5ee682ed5b52d4c97164bb195934a3a03653b3
2021-05-27 02:30:30 +00:00
1817a5717f
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I6b5cd6be5d7f2b4519dc0fa589df88ea5e6b3139
2021-05-27 02:29:56 +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
TreeHugger Robot
Samuel Fufa
Jason Chang
Josh Tsuji
Winson Chung
Schneider Victor-tulias
Vinit Nayak
Jon Miranda
Bill Yi
Tony Wickham