Cyrus Boadway
f3bd6d81c7
resolve merge conflicts of 239e0b5408 to master
...
Bug: 192467834
Change-Id: Iaa856c8606561980be3d41251a68ca87eb419def
2021-07-01 11:42:00 +00:00
Cyrus Boadway
1edaed8790
Merge "Defer onColorsChanged updates during widget-to-home animation" into sc-dev
2021-06-30 17:14:57 +00:00
Tony Wickham
69e6340c91
Merge "Fully null check mRecentsAnimationController" into sc-dev am: d61f224570 am: 4eacef2e1b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15147296
Change-Id: Ia7c8b6feadc756c24b7f877111e60da565097920
2021-06-30 15:09:01 +00:00
Tony Wickham
d61f224570
Merge "Fully null check mRecentsAnimationController" into sc-dev
2021-06-30 14:35:03 +00:00
Cyrus Boadway
0d96baec13
Defer onColorsChanged updates during widget-to-home animation
...
Color change updates recreate the view, which can interfere with the
widget-to-home return animation, specifically the GhostView's use of the
AppWidgetHostView's render node.
Deferring the application of color changes until the end of the
animation allows the widget to settle and remove the GhostView before a
color change might recreate the widget's view.
Bug: 190818220
Test: manual
Change-Id: I6552e583ebb0e4810077d4e70fe9ecb07fd5d01a
2021-06-30 13:10:02 +00:00
Alex Chau
930d85fe0f
Merge "Snap to relative position to snappd task when dismissing" into sc-v2-dev am: f35a887446 am: fa8f4be314
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15142494
Change-Id: I1c1a07020d48c77d309fe947e3717e912a447ac4
2021-06-30 10:51:37 +00:00
Alex Chau
f35a887446
Merge "Snap to relative position to snappd task when dismissing" into sc-v2-dev
2021-06-30 10:24:11 +00:00
Sunny Goyal
ec0dc1daf4
Merge "AllSet page fixes" into sc-dev am: 50f43df36e am: 9227721d72
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15147340
Change-Id: I8a0d3ed75797454b244df9b6b6650d1a27c06afd
2021-06-30 04:56:44 +00:00
Sunny Goyal
ae7ef2d5c1
Merge "AllSet page fixes" into sc-dev am: 50f43df36e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15147340
Change-Id: I7a000e357abf704bceea0bedca3407439ca50206
2021-06-30 04:42:29 +00:00
Sunny Goyal
50f43df36e
Merge "AllSet page fixes" into sc-dev
2021-06-30 04:31:34 +00:00
Lucas Dupin
4992eab5c4
Merge "Decouple zooms and blurs on app launch" into sc-dev am: c2ef0363af am: b9ac946e06
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15145970
Change-Id: I82b1ecbc83f12cf085c2cde593eaa5150cda3f40
2021-06-30 00:35:56 +00:00
Lucas Dupin
3fb19d41b6
Merge "Decouple zooms and blurs on app launch" into sc-dev am: c2ef0363af
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15145970
Change-Id: Idadf9a85d4de92e584a524ff48856cca5c81d664
2021-06-30 00:25:43 +00:00
Tony Wickham
8ae56bd4e3
Fully null check mRecentsAnimationController
...
It's already null checked everywhere else it's used.
Test: none
Fixes: 187354606
Change-Id: I50913c38b2653fe292d84fabe111ff3a3e10736d
2021-06-29 17:18:33 -07:00
Sunny Goyal
ce50b9ed83
AllSet page fixes
...
> Updating background color
> Updating activity theme to not be transparent
> Updating default accent color
> Adding an accessible target to exit
Bug: 190447132
Bug: 190136972
Bug: 190454597
Test: Manual
Change-Id: Ia8ef67ed429c062a8d1109d7f444343ec4ca09cf
2021-06-29 16:32:37 -07:00
Lucas Dupin
0f00c35268
Decouple zooms and blurs on app launch
...
We'd like to be able to disable blurs during app launch, but without
disabling zooms as well. The previous sysprop would set the depth of
BackgroundAppState to 0, when what we want is to conserve wallpaper
zoom.
Bug: 191969790
Test: adb shell setprop ro.launcher.blur.appLaunch false
Change-Id: Ie4b26096f6ac723c3981bba2829557e6cc6c733b
2021-06-29 13:02:12 -07:00
Alex Chau
ba61b98fca
Snap to relative position to snappd task when dismissing
...
- Calculate the diff to snapped page scroll and apply in onLayout, so tasks won't jump after dismiss when not in snapped position
- In grid, always keep the relateive snapped page unchanged to avoid jump
Bug: 188793333
Test: manual
Change-Id: Id11c2d700dc55440de39cc7409d06a712cedc9bc
2021-06-29 19:54:21 +01:00
Lucas Dupin
e7f8c8343a
Merge "Reset DEPTH at the end of launch animations" into sc-dev am: 789f01af7e am: 0bf6de0d5c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15130116
Change-Id: I570b17fbd9055017f11bb25a881ce003624bd6b8
2021-06-28 22:38:31 +00:00
Lucas Dupin
820b0987bd
Merge "Reset DEPTH at the end of launch animations" into sc-dev am: 789f01af7e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15130116
Change-Id: I5d4b3c70bf2201831ed25405083eaf6de1bdf92f
2021-06-28 22:28:34 +00:00
Lucas Dupin
789f01af7e
Merge "Reset DEPTH at the end of launch animations" into sc-dev
2021-06-28 22:15:21 +00:00
Lucas Dupin
9d8580bd2a
Reset DEPTH at the end of launch animations
...
This way the wallpaper won't be zoomed out if an app crashes.
Test: adb am crash <some test app>
Fixes: 191979512
Change-Id: I7576798f736d63c3e46bbac1b983b9d1a437647d
2021-06-28 11:45:14 -07:00
Alex Chau
44beff4e7f
Merge "Hide overview on fold/unfold when live tile is active." into sc-v2-dev am: ed4db64369 am: be23976a6e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15092851
Change-Id: I52b6c3bce54148d950486b87a09c6d4d4769f12d
2021-06-28 11:09:31 +00:00
Alex Chau
ed4db64369
Merge "Hide overview on fold/unfold when live tile is active." into sc-v2-dev
2021-06-28 10:38:15 +00:00
Tracy Zhou
10966ba3de
Merge "Wallpaper and non-app targets are not necessary" into sc-dev am: 540723bd05
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15085898
Change-Id: Iea021cdcc976f3ebf1b9160b833ba0bd3e4e8b5d
2021-06-26 15:10:09 +00:00
Vadim Tryshev
e3f02c4de6
Merge "Postponing CUJ start by 1 frame" into sc-dev am: e70e6a3b0b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15096971
Change-Id: Iaedc20bb98781ad97b8f72e064cb47e77e7f2975
2021-06-26 15:10:04 +00:00
Tracy Zhou
7bfde1b635
Merge "Wallpaper and non-app targets are not necessary" into sc-dev am: 540723bd05 am: 5157fc7750
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15085898
Change-Id: I6e37a9bf294f49acc08397bc5fd6f210727505a1
2021-06-25 19:38:07 +00:00
Tracy Zhou
540723bd05
Merge "Wallpaper and non-app targets are not necessary" into sc-dev
2021-06-25 19:11:57 +00:00
Vadim Tryshev
324ecf9f91
Merge "Postponing CUJ start by 1 frame" into sc-dev am: e70e6a3b0b am: 841e8c56d6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15096971
Change-Id: Ic6b8afd15635b5dd30a5f1285855c17c3b5e09dc
2021-06-25 18:36:22 +00:00
Vadim Tryshev
e70e6a3b0b
Merge "Postponing CUJ start by 1 frame" into sc-dev
2021-06-25 17:56:34 +00:00
Tracy Zhou
936f06e02c
Wallpaper and non-app targets are not necessary
...
Fixes: 191773356
Test: Swipe up to overview, launch another app, and make sure it works
Change-Id: I3f71d90687e18f38ddb17876bf7c56861bc61932
2021-06-25 10:17:50 -07:00
Winson Chung
95e819d572
Merge "Tweak live tile rotation handling" into sc-dev am: 694734f133
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15023837
Change-Id: Iae13638ac9a4a5275f6bcba51da24ee550d1a424
2021-06-25 16:21:53 +00:00
TreeHugger Robot
81b70eaed2
Merge "Update gesture navigation intent tutorial steps handling" into sc-dev am: c20f6b52ab
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15082876
Change-Id: Ic171072979dd5865f63cd46d2221dba27bf51243
2021-06-25 16:21:01 +00:00
TreeHugger Robot
6a00bf853b
Merge "Revert "Fix some touch issues during gesture nav transition"" into sc-dev am: c48d40475b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15092224
Change-Id: I5b2bb3dcb078d77bccaa1c328be81f5bfae7b565
2021-06-25 16:19:25 +00:00
Winson Chung
b76c1134fb
Merge "Tweak live tile rotation handling" into sc-dev am: 694734f133 am: e82c404eb9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15023837
Change-Id: I76ea8ff6375b04fabb66fe9f93c9fe45296797e3
2021-06-24 23:59:13 +00:00
Winson Chung
694734f133
Merge "Tweak live tile rotation handling" into sc-dev
2021-06-24 23:30:07 +00:00
TreeHugger Robot
912b75e276
Merge "Update gesture navigation intent tutorial steps handling" into sc-dev am: c20f6b52ab am: d49006efcc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15082876
Change-Id: Ie3ccf7cd40e2b7e5c8075d6753ccc74ec6ed372f
2021-06-24 23:27:27 +00:00
TreeHugger Robot
c20f6b52ab
Merge "Update gesture navigation intent tutorial steps handling" into sc-dev
2021-06-24 23:06:40 +00:00
TreeHugger Robot
f17bce9e56
Merge "Revert "Fix some touch issues during gesture nav transition"" into sc-dev am: c48d40475b am: 130d69b8bb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15092224
Change-Id: I28bc0c36585559e4e51ffc54a48b024a181641f2
2021-06-24 22:20:34 +00:00
TreeHugger Robot
c48d40475b
Merge "Revert "Fix some touch issues during gesture nav transition"" into sc-dev
2021-06-24 21:53:47 +00:00
Schneider Victor-tulias
f0c2158a5f
Update gesture navigation intent tutorial steps handling
...
Updated gesture navigation to use either a comma-separated string or a string array for defining tutorial steps.
Fixes: 184002732
Test: manual
Change-Id: Ib2f8f78ccd57100d978db799b785fd9dffe9fb7f
2021-06-24 14:05:44 -07:00
Winson Chung
46319004c1
Tweak live tile rotation handling
...
- With ag/15023409, the system will screenshot and cancel the recents
animation based on the hint provided by launcher when there is a
global config change. As such, we can remove extra handling of the
configuration change on the launcher side, and handle the cancel
with the provided snapshot.
To handle the snapshot, we need to hook into the gesture state
recents animation callbacks (which actually are of the lifecycle of
the animation and not just the gesture).
Bug: 189843542
Test: With live-tile enabled, swipe up to overview and rotate
Change-Id: If74f3fc5d47c327f9f5cca8f1f5d23b48cd3c954
2021-06-24 12:35:53 -07:00
vadimt
ca383ffdf5
Postponing CUJ start by 1 frame
...
for CUJ_APP_LAUNCH_FROM_ICON, CUJ_APP_CLOSE_TO_HOME,
CUJ_APP_LAUNCH_FROM_WIDGET and CUJ_APP_LAUNCH_FROM_RECENTS
Test: Local perfetto run
Bug: 190858586
Change-Id: I7a26d91c44a0a4c767bde3230d39a096a26d7b75
2021-06-24 11:44:57 -07:00
Zak Cohen
95d23f9a4d
Revert "Fix some touch issues during gesture nav transition"
...
This reverts commit 1351c2214d .
Reason for revert: Suspect causing test failures: https://b.corp.google.com/issues/191946109
Change-Id: Ib1b5545b3a612e89923ea06a890e4a07be9fa857
2021-06-24 18:11:36 +00:00
Pat Manning
99191fdf3f
Hide overview on fold/unfold when live tile is active.
...
Test: manual
Fix: 184846394
Change-Id: I97ae328234bf0932712c7cf3ca97813cae7c46a7
2021-06-24 16:18:03 +00:00
Tony Wickham
5435eb27c1
Merge "Fix some touch issues during gesture nav transition" into sc-dev am: 8db306f3c5 am: f8bfb7ab90
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15081302
Change-Id: Ie85cb113acf36b1bb8f343d15aadb92a9e7f4d16
2021-06-24 01:32:04 +00:00
TreeHugger Robot
3a7d29e6c0
Merge "Ensure InputConsumer is non-null in remaining cases" into sc-dev am: 862224f913 am: 89d1c77669
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15084524
Change-Id: I9694ce0382950baed5e7237e936d41830e9364ce
2021-06-24 01:31:57 +00:00
Tony Wickham
9f7eae758f
Merge "Fix some touch issues during gesture nav transition" into sc-dev am: 8db306f3c5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15081302
Change-Id: I95ef73ae3b9352e70d16ff3a97ae74abf0b69656
2021-06-24 01:18:10 +00:00
TreeHugger Robot
bd80a07da1
Merge "Ensure InputConsumer is non-null in remaining cases" into sc-dev am: 862224f913
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15084524
Change-Id: If699c0ba7e4ef2e1bcb8026de6a16ed5fc599c6d
2021-06-24 01:18:03 +00:00
Tony Wickham
8db306f3c5
Merge "Fix some touch issues during gesture nav transition" into sc-dev
2021-06-24 01:08:43 +00:00
TreeHugger Robot
862224f913
Merge "Ensure InputConsumer is non-null in remaining cases" into sc-dev
2021-06-24 01:04:18 +00:00
Tony Wickham
f64f9a14d8
Ensure InputConsumer is non-null in remaining cases
...
Anywhere that was using mResetGestureInputConsumer now uses getDefaultInputConsumer, which returns NO_OP if mResetGestureInputConsumer is null.
Test: none
Bug: 191684742
Change-Id: I1ae02b01a9629fa0830955dfe4d83c95a4759c14
2021-06-23 16:39:44 -07:00