cd3ced3cb5
[automerger skipped] Implement two intents or shortcuts to active split am: e1826dbdc7 am: 021ba2af3b -s ours
...
am skip reason: skipped by user tonyychuang
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22343296
Change-Id: Ie9bee24a302ce51b2f944c9d71f19ef78be7ec84
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-06 07:40:40 +00:00
021ba2af3b
Implement two intents or shortcuts to active split am: e1826dbdc7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22343296
Change-Id: I5fceaa02aea13f0d7fd4c6dd79a15a6220a7fda7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-06 05:52:16 +00:00
e1826dbdc7
Implement two intents or shortcuts to active split
...
Implement two intents or shortcuts to active split with shell
transition.
Fix: 259368992
Test: manual
Test: pass existing tests
Change-Id: I13522531022b635dc8508a3213b6f414a6b50ce9
2023-04-06 05:19:50 +00:00
bf7f376b54
Merge "Fix bug with split screen not recognizing user differences"
2023-04-06 02:57:15 +00:00
e9762520e4
Merge "Make navbar scrim taskbar background if taskbar is enabled." into udc-dev am: 93f20cc2d5 am: 592c9c4147
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22387706
Change-Id: Ie3b577a7f446a8da7c9ca385d723a4d36e708f4d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-06 01:06:55 +00:00
2c30652d72
Merge "Make navbar scrim taskbar background if taskbar is enabled." into udc-dev am: 93f20cc2d5 am: ed36b2f2da
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22387706
Change-Id: Ib12ce9e9bd5a9b6c3faace60b4deb5bc799a870f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-06 01:06:10 +00:00
592c9c4147
Merge "Make navbar scrim taskbar background if taskbar is enabled." into udc-dev am: 93f20cc2d5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22387706
Change-Id: I6e80b3939a5951490e466bd808fe3e03e8e767f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-06 00:39:17 +00:00
ed36b2f2da
Merge "Make navbar scrim taskbar background if taskbar is enabled." into udc-dev am: 93f20cc2d5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22387706
Change-Id: Ide1a0dc2a5ef5fb6d885c9a5d9c3a7065088f046
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-06 00:37:01 +00:00
93f20cc2d5
Merge "Make navbar scrim taskbar background if taskbar is enabled." into udc-dev
2023-04-05 23:58:01 +00:00
8b3808299b
Merge "Allow grids to specify if we should start align taskbar in 3 button nav." into tm-qpr-dev am: 65ac592f40 am: a2b770b484 am: 75f7bbc150 am: 888a8b704c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22361600
Change-Id: Ic9ba13864facfd846bd843822ac49767ace83df6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-05 23:45:09 +00:00
4039fbda40
Merge "Removing support for legacy shortcuts from default layouts" into udc-dev am: 8382546a11 am: c32705ce7b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22351739
Change-Id: Icd6f7390dd0d40fc7aa52ae3de6e52e500dc3a9a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-05 23:44:19 +00:00
8b2daf8bd9
Merge "Clean up QUICK_WALLPAPER_PICKER." into udc-dev am: 5489507e69 am: 9944f6f853
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22426081
Change-Id: I7d717611702eb356416d71fc43fe8a43c40be608
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-05 23:42:09 +00:00
231a0e4289
Merge "Improving a flakey uninstall from allapps test." into udc-dev am: 6598fab10c am: dd8b77fb55
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22478023
Change-Id: I15446b61352f1ab3d01fcec83af65574d0a2f555
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-05 23:32:25 +00:00
3dbdd60f71
Merge "Write ViewCapture data to WmTrace when WindowManager dumps." into udc-dev am: 3d877d3b04 am: 6249b38ee4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22189048
Change-Id: I76407b682c4e3cff57b3dbe4bde0bc5b4cd3eb0b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-05 23:30:13 +00:00
538ac34669
Merge "Allow user gesture to take priority over taskbar translation reset animnatiuon." into tm-qpr-dev am: 4288be12a7 am: b5482137ef am: a65e16fc67 am: 74f23d97c3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22464244
Change-Id: I1af0d1ad4cce94725877a860aa3d034849a03422
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-05 23:29:40 +00:00
b961827c02
Merge "Allow grids to specify if we should start align taskbar in 3 button nav." into tm-qpr-dev am: 65ac592f40 am: a2b770b484 am: 75f7bbc150 am: 1cab940110
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22361600
Change-Id: Icff035412a05b8eb680869276b8d6ab5bf8995c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-05 23:24:43 +00:00
caffc2c926
Merge "Removing support for legacy shortcuts from default layouts" into udc-dev am: 8382546a11 am: cee5782448
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22351739
Change-Id: I222144b1ccca8348ecc7296cd2ce155b782b8e5f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-05 23:21:52 +00:00
888a8b704c
Merge "Allow grids to specify if we should start align taskbar in 3 button nav." into tm-qpr-dev am: 65ac592f40 am: a2b770b484 am: 75f7bbc150
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22361600
Change-Id: I09de4f12250ff7bec0bb8204193c192192f1eb8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-05 23:21:46 +00:00
c32705ce7b
Merge "Removing support for legacy shortcuts from default layouts" into udc-dev am: 8382546a11
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22351739
Change-Id: I58e70b7f4beb76b5e096c71b465ca70972b797b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-05 23:20:26 +00:00
9944f6f853
Merge "Clean up QUICK_WALLPAPER_PICKER." into udc-dev am: 5489507e69
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22426081
Change-Id: Ie74079728a496abf69234c33ddeea51a9dc8fc49
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-05 23:18:10 +00:00
dd8b77fb55
Merge "Improving a flakey uninstall from allapps test." into udc-dev am: 6598fab10c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22478023
Change-Id: I66bc53445f930481aa91d1de0ca6409576532772
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-05 23:05:57 +00:00
6249b38ee4
Merge "Write ViewCapture data to WmTrace when WindowManager dumps." into udc-dev am: 3d877d3b04
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22189048
Change-Id: I1ed6db7dbb16f55270b181b20474c70eac31b551
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-05 22:58:26 +00:00
74f23d97c3
Merge "Allow user gesture to take priority over taskbar translation reset animnatiuon." into tm-qpr-dev am: 4288be12a7 am: b5482137ef am: a65e16fc67
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22464244
Change-Id: Ic2afd705158a9d6438f5d1068a7da9acb5881515
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-05 22:57:40 +00:00
1cab940110
Merge "Allow grids to specify if we should start align taskbar in 3 button nav." into tm-qpr-dev am: 65ac592f40 am: a2b770b484 am: 75f7bbc150
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22361600
Change-Id: I42fe5668a3af9c2ec1788d1e9b137c8aa5f435a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-05 22:55:34 +00:00
cee5782448
Merge "Removing support for legacy shortcuts from default layouts" into udc-dev am: 8382546a11
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22351739
Change-Id: I2e0bfb7fa547a999db77086388b9457dc0730e02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-05 22:51:42 +00:00
75f7bbc150
Merge "Allow grids to specify if we should start align taskbar in 3 button nav." into tm-qpr-dev am: 65ac592f40 am: a2b770b484
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22361600
Change-Id: I41eea8cf3fa15c9c5c3f3184f2ba75318332f623
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-05 22:36:14 +00:00
8382546a11
Merge "Removing support for legacy shortcuts from default layouts" into udc-dev
2023-04-05 22:26:36 +00:00
5009f5a123
Merge "Clean up QUICK_WALLPAPER_PICKER." into udc-dev am: 5489507e69 am: 858c8d629d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22426081
Change-Id: If9c687f7b480608e6bf908e842fe7da906dba25a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-05 22:17:17 +00:00
858c8d629d
Merge "Clean up QUICK_WALLPAPER_PICKER." into udc-dev am: 5489507e69
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22426081
Change-Id: I83a6385d36b85ffbce1eedec5d5df134796431c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-05 22:09:41 +00:00
a2b770b484
Merge "Allow grids to specify if we should start align taskbar in 3 button nav." into tm-qpr-dev am: 65ac592f40
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22361600
Change-Id: I71c7f33286ccfa770f87b812c8ec27fa4ecb25ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-05 22:06:49 +00:00
5489507e69
Merge "Clean up QUICK_WALLPAPER_PICKER." into udc-dev
2023-04-05 21:56:33 +00:00
65ac592f40
Merge "Allow grids to specify if we should start align taskbar in 3 button nav." into tm-qpr-dev
2023-04-05 21:46:40 +00:00
0a7106ff79
Merge "Don't return early if searching during rebindAdapters()." into udc-dev am: c62a0672ab am: d92f9fe54d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22266746
Change-Id: I6e10a5de131409c624d803ac65819d1c0fe3c41e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-05 21:04:04 +00:00
ee7c03c89d
Merge "Improving a flakey uninstall from allapps test." into udc-dev am: 6598fab10c am: 14fbae59ce
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22478023
Change-Id: I8d2618def50860381d03f14a59c1803ffa0fd77b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-05 21:02:01 +00:00
5aff9baa39
Merge "Write ViewCapture data to WmTrace when WindowManager dumps." into udc-dev am: 3d877d3b04 am: 646315ab2d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22189048
Change-Id: Ic43e3234714cd1039065ebe42b8a6c137413daa8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-05 21:00:56 +00:00
bed61fdc61
Merge "Allow user gesture to take priority over taskbar translation reset animnatiuon." into tm-qpr-dev am: 4288be12a7 am: b5482137ef am: a65e16fc67 am: 8e71c52e3d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22464244
Change-Id: Id854e592b676f2eb572988521e2740cccfad9593
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-05 20:55:53 +00:00
16fe6938ca
Merge "Don't return early if searching during rebindAdapters()." into udc-dev am: c62a0672ab am: b8550f3e32
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22266746
Change-Id: I9ba54c778e80666b2be0b88c6ba243792cdf2a8d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-05 20:53:14 +00:00
613ffc9031
Fix bug with split screen not recognizing user differences
...
This patch fixes a bug where split screen did not fully support launching intents with different users.
The bug arose because SplitSelectStateController only had one place to store user information about the staged intent, mUser, but this disregarded the fact that the secondary app could also be passed in as an intent, and could belong to a different user from that of the initial app and the existing context. We need to support this case now since we now allow second-app selection from Taskbar.
Fixed by splitting the field into mInitialUser and mSecondUser, which will be tightly bound with mInitialTaskIntent and mSecondTaskIntent to make sure that Intents are always launched with the correct UserHandle.
Fixes: 275410160
Test: Manual
Change-Id: Ic904672769be8fd116180d457b36eb567c5ee304
2023-04-05 20:51:48 +00:00
14fbae59ce
Merge "Improving a flakey uninstall from allapps test." into udc-dev am: 6598fab10c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22478023
Change-Id: Ib75f5891693b54fea42292d37a1431a7930a3a57
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-05 20:36:10 +00:00
646315ab2d
Merge "Write ViewCapture data to WmTrace when WindowManager dumps." into udc-dev am: 3d877d3b04
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22189048
Change-Id: Ia44f32d543c045f7552288460117bb5d16f2a283
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-05 20:35:21 +00:00
d92f9fe54d
Merge "Don't return early if searching during rebindAdapters()." into udc-dev am: c62a0672ab
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22266746
Change-Id: I62442cdd269272b64b0da6d5567066ded364792c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-05 20:34:41 +00:00
6598fab10c
Merge "Improving a flakey uninstall from allapps test." into udc-dev
2023-04-05 20:27:10 +00:00
afaa8f0bfe
Removing support for legacy shortcuts from default layouts
...
Launcher will only allow deep shortcuts to be pinned on homescreen.
Bug: 275875209
Test: Updated tests
Flag: N/A
Change-Id: I4f2674deb9cd81dd07d5d537f35a51b030a183da
2023-04-05 20:20:34 +00:00
3d877d3b04
Merge "Write ViewCapture data to WmTrace when WindowManager dumps." into udc-dev
2023-04-05 20:19:42 +00:00
8e71c52e3d
Merge "Allow user gesture to take priority over taskbar translation reset animnatiuon." into tm-qpr-dev am: 4288be12a7 am: b5482137ef am: a65e16fc67
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22464244
Change-Id: I085d1d023edfde39a8d194f29c2fc98a6ed59314
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-05 20:16:08 +00:00
b8550f3e32
Merge "Don't return early if searching during rebindAdapters()." into udc-dev am: c62a0672ab
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22266746
Change-Id: I7bb982afdde4a8e9221a8ed9794edd1daed8a116
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-05 20:11:45 +00:00
a65e16fc67
Merge "Allow user gesture to take priority over taskbar translation reset animnatiuon." into tm-qpr-dev am: 4288be12a7 am: b5482137ef
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22464244
Change-Id: I94b42f6ae10da01e70f6d5555ff596a5d7263785
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-05 19:39:11 +00:00
c62a0672ab
Merge "Don't return early if searching during rebindAdapters()." into udc-dev
2023-04-05 19:33:43 +00:00
b5482137ef
Merge "Allow user gesture to take priority over taskbar translation reset animnatiuon." into tm-qpr-dev am: 4288be12a7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22464244
Change-Id: I75fdac300d2875b28ef0b230c27396c68b469ade
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-05 18:47:26 +00:00
4288be12a7
Merge "Allow user gesture to take priority over taskbar translation reset animnatiuon." into tm-qpr-dev
2023-04-05 18:20:16 +00:00
Tony Huang
Jeremy Sim
Brian Isganitis
TreeHugger Robot
Sunny Goyal
Andrew Cole
Stefan Andonian
Jon Miranda