Lucas Dupin
c9f94097e2
[automerger skipped] Constrain scroll amount am: 6d7a006302 -s ours am: 3d1143f833 -s ours am: 5be7c006de -s ours
...
am skip reason: Merged-In Ibf16fb72cf95e29ed820d5f511e764a388c93bb0 with SHA-1 b259a896f5 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15675922
Change-Id: I16f61cb5b63fc720103a0391350801fa4d08e0f0
2021-08-25 18:57:09 +00:00
Lucas Dupin
4cd4815452
[automerger skipped] Constrain scroll amount am: 6d7a006302 am: 3be13be63b -s ours am: adbc2c5b5e -s ours
...
am skip reason: Merged-In Ibf16fb72cf95e29ed820d5f511e764a388c93bb0 with SHA-1 b259a896f5 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15675922
Change-Id: Ia85e95e7c105fae059dd420ddb8b7dd064b20939
2021-08-25 18:56:58 +00:00
Lucas Dupin
5be7c006de
[automerger skipped] Constrain scroll amount am: 6d7a006302 -s ours am: 3d1143f833 -s ours
...
am skip reason: Merged-In Ibf16fb72cf95e29ed820d5f511e764a388c93bb0 with SHA-1 b259a896f5 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15675922
Change-Id: I486ac39254258fd4fb4fa85f15cf821b24829f66
2021-08-25 18:39:30 +00:00
Lucas Dupin
adbc2c5b5e
[automerger skipped] Constrain scroll amount am: 6d7a006302 am: 3be13be63b -s ours
...
am skip reason: Merged-In Ibf16fb72cf95e29ed820d5f511e764a388c93bb0 with SHA-1 b259a896f5 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15675922
Change-Id: Ic7e46b5818d99068896621a3377eef01b512f385
2021-08-25 18:38:58 +00:00
Lucas Dupin
3d1143f833
[automerger skipped] Constrain scroll amount am: 6d7a006302 -s ours
...
am skip reason: Merged-In Ibf16fb72cf95e29ed820d5f511e764a388c93bb0 with SHA-1 b259a896f5 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15675922
Change-Id: I7f99bd3e6b9c62c4c0a80c71baff56663473d8ef
2021-08-25 18:26:04 +00:00
Lucas Dupin
3be13be63b
Constrain scroll amount am: 6d7a006302
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15675922
Change-Id: I451a7ae7625aba4775ccae1a08abb26812d9344a
2021-08-25 18:24:48 +00:00
Lucas Dupin
6d7a006302
Constrain scroll amount
...
Test: scroll vertically and horizontally
Fixes: 196309367
Change-Id: Ibf16fb72cf95e29ed820d5f511e764a388c93bb0
Merged-In: Ibf16fb72cf95e29ed820d5f511e764a388c93bb0
(cherry picked from commit b259a896f5 )
2021-08-25 16:45:20 +00:00
Thales Lima
efd15ca87b
Merge "workspace: get the correct page when setting paddings" into sc-v2-dev am: 653ae0a524 am: 46eaebba86
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15640815
Change-Id: I652ac2aa0b8484e129e186d3576dfb30eb5d2eba
2021-08-25 12:33:00 +00:00
Alex Chau
4935404399
Return mSynchronouslyBoundPages as getPagesToBindSynchronously between onInitialBindCompleteand finishBindingItems
...
- Otherwise it'll return wrong currentPage value, as currentPage aren't updated until finishBindingItems
- There is still problem that wallpaper jumps to page 0 and then to the desired page: https://drive.google.com/file/d/132Sq5oRZKRclhdh1Ls1RaHNEVXJQcrxC/view?usp=sharing&resourcekey=0-l2N9NWtZ8FqfaVT0bVGVqw
Bug: 191657065
Test: manual
Change-Id: I7ec167b617a8f59865e959d9dd677256b1ab4ef9
2021-08-25 13:21:58 +01:00
Thales Lima
46eaebba86
Merge "workspace: get the correct page when setting paddings" into sc-v2-dev am: 653ae0a524
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15640815
Change-Id: I42a42640bbffa3fa4edb7f01494f9b97423be336
2021-08-25 12:16:15 +00:00
Thales Lima
653ae0a524
Merge "workspace: get the correct page when setting paddings" into sc-v2-dev
2021-08-25 11:54:13 +00:00
Alex Chau
b1c36ce938
Add feature flag to control two panel home in portrait
...
Bug: 197723099
Test: manual
Change-Id: I20d7751e09053dc90c495f398334431f390f64bf
2021-08-25 11:54:08 +01:00
Thales Lima
41f33c3cfd
workspace: get the correct page when setting paddings
...
When adding a new page to the workspace, mWorkspaceScreens doesn't
necessarily keeps the order. We should use the mScreenOrder field to get
the correct index of pages.
Fixes: 197198491
Test: drag an app from first page and paddings should be correct
Change-Id: I4f79c164391348b53b71a87d5d49cfc4d3d35e5a
2021-08-25 11:16:13 +01:00
Alex Chau
e494d08213
[automerger skipped] Merge "Fix animation problem when swipeing up app to screen edge and release" into sc-qpr1-dev am: d688120ee1 am: 495721aa68 -s ours am: f261ef2291 -s ours
...
am skip reason: skipped by user alexchau
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15640810
Change-Id: I0c48db292e6f3a52eda4087b88da1c214393fe5c
2021-08-25 09:56:10 +00:00
Alex Chau
473cd7dd26
[automerger skipped] Merge "Fix animation problem when swipeing up app to screen edge and release" into sc-qpr1-dev am: d688120ee1 -s ours am: 992fde6abd -s ours am: b7ad5aa5bd -s ours
...
am skip reason: skipped by user alexchau
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15640810
Change-Id: Iae6e1cffc31f4289f8040f3e107138a1d4e71040
2021-08-25 09:56:05 +00:00
Android Build Prod User
1299e0d062
Merge "Waiting for Launcher to settle after enabling test provider" into sc-v2-dev am: 50f928c388 am: 9479bb31f5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15670670
Change-Id: I45bb4d64f4e6c3ee6a8bd49ce4903a882d2aa4b2
2021-08-25 09:55:58 +00:00
Alex Chau
f261ef2291
[automerger skipped] Merge "Fix animation problem when swipeing up app to screen edge and release" into sc-qpr1-dev am: d688120ee1 am: 495721aa68 -s ours
...
am skip reason: skipped by user alexchau
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15640810
Change-Id: I5ddc8a9b4ef33d7badcd0ecc142d8c6a7f1b65d5
2021-08-25 09:47:51 +00:00
Alex Chau
b7ad5aa5bd
[automerger skipped] Merge "Fix animation problem when swipeing up app to screen edge and release" into sc-qpr1-dev am: d688120ee1 -s ours am: 992fde6abd -s ours
...
am skip reason: skipped by user alexchau
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15640810
Change-Id: I0fefc49ada7ec1253c463c60831d8e9214257c7f
2021-08-25 09:44:03 +00:00
Android Build Prod User
9479bb31f5
Merge "Waiting for Launcher to settle after enabling test provider" into sc-v2-dev am: 50f928c388
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15670670
Change-Id: Ifc8e143cf56a9e0e8bbd8308a7d1453c67a6db2f
2021-08-25 09:43:59 +00:00
Alex Chau
992fde6abd
[automerger skipped] Merge "Fix animation problem when swipeing up app to screen edge and release" into sc-qpr1-dev am: d688120ee1 -s ours
...
am skip reason: skipped by user alexchau
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15640810
Change-Id: Iecd7d2018a1d8fcf137a6c5a2cd8973fb3dafd03
2021-08-25 09:34:52 +00:00
Android Build Prod User
50f928c388
Merge "Waiting for Launcher to settle after enabling test provider" into sc-v2-dev
2021-08-25 09:29:39 +00:00
Alex Chau
495721aa68
Merge "Fix animation problem when swipeing up app to screen edge and release" into sc-qpr1-dev am: d688120ee1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15640810
Change-Id: I23f896fbfb500fa0e0518edee718dc7ab4f8c54b
2021-08-25 09:21:09 +00:00
Alex Chau
d688120ee1
Merge "Fix animation problem when swipeing up app to screen edge and release" into sc-qpr1-dev
2021-08-25 09:08:03 +00:00
Lucas Dupin
60d7c5ba3a
[automerger skipped] Synchronize surface transaction am: 0a2076e8d3 am: e3cf162169 -s ours am: 6ee7522c84 -s ours am: 95d5ea6dd2 -s ours
...
am skip reason: Merged-In I1636a1ded4f9dd84c54ba12239e3549b92ed7567 with SHA-1 0c70dbdc5e is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15669618
Change-Id: Ibe133a5ab87911e597bc43f39ae795293fbe5ccc
2021-08-25 04:19:30 +00:00
Lucas Dupin
1b4cf61a7b
[automerger skipped] Synchronize surface transaction am: 0a2076e8d3 am: e3cf162169 -s ours am: 6a597e7692 -s ours am: 3db090380c -s ours
...
am skip reason: Merged-In I1636a1ded4f9dd84c54ba12239e3549b92ed7567 with SHA-1 0a2076e8d3 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15669618
Change-Id: I0be94b96720911a0506dff564f6d4714ad6bd7b9
2021-08-25 04:19:24 +00:00
Lucas Dupin
4016672eec
[automerger skipped] Synchronize surface transaction am: 0a2076e8d3 am: def763740a am: 4b2878f3a8 -s ours am: 833c51d9d8 -s ours
...
am skip reason: Merged-In I1636a1ded4f9dd84c54ba12239e3549b92ed7567 with SHA-1 0c70dbdc5e is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15669618
Change-Id: I5475d5facb7fd017296f22381bd93d27421e7a58
2021-08-25 04:19:17 +00:00
Lucas Dupin
95d5ea6dd2
[automerger skipped] Synchronize surface transaction am: 0a2076e8d3 am: e3cf162169 -s ours am: 6ee7522c84 -s ours
...
am skip reason: Merged-In I1636a1ded4f9dd84c54ba12239e3549b92ed7567 with SHA-1 0c70dbdc5e is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15669618
Change-Id: Ia879c0987fb14288f782b2c7874a71bc5eba5350
2021-08-25 04:04:54 +00:00
Lucas Dupin
3db090380c
[automerger skipped] Synchronize surface transaction am: 0a2076e8d3 am: e3cf162169 -s ours am: 6a597e7692 -s ours
...
am skip reason: Merged-In I1636a1ded4f9dd84c54ba12239e3549b92ed7567 with SHA-1 0a2076e8d3 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15669618
Change-Id: I1b6e61939982309b77def5da241cca14c182a15b
2021-08-25 04:04:28 +00:00
Lucas Dupin
833c51d9d8
[automerger skipped] Synchronize surface transaction am: 0a2076e8d3 am: def763740a am: 4b2878f3a8 -s ours
...
am skip reason: Merged-In I1636a1ded4f9dd84c54ba12239e3549b92ed7567 with SHA-1 0c70dbdc5e is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15669618
Change-Id: I653a4b3174c8c2bc2d1afb00dd267a20cdb30220
2021-08-25 04:04:24 +00:00
Lucas Dupin
6ee7522c84
[automerger skipped] Synchronize surface transaction am: 0a2076e8d3 am: e3cf162169 -s ours
...
am skip reason: Merged-In I1636a1ded4f9dd84c54ba12239e3549b92ed7567 with SHA-1 0c70dbdc5e is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15669618
Change-Id: Ieaa881e53c92526f5c88d2163a405809cf701d15
2021-08-25 03:47:50 +00:00
Lucas Dupin
6a597e7692
[automerger skipped] Synchronize surface transaction am: 0a2076e8d3 am: e3cf162169 -s ours
...
am skip reason: Merged-In I1636a1ded4f9dd84c54ba12239e3549b92ed7567 with SHA-1 0a2076e8d3 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15669618
Change-Id: Ie83afa76177c1161ca83eb06030a6c4e23d201ab
2021-08-25 03:47:31 +00:00
Lucas Dupin
4b2878f3a8
Synchronize surface transaction am: 0a2076e8d3 am: def763740a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15669618
Change-Id: Ida296e0e004769f4837393f6722683b07c7804b3
2021-08-25 03:47:16 +00:00
Lucas Dupin
f9a3e6ca2c
[automerger skipped] Synchronize surface transaction am: 0a2076e8d3 am: a2074f2716 -s ours
...
am skip reason: Merged-In I1636a1ded4f9dd84c54ba12239e3549b92ed7567 with SHA-1 0c70dbdc5e is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15669618
Change-Id: Ib165310d3396e781540bb0e72807e06749de74d4
2021-08-25 03:46:47 +00:00
Lucas Dupin
e3cf162169
Synchronize surface transaction am: 0a2076e8d3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15669618
Change-Id: I494543d4183689bfcec9ed4e384be4ad3e660707
2021-08-25 03:35:43 +00:00
Lucas Dupin
a2074f2716
Synchronize surface transaction am: 0a2076e8d3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15669618
Change-Id: I245c71502f8880b555d55c93966fb6fba7af7f92
2021-08-25 03:34:59 +00:00
Lucas Dupin
def763740a
Synchronize surface transaction am: 0a2076e8d3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15669618
Change-Id: Ia8b9b012f5372cae3953e18c50c6dca031e3b848
2021-08-25 03:34:53 +00:00
Android Build Coastguard Worker
f6f4a87f12
Snap for 7671334 from 86eb1daa05 to tm-release
...
Change-Id: Icdeca605105a719ff9161c7c119d1a7dcc12d594
2021-08-25 03:07:54 +00:00
vadimt
67a11ff6a5
Waiting for Launcher to settle after enabling test provider
...
I suspect that something happens in Launcher after enabling the provider
that causes "mismatched event sequence" errors.
This CL is to verify that.
Bug: 195031154
Test: presubmit
Change-Id: Ic22df5fa631b287b580f0aaf00c84cd408cb60b0
2021-08-25 01:30:45 +00:00
Lucas Dupin
d9531d18f0
Merge "Synchronize surface transaction" into sc-v2-dev am: 45f09dc38a am: a2a018ec77
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15669516
Change-Id: I8d51cb0cc2e86f6a5e962c04db9ae79e22b37f9c
2021-08-25 01:08:18 +00:00
Lucas Dupin
a2a018ec77
Merge "Synchronize surface transaction" into sc-v2-dev am: 45f09dc38a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15669516
Change-Id: I65a6d67620148d23ad62cfbb432b5e452c537f60
2021-08-25 00:56:17 +00:00
Lucas Dupin
45f09dc38a
Merge "Synchronize surface transaction" into sc-v2-dev
2021-08-25 00:34:31 +00:00
Vinit Nayak
8b78c138d4
Implement swipe gesture for staged split in landscape
...
* Maintain task split percentages when swiping up.
* Split percentages not maintained in GroupedTaskView, however.
That is a TODO.
Bug: 181704764, 181705607
Test: Swiped up in landscape with home rotation on/off.
Portrait still works.
Change-Id: Iec62abae34f6ccadf98e2afdc9409cf3160f8223
2021-08-24 17:32:47 -07:00
Android Build Prod User
86eb1daa05
Merge "Moving OrientationTouchTransformerTest to instrumentation tests" into sc-v2-dev am: 02da47404c am: b111413d4d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15628069
Change-Id: I1a1073e54256c36f1655c3afb7e93feda789cd31
2021-08-24 23:53:13 +00:00
Android Build Prod User
b111413d4d
Merge "Moving OrientationTouchTransformerTest to instrumentation tests" into sc-v2-dev am: 02da47404c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15628069
Change-Id: Ib3a335392f4f35e18ae258b07b3f5a16e8fc2be4
2021-08-24 23:44:02 +00:00
Android Build Prod User
02da47404c
Merge "Moving OrientationTouchTransformerTest to instrumentation tests" into sc-v2-dev
2021-08-24 23:30:54 +00:00
Android Build Coastguard Worker
3239955c1c
Snap for 7670707 from 907c22ca14 to sc-v2-release
...
Change-Id: If2a1f8ac38f3ee3541430162386545a21add72b5
2021-08-24 23:07:56 +00:00
Mariia Sandrikova
02ce48601a
Change dark overview scrim color to Neutral 2 palette with 35 luminosity.
...
Bug: 197361088
Test: manual
Change-Id: I2e9a4d41c2660aa10f3f9cfe51bbee55dee917f2
Signed-off-by: Mariia Sandrikova <mariiasand@google.com >
2021-08-25 00:04:36 +01:00
Android Build Prod User
eae218278f
Merge "Add callback to ImageActionUtils for unresolved intents"
2021-08-24 22:06:06 +00:00
Android Build Prod User
f404131348
Merge "Improving diags for containers disappearing while getting children" into sc-v2-dev am: 497a6ad826 am: 05e0d86c73
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15602554
Change-Id: I1c54a2fb06c0623bd3d9aff567ab9c2599fcf3ac
2021-08-24 21:50:12 +00:00
Vinit Nayak
3166395466
Merge "Rely on presense of divider target to determine split screen state" into sc-v2-dev am: 46e0999612 am: 576d233f90
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15662829
Change-Id: I0aa9146a274ab035d4a6e8872caa7dd774997f55
2021-08-24 21:49:57 +00:00