Steven Ng
8ec3545fb2
Merge "Add null check before detach content view from dragView at onDropComplete" into sc-dev am: 5b786ca88d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15042822
Change-Id: Ib55c3525909d6a4b4e4123c9197c364147e3639f
2021-06-23 21:16:57 +00:00
Steven Ng
3a813de8e1
Merge "Add null check before detach content view from dragView at onDropComplete" into sc-dev am: 5b786ca88d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15042822
Change-Id: I837c61ddaecacf198ce89be0949e79f29a2c7a3d
2021-06-23 21:16:53 +00:00
Steven Ng
fa9f70be03
Merge "Use default spans as min spans if the min spans > default spans" into sc-dev
2021-06-23 21:05:43 +00:00
Steven Ng
5b786ca88d
Merge "Add null check before detach content view from dragView at onDropComplete" into sc-dev
2021-06-23 21:01:57 +00:00
Alina Zaidi
9bc0939a10
Merge "Update string for no room on this Home screen toast." into sc-dev am: b7e15cf3b3 am: 7392cf9bbf am: e91ee8c09c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15079811
Change-Id: Ib2a8e672a80dbc3682adc146d53b91108ac97f69
2021-06-23 20:54:05 +00:00
Jonathan Miranda
2354be9f7c
Merge "Fix folders being light in dark mode." into sc-dev am: 5546b258c3 am: e7ce4caaed am: 8642568372
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15082515
Change-Id: I8c9f2e35932fc6a7adabdcb043a71658d9d0d62f
2021-06-23 20:54:00 +00:00
Alina Zaidi
1f72467ae8
Merge "Update string for no room on this Home screen toast." into sc-dev am: b7e15cf3b3 am: 565d7d8ec5 am: d49ed50acb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15079811
Change-Id: Iba8bfc95ebe3c16d6a7beafc9c7cc0c04eb23ac5
2021-06-23 20:53:53 +00:00
Jonathan Miranda
2ffa726ec6
Merge "Fix folders being light in dark mode." into sc-dev am: 5546b258c3 am: 328acc3b08 am: 5a2b4b9d56
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15082515
Change-Id: Ie5d5429c9f652e715ddf396f20bfa29d292ad358
2021-06-23 20:53:40 +00:00
Alina Zaidi
e481686af7
Merge "Update string for no room on this Home screen toast." into sc-dev am: b7e15cf3b3 am: bb92f9b06b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15079811
Change-Id: Icdd26a62b40a6d87ea58a3892466087b5608e5ec
2021-06-23 20:51:04 +00:00
Alina Zaidi
e91ee8c09c
Merge "Update string for no room on this Home screen toast." into sc-dev am: b7e15cf3b3 am: 7392cf9bbf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15079811
Change-Id: I6861430249d8f1e87e06d5fff82c14b80f23bd62
2021-06-23 20:50:44 +00:00
Jonathan Miranda
8642568372
Merge "Fix folders being light in dark mode." into sc-dev am: 5546b258c3 am: e7ce4caaed
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15082515
Change-Id: If2d9eb7e3df87243c1ae6e0304bec64a4c82bcd2
2021-06-23 20:50:38 +00:00
Jonathan Miranda
015af8b316
Merge "Fix folders being light in dark mode." into sc-dev am: 5546b258c3 am: a6009c7395
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15082515
Change-Id: I0ff342ed289f9e99a1a6e7a1dbd7b1d09dcfba69
2021-06-23 20:50:14 +00:00
Alina Zaidi
d49ed50acb
Merge "Update string for no room on this Home screen toast." into sc-dev am: b7e15cf3b3 am: 565d7d8ec5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15079811
Change-Id: I5e9f2e1b2125d1355ef88294bd47a103907d0547
2021-06-23 20:41:13 +00:00
Jonathan Miranda
5a2b4b9d56
Merge "Fix folders being light in dark mode." into sc-dev am: 5546b258c3 am: 328acc3b08
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15082515
Change-Id: I96a85a2d1166a04240666f5c4ce39a6740e1c56b
2021-06-23 20:40:59 +00:00
Alina Zaidi
bb92f9b06b
Merge "Update string for no room on this Home screen toast." into sc-dev am: b7e15cf3b3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15079811
Change-Id: I008a6657c6223ccde5f440f6638a57dd4a9099ff
2021-06-23 20:33:28 +00:00
Alina Zaidi
7392cf9bbf
Merge "Update string for no room on this Home screen toast." into sc-dev am: b7e15cf3b3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15079811
Change-Id: Iad854c8f22ed8923b42732644493063d7486eef6
2021-06-23 20:33:12 +00:00
Jonathan Miranda
e7ce4caaed
Merge "Fix folders being light in dark mode." into sc-dev am: 5546b258c3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15082515
Change-Id: I299041edaebfc0f333bcc7e56b3fe6489aa8c644
2021-06-23 20:32:45 +00:00
Alina Zaidi
565d7d8ec5
Merge "Update string for no room on this Home screen toast." into sc-dev am: b7e15cf3b3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15079811
Change-Id: I36fbef22d73b024291148c9dcb074c494b79921e
2021-06-23 20:32:34 +00:00
Jonathan Miranda
a6009c7395
Merge "Fix folders being light in dark mode." into sc-dev am: 5546b258c3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15082515
Change-Id: I2be241dfea0f823c375ad315413c852928ce31c8
2021-06-23 20:32:28 +00:00
Jonathan Miranda
328acc3b08
Merge "Fix folders being light in dark mode." into sc-dev am: 5546b258c3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15082515
Change-Id: Ide8fcf408f45b9c8c83e2ba672d47cfc4972844f
2021-06-23 20:31:51 +00:00
Tracy Zhou
eebb05a997
[automerger skipped] Merge "Finish recents animation on task dismissal only if the task is a live tile task" into sc-dev am: 2f8342d791 am: 57b5325ea0 -s ours am: 03ba878906 -s ours
...
am skip reason: Merged-In Ie1dd02a2e8cc401a613a0ed2199400712c6d5291 with SHA-1 d537968b35 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15072972
Change-Id: I60279333d42167f6dffe233fa7814762743dc7c7
2021-06-23 20:20:50 +00:00
Tracy Zhou
03ba878906
[automerger skipped] Merge "Finish recents animation on task dismissal only if the task is a live tile task" into sc-dev am: 2f8342d791 am: 57b5325ea0 -s ours
...
am skip reason: Merged-In Ie1dd02a2e8cc401a613a0ed2199400712c6d5291 with SHA-1 d537968b35 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15072972
Change-Id: I07b405713575b80db81e46e69532f31cd2787dd4
2021-06-23 20:18:36 +00:00
Tracy Zhou
1dfeb91306
[automerger skipped] Merge "Finish recents animation on task dismissal only if the task is a live tile task" into sc-dev am: 2f8342d791 am: 4c4122551c -s ours
...
am skip reason: Merged-In Ie1dd02a2e8cc401a613a0ed2199400712c6d5291 with SHA-1 d537968b35 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15072972
Change-Id: I1080155f6ed7265edcc1c9020ed28a48fbcbee13
2021-06-23 20:17:27 +00:00
Tracy Zhou
31872c83e8
[automerger skipped] Merge "Finish recents animation on task dismissal only if the task is a live tile task" into sc-dev am: 2f8342d791 -s ours am: b3c3ce8b0a -s ours am: 797124ac12 -s ours
...
am skip reason: Merged-In Ie1dd02a2e8cc401a613a0ed2199400712c6d5291 with SHA-1 2591768d54 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15072972
Change-Id: I7e6583a7f0604112b3b0a8d5fcdd297314d1e7f3
2021-06-23 20:17:18 +00:00
TreeHugger Robot
ee43c0c085
Merge "Fix Tapl Background.switchToOverview for tablets" into sc-v2-dev am: 5e72b9cad2 am: cd3d8ea4e6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15081337
Change-Id: I762abd6653429618e6880030eda290f6404980ce
2021-06-23 20:16:55 +00:00
Alina Zaidi
b7e15cf3b3
Merge "Update string for no room on this Home screen toast." into sc-dev
2021-06-23 20:15:52 +00:00
Jonathan Miranda
5546b258c3
Merge "Fix folders being light in dark mode." into sc-dev
2021-06-23 20:13:24 +00:00
Schneider Victor-tulias
e6b93993d1
Update Gesture navigation tutorial activity permissions
...
Temporarily removed REBOOT permission requirement from GESTURE_SANDBOX.
Fixes: 188035141
Test: manual
Change-Id: I11788d7c6dd5a7b10e8cc4400b17f5f2fec967f7
2021-06-23 13:08:21 -07:00
Tony Wickham
1351c2214d
Fix some touch issues during gesture nav transition
...
- Don't recreate the laucher transition controller if we've already ended it, as it could clobber a touch interaction that started in the meantime
- Test: swipe up from an app to overivew, swipe to dismiss it during the transition.
- Previously, we were ending the controller twice (once on touch down as we started proxying, and again in setupLauncherUiAfterSwipeUpToRecentsAnimation()), and the second one could happen after starting the dismiss interaction.
- Don't recreateControllers() if orientation didn't change
- Test: swipe up to go from an app to home, swipe up to all apps during the transition.
- Previously, we were getting the following sequence:
1. Touch down on home to start swiping to all apps - all current controllers get this down event to start determining whether to intercept
2. Before reaching touch slop, we recreateControllers(), so all new controllers won't get the down event and thus won't intercept
- Now, we avoid unnecessarily recreateControllers(), so the original controllers can still intercept.
Test: see above
Fixes: 189700453
Change-Id: Icfa5b6cdb32122adaf6ac8e8cb197b0c477dac60
2021-06-23 13:07:18 -07:00
Tracy Zhou
797124ac12
[automerger skipped] Merge "Finish recents animation on task dismissal only if the task is a live tile task" into sc-dev am: 2f8342d791 -s ours am: b3c3ce8b0a -s ours
...
am skip reason: Merged-In Ie1dd02a2e8cc401a613a0ed2199400712c6d5291 with SHA-1 2591768d54 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15072972
Change-Id: I2cbc0bbad3ee00510aed733caede378b4386474b
2021-06-23 20:07:18 +00:00
TreeHugger Robot
cd3d8ea4e6
Merge "Fix Tapl Background.switchToOverview for tablets" into sc-v2-dev am: 5e72b9cad2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15081337
Change-Id: I23f1c16fb7767662e5f341de1e8d2030297a348e
2021-06-23 20:07:13 +00:00
Tracy Zhou
b3c3ce8b0a
[automerger skipped] Merge "Finish recents animation on task dismissal only if the task is a live tile task" into sc-dev am: 2f8342d791 -s ours
...
am skip reason: Merged-In Ie1dd02a2e8cc401a613a0ed2199400712c6d5291 with SHA-1 2591768d54 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15072972
Change-Id: Id37ad50e6817629e5d8794e4cc2fb6ea69157de7
2021-06-23 19:59:16 +00:00
Tracy Zhou
57b5325ea0
Merge "Finish recents animation on task dismissal only if the task is a live tile task" into sc-dev am: 2f8342d791
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15072972
Change-Id: I170a70be63666397f5246c87370d0fb703f2e8d6
2021-06-23 19:59:00 +00:00
Tracy Zhou
4c4122551c
Merge "Finish recents animation on task dismissal only if the task is a live tile task" into sc-dev am: 2f8342d791
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15072972
Change-Id: I166398b0501d76bc5339330f7780f5440c410493
2021-06-23 19:58:59 +00:00
TreeHugger Robot
5e72b9cad2
Merge "Fix Tapl Background.switchToOverview for tablets" into sc-v2-dev
2021-06-23 19:54:07 +00:00
Tracy Zhou
2f8342d791
Merge "Finish recents animation on task dismissal only if the task is a live tile task" into sc-dev
2021-06-23 19:40:15 +00:00
Samuel Fufa
b4a497977f
Merge "Polish work for work profile" into sc-dev am: 1e70c235cf am: 50c273b975 am: ee4e478988
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15031833
Change-Id: If64c39174d67a4d9f1577328abaadc2ce9583ff7
2021-06-23 19:29:17 +00:00
Lucas Dupin
d1765ced20
Merge "Disable blurs when dev setting or battery saver" into sc-dev am: 697e51cd8c am: ccb41eca9c am: 3a5cc4e9f0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15069844
Change-Id: I0e9dab630488934a1ff5c3461123839d99ab035d
2021-06-23 19:28:14 +00:00
Samuel Fufa
ecd51222ac
Merge "Polish work for work profile" into sc-dev am: 1e70c235cf am: 6c2c69cd97 am: 534574d568
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15031833
Change-Id: I04b772e05c8c321e875198c4ca62f6c4ab8a3f42
2021-06-23 19:27:32 +00:00
Samuel Fufa
512f54d57c
Merge "Polish work for work profile" into sc-dev am: 1e70c235cf am: 770b6a182a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15031833
Change-Id: I4d641524d85183379c3db51a248170af5a9707dc
2021-06-23 19:26:41 +00:00
Lucas Dupin
11a03a6b1f
Merge "Disable blurs when dev setting or battery saver" into sc-dev am: 697e51cd8c am: 8ee65b1d75 am: d9186e0506
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15069844
Change-Id: I77ba003446a42ea9dd0470fa16239e5702febf2b
2021-06-23 19:25:56 +00:00
Samuel Fufa
ee4e478988
Merge "Polish work for work profile" into sc-dev am: 1e70c235cf am: 50c273b975
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15031833
Change-Id: I0851131c14850c5efe35bdf50899508dd2321fd8
2021-06-23 19:25:24 +00:00
Lucas Dupin
3a5cc4e9f0
Merge "Disable blurs when dev setting or battery saver" into sc-dev am: 697e51cd8c am: ccb41eca9c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15069844
Change-Id: I8a6204c3e38df003a568f7a1fbead6e1671c4da9
2021-06-23 19:25:10 +00:00
Lucas Dupin
4d86e17e9d
Merge "Disable blurs when dev setting or battery saver" into sc-dev am: 697e51cd8c am: 4f22283658
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15069844
Change-Id: I56502e0a130e0ca202f4e0f806fd021afc7a43b8
2021-06-23 19:24:38 +00:00
Samuel Fufa
534574d568
Merge "Polish work for work profile" into sc-dev am: 1e70c235cf am: 6c2c69cd97
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15031833
Change-Id: Ie52ddc6522c5dc8364e90793f25b10837daa6601
2021-06-23 19:24:23 +00:00
Lucas Dupin
d9186e0506
Merge "Disable blurs when dev setting or battery saver" into sc-dev am: 697e51cd8c am: 8ee65b1d75
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15069844
Change-Id: I54e1efe0b7c28d58a8408926e4615152c0e29d27
2021-06-23 19:05:23 +00:00
Samuel Fufa
6c2c69cd97
Merge "Polish work for work profile" into sc-dev am: 1e70c235cf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15031833
Change-Id: Ie9cf60cd89c805c7341e2725259152215edea889
2021-06-23 19:00:41 +00:00
Lucas Dupin
8ee65b1d75
Merge "Disable blurs when dev setting or battery saver" into sc-dev am: 697e51cd8c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15069844
Change-Id: Ia7bcf27ad8aba1a9115481f5ba4f9d77bf56d3a8
2021-06-23 19:00:14 +00:00
Samuel Fufa
50c273b975
Merge "Polish work for work profile" into sc-dev am: 1e70c235cf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15031833
Change-Id: I4606c7d7139d74e9a0eff692f5a2a84b1bdc200c
2021-06-23 18:59:22 +00:00
Samuel Fufa
770b6a182a
Merge "Polish work for work profile" into sc-dev am: 1e70c235cf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15031833
Change-Id: Ib803b97f7e50fdbddcd13a99359f67b4080c4851
2021-06-23 18:59:22 +00:00