c03a5a6e80
Merge "Updating code due to TaskStackChangeListener changes" into tm-dev am: bc25ec02a2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17730696
Change-Id: I2cb0a6148e225319f5b9ef187eef68fe1cf7d802
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 20:15:51 +00:00
e07dac97ce
Merge "Updating code due to TaskStackChangeListener changes" into tm-dev am: bc25ec02a2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17730696
Change-Id: I6e42e7159bafdd8aee8814c7f0eb1d82d075a485
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 20:15:00 +00:00
998c47e594
Merge "Prevent double selection of second split app" into tm-dev
2022-04-14 20:13:59 +00:00
bc25ec02a2
Merge "Updating code due to TaskStackChangeListener changes" into tm-dev
2022-04-14 20:11:58 +00:00
23efa9de82
Merge "Showing alert dialog when shortcut version higher than the App" into tm-dev am: af91920955 am: f8a6c58e0d am: 4140547827
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17538946
Change-Id: I07a61dda03698de57dac398a6580fcf54bafa0d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 20:09:19 +00:00
fc9ef4e273
Merge "Showing alert dialog when shortcut version higher than the App" into tm-dev am: af91920955 am: d703ce5926
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17538946
Change-Id: I3ba1db8b4e3b6fb92b60b0bb6fe9073fc4ff28c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 20:08:38 +00:00
4140547827
Merge "Showing alert dialog when shortcut version higher than the App" into tm-dev am: af91920955 am: f8a6c58e0d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17538946
Change-Id: I9c7da7281d1c091b767f3e472ace780094510524
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 19:50:20 +00:00
f8a6c58e0d
Merge "Showing alert dialog when shortcut version higher than the App" into tm-dev am: af91920955
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17538946
Change-Id: Ic7459ffa871e7cea568f4d6be0992dd7a16f085b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 19:28:23 +00:00
d703ce5926
Merge "Showing alert dialog when shortcut version higher than the App" into tm-dev am: af91920955
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17538946
Change-Id: Ibd3e621fa7d39b17c8a030509f335feab8ba2207
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 19:24:50 +00:00
acaa4c409f
Merge "fix broken build on erorrprone" into tm-dev am: ad90ded7bc am: 1ff6d5fd4e am: ab1891e213
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17730702
Change-Id: I3dec41c610ffc6e25cb787ae4de020eb569aca54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 18:42:41 +00:00
5cc605ce2b
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: f78ff2b90d -s ours am: c19ce4bf3e -s ours am: 47633c9c3f -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17716019
Change-Id: I66a365b80f716c1f10b013fd9556d37b88cb0968
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 18:42:28 +00:00
a6a108b9ff
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 05e2272138 -s ours am: e635744297 -s ours am: 4f3656b607 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17716019
Change-Id: If9be37ce330a9ca36ed8feb2b498f69378d6db3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 18:42:27 +00:00
d0f5b82c99
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 4918b0245b -s ours am: 9e7bb1c523 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17716022
Change-Id: I22c3cc22123a582a6c4a3a27f16b0fdc7df9ecaf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 18:42:19 +00:00
923b63cc20
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c5f5f9c52e -s ours am: d60f59b1c1 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17716022
Change-Id: If97f19a870b5ecde04afaf9ddb373ed556f47e6f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 18:42:18 +00:00
e57593a327
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 4561a37a72 -s ours am: d6e20e17fe -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17716402
Change-Id: Ib841f0dc8b7c981a7cf08483ddaa04b8f1dcf2c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 18:42:10 +00:00
ae9ebcf943
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 50594a6a1b -s ours am: 161cf15b59 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17716402
Change-Id: I1f5533d7fbb766fc2ec91883c12b7b996de67908
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 18:42:08 +00:00
98be8507f4
Merge "fix broken build on erorrprone" into tm-dev am: ad90ded7bc am: 45ba0824ca
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17730702
Change-Id: I9060a67388dbe5c8043942ce4b6f5c132c757fc8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 18:29:02 +00:00
af91920955
Merge "Showing alert dialog when shortcut version higher than the App" into tm-dev
2022-04-14 18:26:10 +00:00
3423e6e713
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: f78ff2b90d -s ours am: 7488ad9baf -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17716019
Change-Id: I616a42144feb2d959ed5475a4a77cfbd6522aa3b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 18:24:21 +00:00
67a628e7b5
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 05e2272138 -s ours am: 4f1b028cd4 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17716019
Change-Id: Ie14cec9661df2b7897bca4a85c19f41e541965ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 18:24:19 +00:00
ab1891e213
Merge "fix broken build on erorrprone" into tm-dev am: ad90ded7bc am: 1ff6d5fd4e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17730702
Change-Id: I161d2c16d738cbdacec0981dbda7a17101713e28
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 18:14:06 +00:00
47633c9c3f
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: f78ff2b90d -s ours am: c19ce4bf3e -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17716019
Change-Id: I5903064b4aa676dd602d4e24327c5a69235dbfca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 18:13:12 +00:00
4f3656b607
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 05e2272138 -s ours am: e635744297 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17716019
Change-Id: Iaa6ac651512ec85eeea0ba738cd8f285762153b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 18:13:11 +00:00
9e7bb1c523
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 4918b0245b -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17716022
Change-Id: I756d0cd4cfcb607455a85c8483a8e4f117e26551
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 18:12:29 +00:00
d60f59b1c1
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c5f5f9c52e -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17716022
Change-Id: I376eb8abd8e50b74eb9ec1518d95664c6c7539ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 18:12:27 +00:00
45ba0824ca
Merge "fix broken build on erorrprone" into tm-dev am: ad90ded7bc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17730702
Change-Id: I597f3c261b369ae0eee11845ef4da7e833e90ec7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 18:08:09 +00:00
a4e5a9eebe
Prevent double selection of second split app
...
* Also fix small other bug where we were
checking only for LauncherState
OVERVIEW_SPLIT_SELECT and not for equivalent
3P RecentsState
Fixes: 227419997
Test: Repro steps don't cause bug. Yay.
Change-Id: Ibb8238185b959d22d8455b6812d29b2e268d9739
2022-04-14 11:06:47 -07:00
d6e20e17fe
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 4561a37a72 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17716402
Change-Id: I30670211fb408ba4416b5878bc57c4ac3a231572
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 18:06:44 +00:00
161cf15b59
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 50594a6a1b -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17716402
Change-Id: I2cb42b6855016fc730b0e401c48c9f8949a62ee9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 18:06:41 +00:00
1ff6d5fd4e
Merge "fix broken build on erorrprone" into tm-dev am: ad90ded7bc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17730702
Change-Id: If9d25c16a5014ea6616904955e1223413351042b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 18:06:18 +00:00
7488ad9baf
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: f78ff2b90d -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17716019
Change-Id: I46e7af29dfcbbbef97c60efaa5e5f9862e35ee0e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 18:06:15 +00:00
4f1b028cd4
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 05e2272138 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17716019
Change-Id: Id32b97bfe0f254b4c8b6c6a4ff29d983147e0b8d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 18:06:14 +00:00
ad90ded7bc
Merge "fix broken build on erorrprone" into tm-dev
2022-04-14 18:00:10 +00:00
c19ce4bf3e
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: f78ff2b90d -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17716019
Change-Id: I027f61e39192559d78343c432f36227780ebfa79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 17:49:56 +00:00
e635744297
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 05e2272138 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17716019
Change-Id: Ie56489613e60cae61522282c90b901e7b01faf93
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 17:49:54 +00:00
5f5bd84d99
Fix flicker when entering PiP from split-screen / overview
...
This is a follow-up of ag/16418447 where we hide the Tasks in
split-screen mode on swipe-home-to-pip and here we use the same
mechanism when we are entering PiP from the overview and the pip-able
task is in split-screen mode.
Video: http://recall/-/aaaaaabFQoRHlzixHdtY/bNtg3ZOhuTBKm9nU9CPeNQ
Bug: 228289777
Test: follow the reproduce steps in bug, see video
Change-Id: Icab11d52cedaf94af0ee72023cebca8ec51d8851
2022-04-14 10:49:29 -07:00
4918b0245b
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev
2022-04-14 17:12:58 +00:00
4561a37a72
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev
2022-04-14 17:12:02 +00:00
f78ff2b90d
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev
2022-04-14 17:10:53 +00:00
4cf91bf1fd
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 66a79956b3 -s ours am: 0ea47ea8df -s ours am: 856629cc58 -s ours am: cdb4c87375 -s ours am: 5451806368 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17716017
Change-Id: I8ac923a62d8ee7a23e40226ad16b0eda08f96f5b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 16:21:16 +00:00
4c9dd9e224
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6f41d53de9 -s ours am: ccac214bba -s ours am: f45361b8b0 -s ours am: 46849a0465 -s ours am: 436030cab6 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17716400
Change-Id: Ie46328771b69b2cadb04a16660db1e2f05f663d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 16:21:08 +00:00
817b17dd19
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 8c619a2b52 am: af25e91b3a -s ours am: 63a5f2eb4b -s ours am: 1869ef0cf5 -s ours am: a5a3ed7821 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17716017
Change-Id: I9cac8d8d7adc3945c2d281aae37675831a24f993
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 16:21:02 +00:00
fddf0ec2aa
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 614046bd46 -s ours am: 6d05b4c6aa -s ours am: 006cd7c149 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17723424
Change-Id: I47d37acc9245007445dd5fb5ed8e2418bd4b5a91
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 16:20:26 +00:00
a97be0b3f0
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1d313372fe -s ours am: 1fded506a1 -s ours am: 7f57c56512 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17723424
Change-Id: I9e2fde17f999ecdd631f1448f42c9944490818af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 16:20:25 +00:00
f6c341c504
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 66a79956b3 -s ours am: 0ea47ea8df -s ours am: 856629cc58 -s ours am: dc2cff0def -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17716017
Change-Id: I54e1725aab522abeb087be8e213cd70fd25412c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 16:06:19 +00:00
97bc672c7e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6f41d53de9 -s ours am: ccac214bba -s ours am: f45361b8b0 -s ours am: a11668cfcb -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17716400
Change-Id: I621dd553983307b79bbd70d72a9f57195134d863
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 16:06:12 +00:00
5451806368
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 66a79956b3 -s ours am: 0ea47ea8df -s ours am: 856629cc58 -s ours am: cdb4c87375 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17716017
Change-Id: I413a3dbe16255a2382ee48e42cbe934fd9274f7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 16:06:06 +00:00
97fec33ebe
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 8c619a2b52 am: af25e91b3a -s ours am: 63a5f2eb4b -s ours am: 5642ef62da -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17716017
Change-Id: I2c7ca8794f4ea62aa459a1abc3a0db7d2095d55e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 16:06:05 +00:00
436030cab6
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6f41d53de9 -s ours am: ccac214bba -s ours am: f45361b8b0 -s ours am: 46849a0465 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17716400
Change-Id: I302bb9db0faa5b5692e474dd01077a9fefd299a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 16:06:01 +00:00
a5a3ed7821
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 8c619a2b52 am: af25e91b3a -s ours am: 63a5f2eb4b -s ours am: 1869ef0cf5 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17716017
Change-Id: Iad011f75537cf7746b1d85497c074ea8afe403b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 16:05:44 +00:00
Sunny Goyal
TreeHugger Robot
Sihua Ma
Jonathan Scott
Bill Yi
Vinit Nayak
Hongwei Wang