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
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
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
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
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
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
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
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
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
28b54fcc10
Merge "Fix inability to remove or interact with folder when removing 2nd item from folder" into udc-dev am: 8002897694 am: 893c0fddac
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24056558
Change-Id: I9bd98baf1225d10d010060bc539770c74900e81a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-17 18:44:23 +00: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
9b77c7a59d
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: I42538c7ba3fac95bb1914c0ef514b1f6c7b59822
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-17 18:39:13 +00: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
893c0fddac
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: Ic7f5fbb344116f2c75fefb7391f59b72740433df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-17 17:54:11 +00:00
22bc9983ed
Merge "Initial Taskbar drag-n-drop support for search results." into udc-qpr-dev am: 3f0e7e7c5d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24011563
Change-Id: I6838291da55f690898946094c5a6e8ece27a4d3b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-17 17:38:02 +00:00
43364a14b1
Merge "Removing LauncherActivityRule as it can be flaky based on when the rule was initialized" into udc-qpr-dev am: cd5d3d0c31
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24065401
Change-Id: Ic74ff46a87bfb86c812dc0316be20498c5bcddb7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-17 17:37:42 +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
f2aa70c477
Merge "Show tooltips on cursor hover of taskbar icons." into udc-qpr-dev am: f351e515f7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23369318
Change-Id: I5f5e14c6d79a1c393ce04bae663aec1282296396
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-17 10:51:19 +00:00
f351e515f7
Merge "Show tooltips on cursor hover of taskbar icons." into udc-qpr-dev
2023-07-17 10:15:46 +00:00
ebac5e9dfa
Merge "Handle nullable CellLayout when removing app icon from folder" into udc-qpr-dev am: ccd49005c9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24044953
Change-Id: I10bd7e01167f808110637d1f2b316a4b8bea6185
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-15 03:17:48 +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
283d8031a3
Merge "Creating a correctly populated mOccupied grid when reordering on foldables" into udc-dev am: be4a43c1d9 am: c0b3e59990 am: 2a623484f5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24060456
Change-Id: I08e3590f32f478ab02aa7baf7ba1da123e1e7a90
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-15 01:20:55 +00:00
eedec5194b
Merge "Creating a correctly populated mOccupied grid when reordering on foldables" into udc-dev am: be4a43c1d9 am: add37239db am: 95f8e8f465
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24060456
Change-Id: Id83146786b105daec5a7e0d8523bfb1c766a4025
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-15 01:20:46 +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
0ba758cd87
Merge "Creating a correctly populated mOccupied grid when reordering on foldables" into udc-dev am: be4a43c1d9 am: add37239db am: 61ef65582d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24060456
Change-Id: I25d7a23fec94184d613ff1ee7368fe3a969cdefd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-15 00:39:49 +00:00
42064106ba
Merge "Clean up SplitData refactor flag" into udc-qpr-dev am: 61c2bbe5b8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24082168
Change-Id: Ie3a5fbf2967a7acd2ccdc41ed64697ad81a09518
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-15 00:36:51 +00:00
2a623484f5
Merge "Creating a correctly populated mOccupied grid when reordering on foldables" into udc-dev am: be4a43c1d9 am: c0b3e59990
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24060456
Change-Id: Ia20be3afe0cb751cfa687c66e143f24342ec3577
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-15 00:33:37 +00: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
95f8e8f465
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: Ie7cc41b19a046a8b7b4d9892cd8868c459f801ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-15 00:30:57 +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
c0b3e59990
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: I95bb45ab696c10e608fad20730f68c5da70536fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-14 23:45:32 +00:00
61c2bbe5b8
Merge "Clean up SplitData refactor flag" into udc-qpr-dev
2023-07-14 23:25:27 +00:00
224f7360f1
Merge "Exposing the layout URI builder method, so that it can be used in tests" into udc-qpr-dev am: ef52e37e5f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24083957
Change-Id: I305872007824607d3ea8aaf6228b409dc76af702
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-14 23:06:43 +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
3f61b35ec8
[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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24073762
Change-Id: I7f3c67333574abd03a951e79752273660c0ecf48
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-14 21:11:12 +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