0821b06607
Merge "Revert "fix broken build on erorrprone"" into tm-dev am: cdcbebb752
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17766955
Change-Id: I8c8b85e6ff03277a901bfc1ba363880ef05adc2b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-15 04:31:37 +00:00
cdcbebb752
Merge "Revert "fix broken build on erorrprone"" into tm-dev
2022-04-15 04:09:57 +00:00
b709655961
Merge "Fix flicker when entering PiP from split-screen / overview" into tm-dev am: 778b5e6bd0 am: a53f1fb84a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17762727
Change-Id: Ie3d261d2f0e4bf1ef8c9a1b09b9df07d0aef87c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-15 03:43:14 +00:00
a53f1fb84a
Merge "Fix flicker when entering PiP from split-screen / overview" into tm-dev am: 778b5e6bd0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17762727
Change-Id: I4278d0588c423eb6c3da61b6dc903bc828e75f14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-15 03:09:21 +00:00
778b5e6bd0
Merge "Fix flicker when entering PiP from split-screen / overview" into tm-dev
2022-04-15 02:48:08 +00:00
157ff20c40
Merge "Improving folder icon drawable" into tm-dev am: 2248d74666 am: f88d280061
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17664075
Change-Id: I705a13fdfea9eb8ab9932e763c1be8224c61a37c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 23:58:13 +00:00
abea3bd0cd
Merge "Add flag that disables depth on overlay scroll" into tm-dev am: 8c65675382 am: ac1d0b7089
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17766312
Change-Id: Id36a98777f2067abbc285ef5013c139af1f9bbe7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 23:57:27 +00:00
645af0a6b3
Revert "fix broken build on erorrprone"
...
Revert submission 17730702-fixErrorProneBuild
Reason for revert: Breaks Launcher3 unbundled build by using hidden library in main Launcher code
Reverted Changes:
Id0ce4d308:Change version checks to use SdkLevel.isAtLeast*
I8fc801b00:fix broken build on erorrprone
Change-Id: Ib1cd50a746bad3b6fb9fbd455a7cdce30f341d8b
2022-04-14 16:54:07 -07:00
f88d280061
Merge "Improving folder icon drawable" into tm-dev am: 2248d74666
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17664075
Change-Id: I924952cab4ae79ec45c3f021d9ca0ba4f5239c36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 23:41:10 +00:00
2248d74666
Merge "Improving folder icon drawable" into tm-dev
2022-04-14 23:35:05 +00:00
ac1d0b7089
Merge "Add flag that disables depth on overlay scroll" into tm-dev am: 8c65675382
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17766312
Change-Id: Id951c79d8a00f2058f436451ca833fd61b03efef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 23:34:50 +00:00
8c65675382
Merge "Add flag that disables depth on overlay scroll" into tm-dev
2022-04-14 23:16:20 +00:00
2604dd348c
Move Taskbar background drawing to TaskbarBackgroundRenderer
...
Currently used by both TaskbarDragLayer and TaskbarScrimView
Test: stash and unstash taskbar, background drawn as before; open a
Bubble and ensure taskbar is still scrimmed
Bug: 225200928
Change-Id: I3f7f4c1b1232b53c3eacb0e000d1c3aec25bb49d
2022-04-14 14:18:35 -07:00
4d90868075
Add flag that disables depth on overlay scroll
...
Test: manual
Fixes: 229261804
Change-Id: I132d9b5ca78255447ca72655b0a1fb1a4f86c3a1
2022-04-14 14:06:11 -07:00
013a8a75ab
Removing AM.getTasks call on UI thread during touch down
...
We maintain a cached task queue using TaskStackChangeListener.
It keeps the top RunningTaskInfo partially in sync with platfrom:
taskInfo is only initialized when the top task changes
but not when there are changes within the task itself.
Bug: 214581894
Bug: 220742398
Test: Manual and presubmit
Change-Id: Ifafde574040c03435b78f044350c45f3b49c4bcb
2022-04-14 14:02:28 -07:00
cb4ba9fe73
Merge "Prevent double selection of second split app" into tm-dev am: 998c47e594 am: 726c49e77c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17622348
Change-Id: I815795ea8b0c589189ab98da3319f73af16fe446
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 20:46:34 +00:00
14fc91ff3e
Merge "Updating code due to TaskStackChangeListener changes" into tm-dev am: bc25ec02a2 am: c03a5a6e80
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17730696
Change-Id: Ic4862c56d9ea47bfde93ec033cf768edd1f6c434
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 20:45:28 +00:00
726c49e77c
Merge "Prevent double selection of second split app" into tm-dev am: 998c47e594
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17622348
Change-Id: I35004afb26a3133e0789722ed2d8643a51a82012
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 20:44:14 +00:00
c03a5a6e80
Merge "Updating code due to TaskStackChangeListener changes" into tm-dev am: bc25ec02a2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17730696
Change-Id: I2cb0a6148e225319f5b9ef187eef68fe1cf7d802
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 20:15:51 +00:00
998c47e594
Merge "Prevent double selection of second split app" into tm-dev
2022-04-14 20:13:59 +00:00
bc25ec02a2
Merge "Updating code due to TaskStackChangeListener changes" into tm-dev
2022-04-14 20:11:58 +00:00
4140547827
Merge "Showing alert dialog when shortcut version higher than the App" into tm-dev am: af91920955 am: f8a6c58e0d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17538946
Change-Id: I9c7da7281d1c091b767f3e472ace780094510524
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 19:50:20 +00:00
f8a6c58e0d
Merge "Showing alert dialog when shortcut version higher than the App" into tm-dev am: af91920955
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17538946
Change-Id: Ic7459ffa871e7cea568f4d6be0992dd7a16f085b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 19:28:23 +00:00
af91920955
Merge "Showing alert dialog when shortcut version higher than the App" into tm-dev
2022-04-14 18:26:10 +00:00
ab1891e213
Merge "fix broken build on erorrprone" into tm-dev am: ad90ded7bc am: 1ff6d5fd4e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17730702
Change-Id: I161d2c16d738cbdacec0981dbda7a17101713e28
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 18:14:06 +00:00
47633c9c3f
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: f78ff2b90d -s ours am: c19ce4bf3e -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17716019
Change-Id: I5903064b4aa676dd602d4e24327c5a69235dbfca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 18:13:12 +00:00
4f3656b607
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 05e2272138 -s ours am: e635744297 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17716019
Change-Id: Iaa6ac651512ec85eeea0ba738cd8f285762153b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 18:13:11 +00:00
9e7bb1c523
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 4918b0245b -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17716022
Change-Id: I756d0cd4cfcb607455a85c8483a8e4f117e26551
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 18:12:29 +00:00
d60f59b1c1
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c5f5f9c52e -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17716022
Change-Id: I376eb8abd8e50b74eb9ec1518d95664c6c7539ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 18:12:27 +00:00
a4e5a9eebe
Prevent double selection of second split app
...
* Also fix small other bug where we were
checking only for LauncherState
OVERVIEW_SPLIT_SELECT and not for equivalent
3P RecentsState
Fixes: 227419997
Test: Repro steps don't cause bug. Yay.
Change-Id: Ibb8238185b959d22d8455b6812d29b2e268d9739
2022-04-14 11:06:47 -07:00
d6e20e17fe
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 4561a37a72 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17716402
Change-Id: I30670211fb408ba4416b5878bc57c4ac3a231572
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 18:06:44 +00:00
161cf15b59
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 50594a6a1b -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17716402
Change-Id: I2cb42b6855016fc730b0e401c48c9f8949a62ee9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 18:06:41 +00:00
1ff6d5fd4e
Merge "fix broken build on erorrprone" into tm-dev am: ad90ded7bc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17730702
Change-Id: If9d25c16a5014ea6616904955e1223413351042b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 18:06:18 +00:00
ad90ded7bc
Merge "fix broken build on erorrprone" into tm-dev
2022-04-14 18:00:10 +00:00
c19ce4bf3e
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: f78ff2b90d -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17716019
Change-Id: I027f61e39192559d78343c432f36227780ebfa79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 17:49:56 +00:00
e635744297
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 05e2272138 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17716019
Change-Id: Ie56489613e60cae61522282c90b901e7b01faf93
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 17:49:54 +00:00
5f5bd84d99
Fix flicker when entering PiP from split-screen / overview
...
This is a follow-up of ag/16418447 where we hide the Tasks in
split-screen mode on swipe-home-to-pip and here we use the same
mechanism when we are entering PiP from the overview and the pip-able
task is in split-screen mode.
Video: http://recall/-/aaaaaabFQoRHlzixHdtY/bNtg3ZOhuTBKm9nU9CPeNQ
Bug: 228289777
Test: follow the reproduce steps in bug, see video
Change-Id: Icab11d52cedaf94af0ee72023cebca8ec51d8851
2022-04-14 10:49:29 -07:00
4918b0245b
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev
2022-04-14 17:12:58 +00:00
4561a37a72
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev
2022-04-14 17:12:02 +00:00
f78ff2b90d
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev
2022-04-14 17:10:53 +00:00
5451806368
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 66a79956b3 -s ours am: 0ea47ea8df -s ours am: 856629cc58 -s ours am: cdb4c87375 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17716017
Change-Id: I413a3dbe16255a2382ee48e42cbe934fd9274f7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 16:06:06 +00:00
436030cab6
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6f41d53de9 -s ours am: ccac214bba -s ours am: f45361b8b0 -s ours am: 46849a0465 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17716400
Change-Id: I302bb9db0faa5b5692e474dd01077a9fefd299a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 16:06:01 +00:00
a5a3ed7821
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 8c619a2b52 am: af25e91b3a -s ours am: 63a5f2eb4b -s ours am: 1869ef0cf5 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17716017
Change-Id: Iad011f75537cf7746b1d85497c074ea8afe403b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 16:05:44 +00:00
cdb4c87375
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 66a79956b3 -s ours am: 0ea47ea8df -s ours am: 856629cc58 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17716017
Change-Id: I990cc79677138f5b71d6bb374980c354183a6fdb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 16:05:32 +00:00
46849a0465
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6f41d53de9 -s ours am: ccac214bba -s ours am: f45361b8b0 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17716400
Change-Id: I59fb6234ae2042a417982772976500be64a499a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 16:05:27 +00:00
1869ef0cf5
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 8c619a2b52 am: af25e91b3a -s ours am: 63a5f2eb4b -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17716017
Change-Id: Ib1f305df2f6870274bf7400d83cf677ae01257b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 16:05:22 +00:00
006cd7c149
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 614046bd46 -s ours am: 6d05b4c6aa -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17723424
Change-Id: Ic42f1485369b78da5cb37bd5dc5543fbc5fda368
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 16:05:20 +00:00
7f57c56512
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1d313372fe -s ours am: 1fded506a1 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17723424
Change-Id: I80a0f8bbeb7fb0af5a73a6a108284e736ecf6c1c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 16:05:19 +00:00
fefafe5aa9
Putting back generics for Workspace
...
This got over-written in merging files
Bug: b/218186705
Test: Manually tested Launcher3 works.
Change-Id: I55287e110d067a338204924337091ead044b34ec
2022-04-14 15:35:33 +00:00
856629cc58
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 66a79956b3 -s ours am: 0ea47ea8df -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17716017
Change-Id: Iab1c5d65c2d715131b59d7d9e0035b3e8611ebc4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 15:34:42 +00:00
TreeHugger Robot
Hongwei Wang
Sunny Goyal
Tony Wickham
Lucas Dupin
Sihua Ma
Jonathan Scott
Bill Yi
Vinit Nayak
Shikha Malhotra