Sunny Goyal
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
Federico Baron
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
Brian Isganitis
3f0e7e7c5d
Merge "Initial Taskbar drag-n-drop support for search results." into udc-qpr-dev
2023-07-17 17:08:15 +00:00
Sunny Goyal
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
Alex Chau
625709617e
Clean-up b/260135164 logs
...
Fix: 271242509
Test: manual
Change-Id: I2c5421539f8f70897b142dfdaa6bc97a10225309
2023-07-17 15:30:31 +01:00
Pat Manning
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
Pat Manning
f351e515f7
Merge "Show tooltips on cursor hover of taskbar icons." into udc-qpr-dev
2023-07-17 10:15:46 +00:00
Android Build Coastguard Worker
6980a07995
Snap for 10503120 from ccd49005c9 to udc-qpr1-release
...
Change-Id: I6acfeddcaec9f10f20d5efeb302568f0b287de91
2023-07-15 21:18:36 +00:00
Android Build Coastguard Worker
16d8dff238
Merge cherrypicks of ['googleplex-android-review.googlesource.com/24060456'] into udc-release.
...
Change-Id: Ib62cd5af6d42a792b593a21fa094727717f21f73
2023-07-15 07:06:59 +00:00
Sebastian Franco
e79837c0f6
Creating a correctly populated mOccupied grid when reordering on foldables
...
On ag/21680045 I copy the previous mOccupied but the right thing to do is to
create a new one with all the views information.
Some test stoped running inadvertently that's why we didn't catch this issue.
There is a separate cl with the test to ensure we can catch it later on.
Fix: 289584301
Test: ReorderWidgets
(cherry picked from commit 1c5514b566 )
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:52d9d9780fb5a83302dd6fb3d875635a2ee57e1c )
Merged-In: I27b5a6e38a556d1c73ff8fbbdd552da6045e5b64
Change-Id: I27b5a6e38a556d1c73ff8fbbdd552da6045e5b64
2023-07-15 07:01:15 +00:00
Fengjiang Li
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
Fengjiang Li
ccd49005c9
Merge "Handle nullable CellLayout when removing app icon from folder" into udc-qpr-dev
2023-07-15 02:44:31 +00:00
Android Build Coastguard Worker
5b157d744f
Snap for 10500749 from e6a87b913b to udc-qpr1-release
...
Change-Id: I406e654c357004ba3f87de2c6f0c2ed201c5c926
2023-07-15 01:24:16 +00:00
Sebastián Franco
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
Sebastián Franco
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
Vinit Nayak
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
Sebastián Franco
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
TreeHugger Robot
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
Sebastián Franco
ea8d295842
Merge "Creating a correctly populated mOccupied grid when reordering on foldables" into udc-dev am: be4a43c1d9 am: 42bfee4120
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24060456
Change-Id: Ic494748743365bc478d8c8ee654b8093be6d0e1c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-15 00:33:38 +00:00
Sebastián Franco
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
Sebastián Franco
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
Sebastián Franco
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
Bill Yi
b8d6c77f02
Merge "Import translations. DO NOT MERGE ANYWHERE" into main
2023-07-15 00:10:20 +00:00
Bill Yi
eb9d20f37d
Merge "Import translations. DO NOT MERGE ANYWHERE" into main
2023-07-15 00:10:20 +00:00
Sebastián Franco
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
Sebastián Franco
42bfee4120
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: I7b2ab67ba66910179e5c2a5f101faf9c23112880
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-14 23:49:50 +00:00
Sebastián Franco
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
TreeHugger Robot
61c2bbe5b8
Merge "Clean up SplitData refactor flag" into udc-qpr-dev
2023-07-14 23:25:27 +00:00
TreeHugger Robot
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
Sebastián Franco
be4a43c1d9
Merge "Creating a correctly populated mOccupied grid when reordering on foldables" into udc-dev
2023-07-14 22:43:16 +00:00
Treehugger Robot
f4f289a702
[automerger skipped] Merge "[a11y] Fix crash when using talkback to add to home screen." into udc-d1-dev am: 2a749f1e60 -s ours am: c6c095bea9 -s ours am: 8f26f89a30 -s ours
...
am skip reason: Merged-In Id3e1444de188f2d2af760f58e3d9814a2b7abd88 with SHA-1 35b9960b63 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23877939
Change-Id: Ie96d1b96c84cdc25e88e7fb39c5fcc092da38cac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-14 22:11:46 +00:00
Holly Sun
38fc25d2d0
[automerger skipped] [a11y] Fix crash when using talkback to add to home screen. am: 1a9a98005d -s ours am: 0a447aeb92 -s ours am: 9814f6218c -s ours
...
am skip reason: Merged-In Id3e1444de188f2d2af760f58e3d9814a2b7abd88 with SHA-1 35b9960b63 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23877939
Change-Id: I1b9e0f7ca63dafd70b1d85771fa399fd7eb6cdef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-14 22:11:43 +00:00
TreeHugger Robot
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
TreeHugger Robot
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
f293c43201
[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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24073762
Change-Id: Ib82931f9852a903e44eee00fc8e259b2224e4c7f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-14 21:11:09 +00:00
Automerger Merge Worker
5e6bc6c6d2
Merge changes from topic "am-f284c104facc4c2687b457ff7784d299" into udc-qpr-dev-plus-aosp
...
* changes:
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 5726fa83cc -s ours am: c4618da583 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cb3dd3968c -s ours am: eff881254b -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 112ba79d1b -s ours am: 773159950f -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0835d8178d -s ours am: 1cdef9db12 -s ours
2023-07-14 21:04:50 +00:00
TreeHugger Robot
5f45c77624
[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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24073762
Change-Id: Id901e5b1433848adb5b779baca8e8b2ce92c8c61
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-14 21:03:32 +00:00
Bill Yi
020efd95c0
[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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24073762
Change-Id: I19e21c3046a199817cc4a4f84d1bb4fe250dfcec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-14 21:03:29 +00:00
Bill Yi
bd1b49472b
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 5726fa83cc -s ours am: c4618da583 -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: I304e16ebf595e8173e61f86932ec6ef329d6d984
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-14 21:03:00 +00:00
Bill Yi
77163494c3
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cb3dd3968c -s ours am: eff881254b -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: I402a6ab3cb397f3f62a5bee49bfea7ad3d6e7d2a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-14 21:02:42 +00:00
Bill Yi
e47a1c5c37
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 112ba79d1b -s ours am: 773159950f -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: I554622cdfab9a960cb1938a0cd95e254fc7e9617
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-14 21:02:25 +00:00
Bill Yi
2b44b7543f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0835d8178d -s ours am: 1cdef9db12 -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: I3834b27484ce2ee8f57434d2c94a958ffc883e7d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-14 21:02:05 +00:00
TreeHugger Robot
d1d0bf3ad1
[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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24073762
Change-Id: I6e5a19cbb9a18dde278cb1bdefcdcfaa67986e64
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-14 21:00:36 +00:00
Bill Yi
4684d84764
[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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24073762
Change-Id: I3aac16096cc8e42278c22317a7c100b7776eca86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-14 21:00:34 +00:00
Automerger Merge Worker
b5add2838c
Merge changes from topic "am-c46e753e59a04ec0be6cb1735ffa925e" into udc-qpr-dev-plus-aosp
...
* changes:
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: 5f3dcef134 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 686e14eaf4 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: 1a2cdeff60 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 90a55fac7c -s ours
2023-07-14 20:56:44 +00:00
Bill Yi
5003c58c5f
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 5726fa83cc -s ours am: 6c1d2a18d6 -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: Iaebe7cdf72ecbafd389808141006526a4d141796
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-14 20:55:07 +00:00
Bill Yi
fc5d1cd6b7
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cb3dd3968c -s ours am: 1b996bf3c7 -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: Ia846fc170ef3d7b2dc0b4b59b6c8c3ea84df8c17
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-14 20:54:54 +00:00
Bill Yi
075b20b09f
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 112ba79d1b -s ours am: b3c593221b -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: I5cbb783288dd76a4d772be36d630e7b206dac6ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-14 20:54:32 +00:00
Bill Yi
425d1cfeab
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: 5f3dcef134 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24078651
Change-Id: I20ba1b6fe4cd5d79e852ad53574009bdaf74dad0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-14 20:54:26 +00:00
Bill Yi
77adbda9c0
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0835d8178d -s ours am: 626bb22f90 -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: I9322ee8cd4c2a7c8a7b736d84ecac4a5cfdb0df2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-14 20:54:13 +00:00