dadfbeb68a
Merge "Fully null check mRecentsAnimationController" into sc-dev am: d61f224570 am: 597943985f am: c6192426a0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15147296
Change-Id: I80d82c56e3158ec9a43f6ba11c4a8e206cba42c4
2021-06-30 15:09:54 +00:00
50a891da7d
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: f0b607b401 -s ours am: 594422517a -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15137900
Change-Id: I33ef0f31c57732f99292ea9bf0ed0397c7a7231c
2021-06-30 15:09:40 +00:00
3bdc16ec26
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: bc4a01ee59 -s ours am: 1fcc9ced74 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15153759
Change-Id: Ic8fac2cb112dc364b3ec55090e472fb6116b5a79
2021-06-30 15:09:15 +00:00
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
c6192426a0
Merge "Fully null check mRecentsAnimationController" into sc-dev am: d61f224570 am: 597943985f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15147296
Change-Id: Ic9a36bc25a01d9ef5832918c9898a362fa1bf6c5
2021-06-30 15:07:00 +00:00
594422517a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: f0b607b401 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15137900
Change-Id: Ie37e02e1c298a9f1b7f115d9efcd42c943c2213d
2021-06-30 15:06:22 +00:00
1fcc9ced74
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: bc4a01ee59 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15153759
Change-Id: I39d3b6d23c160e59d3c9d1970407cec9cc680fea
2021-06-30 15:00:49 +00:00
d95f68c86a
Merge "Correct color extraction on App Widget drop."
2021-06-30 14:57:37 +00:00
597943985f
Merge "Fully null check mRecentsAnimationController" into sc-dev am: d61f224570
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15147296
Change-Id: I88d51d664b00ec21145281782612045fc6297663
2021-06-30 14:54:49 +00:00
4eacef2e1b
Merge "Fully null check mRecentsAnimationController" into sc-dev am: d61f224570
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15147296
Change-Id: Ie6cdb362ed480068fc1793ee454c3a3648a64061
2021-06-30 14:53:54 +00:00
f0b607b401
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev
2021-06-30 14:48:14 +00:00
bc4a01ee59
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev
2021-06-30 14:46:04 +00:00
d61f224570
Merge "Fully null check mRecentsAnimationController" into sc-dev
2021-06-30 14:35:03 +00:00
2881801c7b
Correct color extraction on App Widget drop.
...
Disable color extraction on drop until the workspace is back to its
normal size, then re-enable it and force re-coloring. This needs to
happen if the drop is on the workspace, but also if the drop is on the
secondary target.
Fix: 192354264
Test: Manual, see bug for details.
Change-Id: If573641e4bb5a98ed6b5008e00f70f4bbe492c24
2021-06-30 14:13:56 +01:00
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
fa8f4be314
Merge "Snap to relative position to snappd task when dismissing" into sc-v2-dev am: f35a887446
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15142494
Change-Id: Icc1f598eb8a39f788c87b61dc99d4c7a12e07ef3
2021-06-30 10:36:33 +00:00
f35a887446
Merge "Snap to relative position to snappd task when dismissing" into sc-v2-dev
2021-06-30 10:24:11 +00:00
e463d19173
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I282f1e29562ee9f190c054db49af69ad90394b2d
2021-06-30 08:20:10 +00:00
f0353b5a9a
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I1fae17d8a50cccf65bb432eef39ac7cbc77f5fd8
2021-06-30 08:17:46 +00:00
ffe14f0a5e
Merge "Allow two lines max for text view in system shortcuts." into sc-dev am: d4b713c7ae am: ec448c10dd am: 868fa96dad
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15135388
Change-Id: I8910ac54915ae8c932ab037aa16e66d3b7e6431c
2021-06-30 05:36:44 +00:00
35b1fc6af6
Merge "Allow two lines max for text view in system shortcuts." into sc-dev am: d4b713c7ae am: a305214073 am: 8bf82f25bc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15135388
Change-Id: I140591c7c9d7932f8439fdde73aa39380c0a7042
2021-06-30 05:36:37 +00:00
868fa96dad
Merge "Allow two lines max for text view in system shortcuts." into sc-dev am: d4b713c7ae am: ec448c10dd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15135388
Change-Id: I72f72786bd76d45d37afd048c5c5e66e4242ece9
2021-06-30 05:27:08 +00:00
8bf82f25bc
Merge "Allow two lines max for text view in system shortcuts." into sc-dev am: d4b713c7ae am: a305214073
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15135388
Change-Id: I1b4f0d02726f990671fe15dbc4ac23da197e5be5
2021-06-30 05:22:25 +00:00
aad6509c09
Merge "Allow two lines max for text view in system shortcuts." into sc-dev am: d4b713c7ae am: 8703ceb1a6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15135388
Change-Id: Iab1b813dd81bb7a37178c47466f356cacf74d50c
2021-06-30 05:21:40 +00:00
ec448c10dd
Merge "Allow two lines max for text view in system shortcuts." into sc-dev am: d4b713c7ae
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15135388
Change-Id: I9c471e724cdf171e87a97b42622b843258e87788
2021-06-30 05:12:26 +00:00
8703ceb1a6
Merge "Allow two lines max for text view in system shortcuts." into sc-dev am: d4b713c7ae
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15135388
Change-Id: Ibc5d7a5f683d2551fdd03b8d0335e7d93847d9e3
2021-06-30 05:11:45 +00:00
a305214073
Merge "Allow two lines max for text view in system shortcuts." into sc-dev am: d4b713c7ae
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15135388
Change-Id: I023a9d099fb0f57aa15540d4d4fe00366b3df315
2021-06-30 05:10:20 +00:00
bbccce3997
Merge "AllSet page fixes" into sc-dev am: 50f43df36e am: 895dd1cb87 am: ea895791cc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15147340
Change-Id: Ia607c7165cd1cb2a36066206cdaf955eff5899be
2021-06-30 05:06:30 +00:00
bcc192fe99
Merge "AllSet page fixes" into sc-dev am: 50f43df36e am: ae7ef2d5c1 am: c78573cd00
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15147340
Change-Id: Icecb872a505d0d7dfa8e3b97d3cb80744017242b
2021-06-30 05:06:05 +00:00
d4b713c7ae
Merge "Allow two lines max for text view in system shortcuts." into sc-dev
2021-06-30 05:02:14 +00:00
ea895791cc
Merge "AllSet page fixes" into sc-dev am: 50f43df36e am: 895dd1cb87
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15147340
Change-Id: If7067d835f61acee0e666892cd4f3e0d8802d4a4
2021-06-30 04:57:31 +00:00
c78573cd00
Merge "AllSet page fixes" into sc-dev am: 50f43df36e am: ae7ef2d5c1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15147340
Change-Id: I3892a50bfedebf111876056b3720729086434941
2021-06-30 04:57:16 +00:00
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
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
478c2bfc61
Merge "Rebind recycler views if launcher activity restarted" into sc-dev am: 77c532d799 am: 77b58b8740 am: b0344bd1f6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15136464
Change-Id: I552df2be5b74105c25d2e3ce0d2808a6ce86f9c5
2021-06-30 04:42:11 +00:00
c27411b9cf
Merge "Rebind recycler views if launcher activity restarted" into sc-dev am: 77c532d799 am: 6eee4e4f3d am: 02b5d2fb12
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15136464
Change-Id: I075883445acd72dd6f1bef64f7295a5edcf7a21a
2021-06-30 04:41:58 +00:00
9227721d72
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: I70d67df56f081297722bbe761a7c0eda933aaae4
2021-06-30 04:41:39 +00:00
895dd1cb87
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: Ibcebfcd6fa76e425bcc7c371a30ca6b5bba9df94
2021-06-30 04:40:41 +00:00
50f43df36e
Merge "AllSet page fixes" into sc-dev
2021-06-30 04:31:34 +00:00
b0344bd1f6
Merge "Rebind recycler views if launcher activity restarted" into sc-dev am: 77c532d799 am: 77b58b8740
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15136464
Change-Id: Ic1ba1f2ef3d2de5086ec09e68db1644e100ecfcf
2021-06-30 04:30:43 +00:00
02b5d2fb12
Merge "Rebind recycler views if launcher activity restarted" into sc-dev am: 77c532d799 am: 6eee4e4f3d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15136464
Change-Id: I15b6f462f604473e50f9244a1716937309e38130
2021-06-30 04:30:15 +00:00
195e547033
Merge "Rebind recycler views if launcher activity restarted" into sc-dev am: 77c532d799 am: b61d9e30ac
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15136464
Change-Id: Ifd5f0692b729169d74839477e96ca0cb00a8fc1a
2021-06-30 04:29:48 +00:00
6eee4e4f3d
Merge "Rebind recycler views if launcher activity restarted" into sc-dev am: 77c532d799
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15136464
Change-Id: Iaa257f243aac6c2378a89102ab9bbae2d412d500
2021-06-30 04:20:04 +00:00
b61d9e30ac
Merge "Rebind recycler views if launcher activity restarted" into sc-dev am: 77c532d799
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15136464
Change-Id: I7bdff15726aafddf0a1e27535cd4e3c1e2aba83b
2021-06-30 04:19:08 +00:00
77b58b8740
Merge "Rebind recycler views if launcher activity restarted" into sc-dev am: 77c532d799
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15136464
Change-Id: I69456796cf98fe16f671886208ab4b6fc0f6cd65
2021-06-30 04:19:05 +00:00
77c532d799
Merge "Rebind recycler views if launcher activity restarted" into sc-dev
2021-06-30 04:00:23 +00:00
8eda77a2dd
Merge "Set elevation of popup and arrow to match. This ensures no shadow overlap." into sc-dev am: 26a485bb2a am: b6efb6e2b5 am: 3905120d41
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15147164
Change-Id: I35e8271aa43f448c2e9a30a29a2565a91b1e3963
2021-06-30 03:27:21 +00:00
19f375ecf4
Merge "Add split_display device profile." into sc-dev am: 8acc1ad025 am: db36b95d56 am: 127604b3e1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15144182
Change-Id: I4b312cba7bc438fce9b6a16d6cddc231a76f5a55
2021-06-30 03:27:16 +00:00
cf3343935d
Merge "Set elevation of popup and arrow to match. This ensures no shadow overlap." into sc-dev am: 26a485bb2a am: 2178eedc6a am: 972ee06cdd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15147164
Change-Id: Ifb381a185753e1655908f55cfd1bebc5be1f0c08
2021-06-30 03:27:05 +00:00
e55ce20533
Merge "Add split_display device profile." into sc-dev am: 8acc1ad025 am: 5ffad73b6e am: 7642296862
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15144182
Change-Id: Ibcd570216d93747aa15dc731e616ea2563718d69
2021-06-30 03:26:59 +00:00
Tony Wickham
TreeHugger Robot
Pierre Barbier de Reuille
Alex Chau
Bill Yi
Jonathan Miranda
Sunny Goyal
Hyunyoung Song