7afe35bc7d
[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: I14c414cfb0e75d9edee73953533fee89af3dcb7f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-19 02:39:49 +00:00
0addd94602
[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: I11491dc58602725611e1d77ec8fd80d7bd92939d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-19 02:39:31 +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
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
80fddb6e40
Merge "Keep track of multiple TasksIDs and Targets in GestureState" into udc-qpr-dev
2023-07-18 02:47:39 +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
b9a5c4551f
Merge "Show split select instructions toast when starting split on workspace" into udc-qpr-dev
2023-07-17 22:11:36 +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
40c96b4049
Have OptionsPopupView depend on ActivityContext.
...
Only certain static methods in this class require Launcher at this
point.
Test: Manual
Bug: 291615281
Flag: No
Change-Id: I27bda70bd4f9da75e112d4f68a383447bcc3c32c
2023-07-17 14:40:59 -04:00
7d89646585
Merge "Clean-up b/260135164 logs" into udc-qpr-dev
2023-07-17 18:32:46 +00:00
96e03b3edf
Merge "Fix inability to remove or interact with folder when removing 2nd item from folder" into udc-dev am: 8002897694
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24056558
Change-Id: Iff6b9ec51905ae3c724eed52f3ecedb7a547efeb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-17 17:58:50 +00:00
8002897694
Merge "Fix inability to remove or interact with folder when removing 2nd item from folder" into udc-dev
2023-07-17 17:11:26 +00:00
3f0e7e7c5d
Merge "Initial Taskbar drag-n-drop support for search results." into udc-qpr-dev
2023-07-17 17:08:15 +00:00
cd5d3d0c31
Merge "Removing LauncherActivityRule as it can be flaky based on when the rule was initialized" into udc-qpr-dev
2023-07-17 16:58:20 +00:00
625709617e
Clean-up b/260135164 logs
...
Fix: 271242509
Test: manual
Change-Id: I2c5421539f8f70897b142dfdaa6bc97a10225309
2023-07-17 15:30:31 +01:00
f351e515f7
Merge "Show tooltips on cursor hover of taskbar icons." into udc-qpr-dev
2023-07-17 10:15:46 +00:00
ccd49005c9
Merge "Handle nullable CellLayout when removing app icon from folder" into udc-qpr-dev
2023-07-15 02:44:31 +00:00
5f09091583
Show split select instructions toast when starting split on workspace
...
* Used same animation properties that RecentsView uses to
show the instructions view unfolding
* TODOs:
* UI polish (correct asset, animation timings, etc)
* Hook into existing animations (if possible)
* Migrate recentsView splitInstructionsView to use same/similar code path;
remove RecentsView#safeRemoveDragLayerView
Bug: 276361926
Test: Create split w/ and w/o flag, works as expected
Flag: ENABLE_SPLIT_FROM_WORKSPACE_TO_WORKSPACE
Change-Id: I7a51b71c358902399ad73b650287cdbf1dad07c6
2023-07-14 17:49:42 -07:00
61ef65582d
Merge "Creating a correctly populated mOccupied grid when reordering on foldables" into udc-dev am: be4a43c1d9 am: add37239db
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24060456
Change-Id: Ic616b884a54307d21d8392f280019d03c9fd1c7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-15 00:33:16 +00:00
add37239db
Merge "Creating a correctly populated mOccupied grid when reordering on foldables" into udc-dev am: be4a43c1d9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24060456
Change-Id: I58ecf6e04aa29055e1a16b92adff8c2d9913215a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-14 23:50:00 +00:00
61c2bbe5b8
Merge "Clean up SplitData refactor flag" into udc-qpr-dev
2023-07-14 23:25:27 +00:00
be4a43c1d9
Merge "Creating a correctly populated mOccupied grid when reordering on foldables" into udc-dev
2023-07-14 22:43:16 +00:00
ef52e37e5f
Merge "Exposing the layout URI builder method, so that it can be used in tests" into udc-qpr-dev
2023-07-14 22:11:29 +00:00
e6a87b913b
[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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24073762
Change-Id: I2d2b387796ef9810354754b5f1072badccdd80bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-14 20:40:16 +00:00
e1da779bc6
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 761745611d -s ours am: e247b07ee4 -s ours am: fbe5adce20 -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: Iaf514855f8b015492b34dd32c457722c5298d34d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-14 20:40:12 +00:00
c4618da583
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 5726fa83cc -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: Ifa4d9f16f600469706d50705b976eb99eb7b4798
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-14 20:25:29 +00:00
eff881254b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cb3dd3968c -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: Id05545361542683b2674ba47b2bc9dff2b9a4349
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-14 20:25:14 +00:00
773159950f
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 112ba79d1b -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24073761
Change-Id: I11dda8cd7933ebc1b50af9ae68940726e633ffd8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-14 20:24:54 +00:00
1cdef9db12
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0835d8178d -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24073761
Change-Id: I3003c48e930844484d2bc8b560113688957fedf9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-14 20:24:34 +00:00
0d149e6f93
Exposing the layout URI builder method, so that it can be used in tests
...
Bug: 286558846
Test: N/A
Flag: N/A
Change-Id: Ib39c0477bb977ac2eb3e484463bc3ea770dc4069
2023-07-14 13:03:12 -07:00
9711ba0a7d
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: c9bbee3d32 -s ours am: cbd5c73dc9 -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: Ice335c68881bccbefd5d051455710f1cda9d7439
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-14 19:59:43 +00:00
fbe5adce20
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 761745611d -s ours am: e247b07ee4 -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: If7d6adf878b8d651e4eb5aaf433b375637f63bf4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-14 19:59:39 +00:00
5f3dcef134
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev
2023-07-14 19:57:25 +00:00
1a2cdeff60
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev
2023-07-14 19:57:25 +00:00
5726fa83cc
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev
2023-07-14 19:56:06 +00:00
112ba79d1b
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev
2023-07-14 19:56:06 +00:00
26dd7e5cf1
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dff0eb0871 -s ours am: b916d92ef5 -s ours am: 5d1838c012 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24073941
Change-Id: Ie16970392cd4cf49fe8ab81be49fc94bb139a63d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-14 19:55:22 +00:00
5d1838c012
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dff0eb0871 -s ours am: b916d92ef5 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24073941
Change-Id: I9ad3f572c65c182366044835adf7a873ef7bf26b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-14 19:32:23 +00:00
cbd5c73dc9
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: c9bbee3d32 -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: I9d616e44ccfc66a17dac1b207e8605a3b2229fc0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-14 18:49:46 +00:00
e247b07ee4
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 761745611d -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: I63777bffc754dd5479587c878415b6facdbc4328
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-14 18:49:41 +00:00
b916d92ef5
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dff0eb0871 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24073941
Change-Id: Idb7310317a15aafc5222660fb0eed885799bc7a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-14 18:45:05 +00:00
c6c095bea9
[automerger skipped] Merge "[a11y] Fix crash when using talkback to add to home screen." into udc-d1-dev am: 2a749f1e60 -s ours
...
am skip reason: Merged-In Id3e1444de188f2d2af760f58e3d9814a2b7abd88 with SHA-1 35b9960b63https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23877939
Change-Id: Id83df5d2f603e6090acb60ce01635c3db53651e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-14 18:23:14 +00:00
0a447aeb92
[automerger skipped] [a11y] Fix crash when using talkback to add to home screen. am: 1a9a98005d -s ours
...
am skip reason: Merged-In Id3e1444de188f2d2af760f58e3d9814a2b7abd88 with SHA-1 35b9960b63https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23877939
Change-Id: Ibeec9d99b0ca2d538b9c2a923cb7ff5b8cf40310
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-14 18:23:11 +00:00
c9bbee3d32
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2023-07-14 18:18:10 +00:00
1db3292029
Clean up SplitData refactor flag
...
Bug: 279494325
Test: Invoking split works from home, overview.
Opening split to fullscreen also works
Change-Id: Ie1f26f833d5c10bb114b9e8eb1bd9f3b6b913b3d
2023-07-14 10:54:59 -07:00
2a749f1e60
Merge "[a11y] Fix crash when using talkback to add to home screen." into udc-d1-dev
2023-07-14 17:49:46 +00:00
f6b79f7caf
Removing LauncherActivityRule as it can be flaky based on when
...
the rule was initialized
Bug: 289161193
Test: Presubmit and PostSubmit
Flag: N/A
Change-Id: I0e1e9c6f932d2a98a2f1e47bd1665e26f2db9eb4
2023-07-14 10:29:55 -07:00
Bill Yi
Federico Baron
Brian Isganitis
Vinit Nayak
Schneider Victor-tulias
Alex Chau
Sunny Goyal
Pat Manning
Fengjiang Li
Sebastián Franco
TreeHugger Robot
Treehugger Robot
Holly Sun