Selim Cinek
46c8678447
Passing in the launch cookie for widget broadcast trampolines
...
The launch cookie can now be transfered via the broadcast
Fixes: 220290671
Test: add Photos widget, return properly to widget
Change-Id: Ibfe9e5232317837f3111459212a4b016b5828ef4
2022-02-21 11:42:09 +00:00
kholoud mohamed
82fde8ca18
[automerge] Fix crash when loading string cache 2p: 9b38947b32 2p: 942b4f4099
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16966227
Change-Id: I6b5113298a552bfb22bd4df551470b32ca38c7dc
2022-02-21 11:29:42 +00:00
kholoud mohamed
e454c2922b
[automerge] Fix crash when loading string cache 2p: 9b38947b32
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16966227
Change-Id: I1a52b09250c9ca65ba52b2c0a7c3971ec6d4cf16
2022-02-21 11:29:33 +00:00
kholoud mohamed
942b4f4099
[automerge] Fix crash when loading string cache 2p: 9b38947b32
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16966227
Change-Id: Id3403e3ae5ccc4f003073632c79ba51ef2736064
2022-02-21 11:29:33 +00:00
kholoud mohamed
9b38947b32
Fix crash when loading string cache
...
Crash was caused by a null context in ModelDelegate
Fixes: 218305827
Test: manual
Change-Id: I1b046e24427dbdc6752ac100f488c428838ac31f
2022-02-21 11:29:24 +00:00
TreeHugger Robot
0a7af9869e
Merge "Fix icon loading null pointer."
2022-02-19 05:11:40 +00:00
Android Build Coastguard Worker
32b97f8b10
Snap for 8202755 from e424f57dcb to tm-release
...
Change-Id: Ie06f75e297381fef1e5245c223afc476f18fbb24
2022-02-19 04:08:42 +00:00
Android Build Coastguard Worker
7fdfcbff62
Snap for 8200697 from 0fb7fa4e30 to sc-qpr3-release
...
Change-Id: Ic090ca93d710c3170b3d8249c344a07c97f8eb8f
2022-02-19 02:07:25 +00:00
TreeHugger Robot
dd003f8df3
Merge "Preparing to using "platform-test-rules" library from Launcher tests"
2022-02-19 00:26:01 +00:00
Schneider Victor-tulias
5597e4825d
Fix icon loading null pointer.
...
Filtering out icon itemInfos with null component names when loading icons in bulk
Test: manual
Fixes: 220380324
Change-Id: I0e6f9ae0a363d17497207c92eadcac64ca42693f
2022-02-18 16:25:05 -08:00
Winson Chung
47eb5bf1eb
Merge "Allow split with an existing split task" into tm-dev am: e424f57dcb am: 40a7e90d94
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16942074
Change-Id: I6d9ef927d717e65c1eb2888dba9b66f778a3f667
2022-02-18 21:41:30 +00:00
TreeHugger Robot
9a2f77bf03
Merge changes from topic "presubmit-am-a3e3a46016284fa6bec11af293474cfb" into sc-qpr1-dev am: ae4b713b2f am: 0fb7fa4e30 am: f9ef6e3b3c am: 5fdbc89b27 am: a30f6a116e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16939770
Change-Id: I3ebe6f3448841ea0947529a995a034fe0052a837
2022-02-18 21:38:54 +00:00
Bill Yi
f690d4c506
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: a2ba15674c am: 42320fef47 -s ours am: a4af3f6730 -s ours am: 6e50b9b331 -s ours am: dc4fd2363b -s ours am: 04e9dc53f2 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16939770
Change-Id: I0447ac3955ac85a5d58c8ff17f2758580a39871e
2022-02-18 21:38:52 +00:00
Winson Chung
40a7e90d94
Merge "Allow split with an existing split task" into tm-dev am: e424f57dcb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16942074
Change-Id: Id8ce2ffd96ff825dbd6e38675915a4825bb4bd96
2022-02-18 21:31:56 +00:00
Presubmit Automerger Backend
2a4f1111e6
[automerge] Remove popup container drag listener on close complete. 2p: 8aa4b05d22
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16943984
Bug: 217162588
Change-Id: Ifecc5533324e4669d7742a0ee75c4d57d5b868ca
Merged-In: I16515518c6d488b74450456306abbfff646ac11b
2022-02-18 21:18:44 +00:00
Brian Isganitis
8aa4b05d22
Remove popup container drag listener on close complete.
...
Bug: 217162588
Test: Verified removal once drag is finished. Verified working on secondary display launcher.
Change-Id: I16515518c6d488b74450456306abbfff646ac11b
Merged-In: I16515518c6d488b74450456306abbfff646ac11b
2022-02-18 21:18:33 +00:00
Winson Chung
e424f57dcb
Merge "Allow split with an existing split task" into tm-dev
2022-02-18 21:07:58 +00:00
TreeHugger Robot
d740cec5e9
Merge changes from topic "presubmit-am-a3e3a46016284fa6bec11af293474cfb" into sc-qpr1-dev am: ae4b713b2f am: 0fb7fa4e30 am: f9ef6e3b3c am: 5fdbc89b27
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16939770
Change-Id: Ica0bce402bd7336efde7f455d10798f431d25c1e
2022-02-18 21:00:10 +00:00
Bill Yi
e7cde7b790
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: a2ba15674c am: 42320fef47 -s ours am: a4af3f6730 -s ours am: 6e50b9b331 -s ours am: dc4fd2363b -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16939770
Change-Id: I8e5bceed75794a011bc08542705f15e926ffde7a
2022-02-18 21:00:08 +00:00
TreeHugger Robot
5e8dc0e137
Merge changes I16515518,Idf7c880d
...
* changes:
Remove popup container drag listener on close complete.
Revert "Remove popup container drag listener on close complete."
2022-02-18 20:54:08 +00:00
TreeHugger Robot
a30f6a116e
Merge changes from topic "presubmit-am-a3e3a46016284fa6bec11af293474cfb" into sc-qpr1-dev am: ae4b713b2f am: 0fb7fa4e30 am: f9ef6e3b3c am: 5fdbc89b27
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16939770
Change-Id: Ib5a032b42774a2c9a519dbacc4f69f4489188bd5
2022-02-18 20:49:47 +00:00
Bill Yi
04e9dc53f2
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: a2ba15674c am: 42320fef47 -s ours am: a4af3f6730 -s ours am: 6e50b9b331 -s ours am: dc4fd2363b -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16939770
Change-Id: Ifbfcc0ae3caa77bfe745315ff44b1e8641355bbe
2022-02-18 20:49:45 +00:00
TreeHugger Robot
5fdbc89b27
Merge changes from topic "presubmit-am-a3e3a46016284fa6bec11af293474cfb" into sc-qpr1-dev am: ae4b713b2f am: 0fb7fa4e30 am: f9ef6e3b3c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16939770
Change-Id: I2173be2c3868824ed97f4453a0736b1644c6ae91
2022-02-18 20:28:30 +00:00
Bill Yi
dc4fd2363b
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: a2ba15674c am: 42320fef47 -s ours am: a4af3f6730 -s ours am: 6e50b9b331 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16939770
Change-Id: I568f86f44ed5b36af0b1a8d878a3877ef5a6dc39
2022-02-18 20:28:26 +00:00
TreeHugger Robot
f9ef6e3b3c
Merge changes from topic "presubmit-am-a3e3a46016284fa6bec11af293474cfb" into sc-qpr1-dev am: ae4b713b2f am: 0fb7fa4e30
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16939770
Change-Id: Ia620f88c81b7b8bac48380c8826ab97b06918ed5
2022-02-18 20:03:55 +00:00
Bill Yi
6e50b9b331
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: a2ba15674c am: 42320fef47 -s ours am: a4af3f6730 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16939770
Change-Id: I605aa9c140a68df68dda359176006f9aef3eee2d
2022-02-18 20:03:53 +00:00
TreeHugger Robot
123532cdab
Merge changes from topic "presubmit-am-a3e3a46016284fa6bec11af293474cfb" into tm-mainline-prod am: 30d081213d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16939770
Change-Id: I99e1c76c05358554e4f80ad53ac17252293c4427
2022-02-18 19:55:03 +00:00
TreeHugger Robot
0fb7fa4e30
Merge changes from topic "presubmit-am-a3e3a46016284fa6bec11af293474cfb" into sc-qpr1-dev am: ae4b713b2f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16939770
Change-Id: I2bf6582bd4fdbb647a3795a8e1311995a3e3f2e8
2022-02-18 19:42:33 +00:00
Bill Yi
a4af3f6730
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: a2ba15674c am: 42320fef47 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16939770
Change-Id: If8754802299a1eaa1483e0b92adc1d99753d45dd
2022-02-18 19:42:32 +00:00
Brian Isganitis
16467b3256
Remove popup container drag listener on close complete.
...
Bug: 217162588
Test: Verified removal once drag is finished. Verified working on secondary display launcher.
Change-Id: I16515518c6d488b74450456306abbfff646ac11b
2022-02-18 19:27:49 +00:00
Bill Yi
5af31e45d1
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 634ddc934f -s ours am: f1fb56fd9a -s ours am: a366112254 -s ours am: e7bcd579d4 -s ours am: f2c7a7f3b3 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16939771
Change-Id: Icd9ff5370f5a4ce98a5f0e2e588b13d87101f1fe
2022-02-18 19:21:19 +00:00
TreeHugger Robot
ae4b713b2f
Merge changes from topic "presubmit-am-a3e3a46016284fa6bec11af293474cfb" into sc-qpr1-dev
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: a2ba15674c
Import translations. DO NOT MERGE ANYWHERE
2022-02-18 19:13:51 +00:00
TreeHugger Robot
30d081213d
Merge changes from topic "presubmit-am-a3e3a46016284fa6bec11af293474cfb" into tm-mainline-prod
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: a2ba15674c 2p: 0189c940d0
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: a2ba15674c
Import translations. DO NOT MERGE ANYWHERE
2022-02-18 19:13:51 +00:00
TreeHugger Robot
1f1dda096e
Merge changes from topic "presubmit-am-a3e3a46016284fa6bec11af293474cfb"
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 0189c940d0 2p: c7e6123889
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: a2ba15674c 2p: 0189c940d0
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: a2ba15674c
Import translations. DO NOT MERGE ANYWHERE
2022-02-18 19:13:51 +00:00
Bill Yi
b5bd2047e5
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 634ddc934f -s ours am: f1fb56fd9a -s ours am: a366112254 -s ours am: e7bcd579d4 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16939771
Change-Id: Id1915fa2ce3e2e5462ce0a118cf65a803b5913db
2022-02-18 18:58:36 +00:00
TreeHugger Robot
01c92ec4b7
Merge "Import translations. DO NOT MERGE ANYWHERE"
2022-02-18 18:54:41 +00:00
Bill Yi
f2c7a7f3b3
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 634ddc934f -s ours am: f1fb56fd9a -s ours am: a366112254 -s ours am: e7bcd579d4 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16939771
Change-Id: Ic7a6b8dc96b7181e7b66f1c408c14f15a38475c3
2022-02-18 18:47:51 +00:00
Brian Isganitis
f10ecccdf7
Revert "Remove popup container drag listener on close complete."
...
This reverts commit 1f7afc7740 .
Reason for revert: Not all activity contexts have a drag controller, so this will cause a crash within those (e.g. SecondaryDisplayLauncher).
Change-Id: Idf7c880d8213951d06fecc3fb8cf6e8efd2037b0
2022-02-18 10:47:11 -08:00
Bill Yi
e7bcd579d4
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 634ddc934f -s ours am: f1fb56fd9a -s ours am: a366112254 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16939771
Change-Id: I4a02f53d56baee3210c1eccc8e96484e5a67b96c
2022-02-18 18:22:34 +00:00
Bill Yi
a366112254
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 634ddc934f -s ours am: f1fb56fd9a -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16939771
Change-Id: Ib63abd485ac98a54bd69c65cd7f97f80148dc75d
2022-02-18 18:00:38 +00:00
TreeHugger Robot
35d8231755
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 129c510583 -s ours am: 85c63814dc -s ours am: da7a268e7f -s ours am: f28f0b1f3b -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16939772
Change-Id: Id61a40c0281cf64dbf3649633dd2e8a758516615
2022-02-18 17:53:27 +00:00
TreeHugger Robot
0f3220a27f
Merge changes from topic "presubmit-am-7647861324994509ba7d86b8c26dd400" into sc-v2-dev-plus-aosp am: 780a5e3a11 am: 57cbc6d7b7 am: 9d24a56e94
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16939772
Change-Id: I3b9b740fd942a73a4c73ca40f39862bcf4d8e2d2
2022-02-18 17:53:14 +00:00
Bill Yi
73a39e2b6f
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 98fda41b31 am: 90db95d8e7 -s ours am: e3b977fa95 -s ours am: f708cf5d4c -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16939772
Change-Id: Ie728efd0efb1c841abeaf6b9e8a4453089212565
2022-02-18 17:53:13 +00:00
Jon Miranda
221304db3d
[automerger skipped] Merge "Init FloatingIconView properties before fetching drawable. & Make sure properties are reset when recycled." into sc-v2-dev am: 90cac2cd9b -s ours am: 6f3f8252c2 -s ours am: b67b56d76f -s ours am: 1e8217110e -s ours
...
am skip reason: Merged-In Ifdbf3e733e27918c57a5e9b23e5a11b65f8f338c with SHA-1 35d294387c is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16908749
Change-Id: I0be622104f117a2b36cfa93cf3cece462f47adb4
2022-02-18 17:52:16 +00:00
Presubmit Automerger Backend
a455b63ae1
[automerger skipped] [automerge] Init FloatingIconView properties before fetching drawable. 2p: 35d294387c am: 233f9fc731 -s ours am: ff5e621397 -s ours am: 4adfd45fcb -s ours
...
am skip reason: Merged-In Ifdbf3e733e27918c57a5e9b23e5a11b65f8f338c with SHA-1 b2670d2051 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16908749
Change-Id: I3bb4ff42d2f2045e977d6bc1c3d52549cee994e2
2022-02-18 17:50:04 +00:00
Winson Chung
3516ecc534
Allow split with an existing split task
...
- Determine the task in the group being clicked in split-select mode
and launch split using that selected task
- Also make sure we don't handle drag cancel twice when we are animating
the return of the drag surface
Bug: 219060441
Test: Split from home/overview with fullscreen+fullscreen task, and with
fullscreen+split task
Change-Id: I48ec0a82812197803ff4b3698830a9cb705719e3
2022-02-18 17:49:59 +00:00
TreeHugger Robot
b1444963ff
Merge "Import translations. DO NOT MERGE ANYWHERE"
2022-02-18 17:49:29 +00:00
TreeHugger Robot
5677e1811b
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 129c510583 -s ours am: 85c63814dc -s ours am: da7a268e7f -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16939772
Change-Id: I38ff06d745ab690f04bacd43a142a85042f48d05
2022-02-18 17:40:08 +00:00
TreeHugger Robot
8e973b77b7
Merge changes from topic "presubmit-am-7647861324994509ba7d86b8c26dd400" into sc-v2-dev-plus-aosp am: 780a5e3a11 am: 57cbc6d7b7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16939772
Change-Id: I2283314b94febe0f4d5b3bf99b58f048ecad4164
2022-02-18 17:40:01 +00:00
Bill Yi
28b5ab87f6
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 98fda41b31 am: 90db95d8e7 -s ours am: e3b977fa95 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16939772
Change-Id: I063ce8e682acde77d343c3983f3f8763ea275579
2022-02-18 17:40:00 +00:00