e0733affe1
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 31855be8d4 -s ours am: 1637756cbe -s ours am: f3b95c15ba -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24117018
Change-Id: Ic6e85dab284e1725c6e8db90f28768b73f99c2cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-19 03:38:58 +00:00
47618ee055
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1b0e9ee832 -s ours am: 1386c58be0 -s ours am: b2ddc88f41 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24115997
Change-Id: Ibfd1aad7f9dd5627b203f17d50baba2913b3cc36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-19 03:38:43 +00:00
f3b95c15ba
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 31855be8d4 -s ours am: 1637756cbe -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24117018
Change-Id: Ia1edfe4c0442242420af7709311b9550dcd058af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-19 02:54:27 +00:00
b2ddc88f41
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1b0e9ee832 -s ours am: 1386c58be0 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24115997
Change-Id: I2f6177b4b21605fd68756eca79e213d6b4f93094
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-19 02:54:12 +00:00
1637756cbe
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 31855be8d4 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24117018
Change-Id: I8fa4436fd8af46762f0fc104a4d385e8eaa6bcfe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-19 02:34:36 +00:00
1386c58be0
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1b0e9ee832 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24115997
Change-Id: I07964b665f77d65d4d011d63874e13e962093f1a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-19 02:34:22 +00:00
fe545acab0
Merge "[conflict] Merge "Fix inability to remove or interact with folder when removing 2nd item from folder" into udc-dev am: 8002897694 am: 96e03b3edf" into udc-qpr-dev am: 88d29a16cc am: 0b6966d047
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24104040
Change-Id: I7a2321304ddb2a9630b8f8ea48c4ccafe51a366c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-19 00:30:05 +00:00
0b6966d047
Merge "[conflict] Merge "Fix inability to remove or interact with folder when removing 2nd item from folder" into udc-dev am: 8002897694 am: 96e03b3edf" into udc-qpr-dev am: 88d29a16cc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24104040
Change-Id: I101b2a66680b95cbe73e3eeb44958fe7eefc62c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-18 23:45:08 +00:00
7a5e24ead9
Merge "Fix inability to remove or interact with folder when removing 2nd item from folder" into udc-dev am: 8002897694 am: 893c0fddac am: 28b54fcc10 am: af61f8e5e0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24056558
Change-Id: I0bd5156981393a782c5f310e3b900e1627ba96dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-18 23:24:49 +00:00
7672efe225
Merge "[conflict] Merge "Fix inability to remove or interact with folder when removing 2nd item from folder" into udc-dev am: 8002897694 am: 96e03b3edf am: 9b77c7a59d" into udc-qpr-dev-plus-aosp am: 63fa5cdf15
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24105195
Change-Id: I54ae67850f1077f611bee59cb6ed017b5717eb2c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-18 23:22:42 +00:00
af61f8e5e0
Merge "Fix inability to remove or interact with folder when removing 2nd item from folder" into udc-dev am: 8002897694 am: 893c0fddac am: 28b54fcc10
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24056558
Change-Id: I0c96071f0650be3aeb8f50f87853fbbeb325f6c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-18 23:02:03 +00:00
88d29a16cc
Merge "[conflict] Merge "Fix inability to remove or interact with folder when removing 2nd item from folder" into udc-dev am: 8002897694 am: 96e03b3edf" into udc-qpr-dev
2023-07-18 22:50:47 +00:00
63fa5cdf15
Merge "[conflict] Merge "Fix inability to remove or interact with folder when removing 2nd item from folder" into udc-dev am: 8002897694 am: 96e03b3edf am: 9b77c7a59d" into udc-qpr-dev-plus-aosp
2023-07-18 22:49:54 +00:00
854c341603
Merge "Have OptionsPopupView depend on ActivityContext." into udc-qpr-dev am: 210e000272 am: b026b75b4b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24103828
Change-Id: I90913321dd207c6bc4395ff4a4601a601c948b13
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-18 20:12:03 +00:00
b026b75b4b
Merge "Have OptionsPopupView depend on ActivityContext." into udc-qpr-dev am: 210e000272
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24103828
Change-Id: I3964d3f4ffbef837fc667b0f90a055b3d05e38c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-18 19:51:30 +00:00
210e000272
Merge "Have OptionsPopupView depend on ActivityContext." into udc-qpr-dev
2023-07-18 19:01:51 +00:00
1b0e9ee832
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: If16db1f2f982ce5d0201ea56cd4c22b0d8a8a9c8
2023-07-18 11:56:56 -07:00
31855be8d4
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I3dc01f06b2302cea0b5435a745e0e96c8a465bea
2023-07-18 11:56:05 -07:00
7027f334cb
Merge "Keep track of multiple TasksIDs and Targets in GestureState" into udc-qpr-dev am: 80fddb6e40 am: 3ae98b4507
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23680185
Change-Id: Id66d6c87c2ace41a8fe05ba9bc47ad56f396dc69
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-18 04:08:50 +00:00
3ae98b4507
Merge "Keep track of multiple TasksIDs and Targets in GestureState" into udc-qpr-dev am: 80fddb6e40
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23680185
Change-Id: I9fdab12585372479545ef431a85548e872200115
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-18 03:18:27 +00:00
80fddb6e40
Merge "Keep track of multiple TasksIDs and Targets in GestureState" into udc-qpr-dev
2023-07-18 02:47:39 +00:00
50c457b626
[conflict] Merge "Fix inability to remove or interact with folder when removing 2nd item from folder" into udc-dev am: 8002897694 am: 96e03b3edf am: 9b77c7a59d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24056558
Change-Id: Iae3c6f33226c47694927454915b342f6e9c0fa05
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-17 23:16:34 +00:00
312127c161
[conflict] Merge "Fix inability to remove or interact with folder when removing 2nd item from folder" into udc-dev am: 8002897694 am: 96e03b3edf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24056558
Change-Id: I746dcd40e2e57f5bb533de01a0b0d47c5c0e409e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-17 23:16:03 +00:00
f5ea7390dc
Merge "Show split select instructions toast when starting split on workspace" into udc-qpr-dev am: b9a5c4551f am: 0a4e37506e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24062180
Change-Id: Iec48c62a4b1c973bc25639a59ce53605c89d58e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-17 23:15:31 +00:00
5a50c877c8
Merge "Fix null pointer in createRecentsWindowAnimator." into udc-qpr-dev am: 5c825f4cda am: 78d0cdde1f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24056554
Change-Id: I431666b003b90c65421a18194a856a9c66d1af7a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-17 23:15:19 +00:00
0a4e37506e
Merge "Show split select instructions toast when starting split on workspace" into udc-qpr-dev am: b9a5c4551f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24062180
Change-Id: Ifac48dc2f1cbf06506ec4c59003e2224aba060ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-17 22:35:37 +00:00
78d0cdde1f
Merge "Fix null pointer in createRecentsWindowAnimator." into udc-qpr-dev am: 5c825f4cda
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24056554
Change-Id: I5be8df549f9b476fb65bedf55dee0e2ae5d7f012
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-17 22:34:15 +00:00
b9a5c4551f
Merge "Show split select instructions toast when starting split on workspace" into udc-qpr-dev
2023-07-17 22:11:36 +00:00
1cdf7a72e6
Merge "Clean-up b/260135164 logs" into udc-qpr-dev am: 7d89646585 am: bd0269207f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24058374
Change-Id: Ib8c8cc222924e43f35945c8dfb3e47656af9479e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-17 21:59:23 +00:00
7913080166
Merge "Initial Taskbar drag-n-drop support for search results." into udc-qpr-dev am: 3f0e7e7c5d am: 22bc9983ed
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24011563
Change-Id: I58e7edc548d4691bcc912579f4c5778e8f59685e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-17 21:55:14 +00:00
e797f7f0eb
Merge "Removing LauncherActivityRule as it can be flaky based on when the rule was initialized" into udc-qpr-dev am: cd5d3d0c31 am: 43364a14b1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24065401
Change-Id: Ic98204f59df48f3544054b65a8ef591a9c5be5b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-17 21:54:57 +00:00
73f0772669
Merge "Show tooltips on cursor hover of taskbar icons." into udc-qpr-dev am: f351e515f7 am: f2aa70c477
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23369318
Change-Id: I3a15b72ec49c4c6e22fda6ba9c61bed7338c428a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-17 21:54:43 +00:00
576f64a0b1
Merge "Handle nullable CellLayout when removing app icon from folder" into udc-qpr-dev am: ccd49005c9 am: ebac5e9dfa
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24044953
Change-Id: Ic88346e41c151291e21b582acfa9388444d99e21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-17 21:54:31 +00:00
82402f3f84
Merge "Creating a correctly populated mOccupied grid when reordering on foldables" into udc-dev am: be4a43c1d9 am: c0b3e59990 am: 2a623484f5 am: 283d8031a3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24060456
Change-Id: Id2542949942cfad6b5abeba1addbe36d621d5f7a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-17 21:54:20 +00:00
e9dc6ab782
Merge "Creating a correctly populated mOccupied grid when reordering on foldables" into udc-dev am: be4a43c1d9 am: add37239db am: 95f8e8f465 am: eedec5194b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24060456
Change-Id: I4b0a23a3cc8e3559f8386be42ff5c05590de2dd2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-17 21:54:10 +00:00
c361e9cd7a
Merge "Creating a correctly populated mOccupied grid when reordering on foldables" into udc-dev am: be4a43c1d9 am: add37239db am: 61ef65582d am: 0ba758cd87
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24060456
Change-Id: Idd60b769049ab3fa0c99ca38b4d0043da7931a3c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-17 21:53:59 +00:00
d22aebd2af
Merge "Clean up SplitData refactor flag" into udc-qpr-dev am: 61c2bbe5b8 am: 42064106ba
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24082168
Change-Id: I93fc98cdf01c25de263fc38fbc8402b39f884993
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-17 21:53:45 +00:00
2755e96e7f
Merge "Exposing the layout URI builder method, so that it can be used in tests" into udc-qpr-dev am: ef52e37e5f am: 224f7360f1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24083957
Change-Id: I275b9827a530d92b37d5ed356707ff3b5ebe83ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-17 21:53:33 +00:00
5c825f4cda
Merge "Fix null pointer in createRecentsWindowAnimator." into udc-qpr-dev
2023-07-17 21:43:12 +00:00
e7e7a6e522
Keep track of multiple TasksIDs and Targets in GestureState
...
* Quickswitching between fullscreen and split tasks breaks split,
need that to be fixed to further test these code changes
Bug: 236226779
Change-Id: I332ad6e2d98760ec1d691dae76e8e3ab8b839c75
2023-07-17 14:37:06 -07:00
e1a27a06e3
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: c9bbee3d32 -s ours am: cbd5c73dc9 -s ours am: 9711ba0a7d -s ours am: e6a87b913b -s ours am: 3f61b35ec8 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24073762
Change-Id: Iff71288cd5a268e583ea87c087a5e175b8c1b157
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-17 20:28:05 +00:00
a37989bd9e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 761745611d -s ours am: e247b07ee4 -s ours am: fbe5adce20 -s ours am: e1da779bc6 -s ours am: f293c43201 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24073762
Change-Id: Ic8e1187bc2dffbce9677fec58e4489b80c0fa076
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-17 20:28:01 +00:00
1d978d3f54
Merge changes from topic "am-f284c104facc4c2687b457ff7784d299" into udc-qpr-dev-plus-aosp am: 5e6bc6c6d2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24074645
Change-Id: Id6f2f0af647aabb4e999af4e9b34a4603a4267f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-17 19:51:03 +00:00
0d22eccb72
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 5726fa83cc -s ours am: c4618da583 -s ours am: bd1b49472b -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24074645
Change-Id: Iad2eb1a320ee505ce0474ee7b956990d09355951
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-17 19:50:42 +00:00
9a141049d0
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: c9bbee3d32 -s ours am: cbd5c73dc9 -s ours am: 95b23de1de -s ours am: d96b3f5d07 -s ours am: 5f45c77624 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24073762
Change-Id: I10c16d39f944ea59fa092191666b98155a5ba846
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-17 19:43:30 +00:00
4a7dff8116
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 761745611d -s ours am: e247b07ee4 -s ours am: 39a9aa0680 -s ours am: 05c6fe0389 -s ours am: 020efd95c0 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24073762
Change-Id: Ic90f2268576eb8842ae1711c037f389aa03f8666
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-17 19:43:28 +00:00
8798d648ca
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: c9bbee3d32 -s ours am: cbd5c73dc9 -s ours am: 9711ba0a7d -s ours am: d35e7b2132 -s ours am: d1d0bf3ad1 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24073762
Change-Id: I135a8bc94064bcd94fb2aafeeb2c0c4f9a021bfb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-17 19:38:50 +00:00
2955383697
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 761745611d -s ours am: e247b07ee4 -s ours am: fbe5adce20 -s ours am: b8a4fc50fa -s ours am: 4684d84764 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24073762
Change-Id: I5a763e984190b082662c31893bdb9787ed4d6aa7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-17 19:38:47 +00:00
bd0269207f
Merge "Clean-up b/260135164 logs" into udc-qpr-dev am: 7d89646585
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24058374
Change-Id: I859fc1a2652070b5bdea3de55a9910cacb5b0933
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-17 19:35:25 +00:00
376f59fcde
Merge changes from topic "am-c46e753e59a04ec0be6cb1735ffa925e" into udc-qpr-dev-plus-aosp am: b5add2838c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24078651
Change-Id: I30c4c2325c582496ddf3ee8f2f476a06288785d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-17 19:29:05 +00:00
Bill Yi
Federico Baron
Treehugger Robot
Brian Isganitis
Vinit Nayak
Schneider Victor-tulias
Alex Chau
Sunny Goyal
Pat Manning
Fengjiang Li
Sebastián Franco
TreeHugger Robot
Automerger Merge Worker