Xin Li
ba8b04da38
[automerger skipped] DO NOT MERGE - Skip SQ3A.220605.009 am: 42a11f83c9 -s ours am: c86ee8679e -s ours
...
am skip reason: Merged-In I310e7924c7767b24b697fc96a098b37db4cf1216 with SHA-1 b891ee715f is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/2128860
Change-Id: I6d822aa4aa7b1b87963409dd7c07136513837639
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-17 21:27:24 +00:00
Xin Li
99de04debf
[automerger skipped] Merge "Merge Android 12 QPR 3" am: 250f92bbe0 -s ours am: 3ccbee4558 -s ours am: 30b95a6741 -s ours am: b314dcd43c -s ours
...
am skip reason: Merged-In I540ce3429cb4b1b86b8554a08677679c932b05e5 with SHA-1 bf8a2429ea is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/2125776
Change-Id: If18213cced4956da146112556d8f2b6c1186151b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-17 20:53:39 +00:00
Xin Li
094417879f
[automerger skipped] Merge Android 12 QPR 3 am: 5e36e2607b -s ours am: 7d8d41ac47 -s ours am: 0e1fc6e6c8 -s ours am: 2d19a4a4d3 -s ours
...
am skip reason: Merged-In I540ce3429cb4b1b86b8554a08677679c932b05e5 with SHA-1 bf8a2429ea is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/2125776
Change-Id: Iac01c1891ddd886fe2bbefd901e93b52950bc19f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-17 20:52:34 +00:00
Treehugger Robot
3026557289
[automerger skipped] Merge "DO NOT MERGE - Skip SQ3A.220605.009" am: 42b2895370 -s ours
...
am skip reason: Merged-In I310e7924c7767b24b697fc96a098b37db4cf1216 with SHA-1 b891ee715f is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/2128860
Change-Id: Ib2b81d4659a011455987532c6da8f7ffa9429cae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-17 20:07:15 +00:00
Xin Li
c86ee8679e
[automerger skipped] DO NOT MERGE - Skip SQ3A.220605.009 am: 42a11f83c9 -s ours
...
am skip reason: Merged-In I310e7924c7767b24b697fc96a098b37db4cf1216 with SHA-1 b891ee715f is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/2128860
Change-Id: I5101814b95e7e28ab9748929f72516a3fe321bd3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-17 20:06:27 +00:00
Xin Li
b314dcd43c
[automerger skipped] Merge "Merge Android 12 QPR 3" am: 250f92bbe0 -s ours am: 3ccbee4558 -s ours am: 30b95a6741 -s ours
...
am skip reason: Merged-In I540ce3429cb4b1b86b8554a08677679c932b05e5 with SHA-1 bf8a2429ea is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/2125776
Change-Id: Ibd22e011c8959daf00ab4f5de64ee374d2ddf8d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-17 19:57:21 +00:00
Xin Li
2d19a4a4d3
[automerger skipped] Merge Android 12 QPR 3 am: 5e36e2607b -s ours am: 7d8d41ac47 -s ours am: 0e1fc6e6c8 -s ours
...
am skip reason: Merged-In I540ce3429cb4b1b86b8554a08677679c932b05e5 with SHA-1 bf8a2429ea is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/2125776
Change-Id: I125e70fc5f25a16caddabbdd4f39e467e38db386
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-17 19:56:16 +00:00
Ronish Kalia
45ed73d955
Merge "Change access from private to protected for OverlayEdgeEffect vars"
2022-06-17 17:33:28 +00:00
Treehugger Robot
42b2895370
Merge "DO NOT MERGE - Skip SQ3A.220605.009"
2022-06-17 14:29:00 +00:00
Alex Chau
b065b4b05a
Revert "Add logs for InvariantDeviceProfile.getDeviceProfile"
...
This reverts commit d3e8cc40b4 .
Reason for revert: b/231312158 is fixed, log is no longer needed
Fix: 231851651
Change-Id: I3ea8b9d14e7eb6f8f9c794c5d15cdfc94153d392
2022-06-17 09:36:00 +00:00
Xin Li
42a11f83c9
DO NOT MERGE - Skip SQ3A.220605.009
...
Bug: 236045730
Merged-In: I310e7924c7767b24b697fc96a098b37db4cf1216
Change-Id: I87f8349c2e54cbee2765806afd646545780975be
2022-06-16 22:50:45 -07:00
Xin Li
30b95a6741
[automerger skipped] Merge "Merge Android 12 QPR 3" am: 250f92bbe0 -s ours am: 3ccbee4558 -s ours
...
am skip reason: Merged-In I540ce3429cb4b1b86b8554a08677679c932b05e5 with SHA-1 bf8a2429ea is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/2125776
Change-Id: I90ed6ba7d25c41a3fbbc19bca6a3706b8aa756cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-17 00:15:17 +00:00
Xin Li
0e1fc6e6c8
[automerger skipped] Merge Android 12 QPR 3 am: 5e36e2607b -s ours am: 7d8d41ac47 -s ours
...
am skip reason: Merged-In I540ce3429cb4b1b86b8554a08677679c932b05e5 with SHA-1 bf8a2429ea is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/2125776
Change-Id: Id132417e04a26ea756d3513d3d35201f26b3d29e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-17 00:14:11 +00:00
Sunny Goyal
bbad97e273
Unifying scroll calculation logic for both widgets and apps recycler view
...
Also using itemType instead of item object for widget size cache
Bug: 234008165
Test: Verified on device
Change-Id: Ia4b4a00a11627c0c454e4a699570e8ab1667a390
2022-06-16 16:03:37 -07:00
Sukesh Ram
9e5fe63a22
Add app predictions to secondary display app drawer & fix tab UI.
...
Bug: 233926067
Test: Manual
Change-Id: I2f45a4b30964b365bf149e8864a3af2ea909a237
2022-06-16 22:44:24 +00:00
Schneider Victor-tulias
4d18da78c0
Fix All set activity not drawing on initial swipe.
...
The launcher was not properly preloading upon launching the All Set Activity. The Launcher would only start loading once the user started swiping up. This would stop the all set activity from drawing.
Test: Factory reset with a restore and tested the all set page.
Fixes: 234536107
Change-Id: I6bcb805ea6c43fb993f2b57499444ea62bcc37e1
2022-06-16 20:38:24 +00:00
Xin Li
3ccbee4558
[automerger skipped] Merge "Merge Android 12 QPR 3" am: 250f92bbe0 -s ours
...
am skip reason: Merged-In I540ce3429cb4b1b86b8554a08677679c932b05e5 with SHA-1 bf8a2429ea is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/2125776
Change-Id: Ie121b3b4dac24334fa93f18390033ce3d63b0277
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-16 19:58:15 +00:00
Xin Li
7d8d41ac47
[automerger skipped] Merge Android 12 QPR 3 am: 5e36e2607b -s ours
...
am skip reason: Merged-In I540ce3429cb4b1b86b8554a08677679c932b05e5 with SHA-1 bf8a2429ea is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/2125776
Change-Id: I701c3c0ddb6afd4c6e472b4fc43b80c5e0e67a73
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-16 19:57:03 +00:00
Xin Li
250f92bbe0
Merge "Merge Android 12 QPR 3"
2022-06-16 18:51:54 +00:00
Sebastián Franco
b4c50d485e
Merge "Adding a case when there is only 1 system shortcut on the Popup Container" into tm-qpr-dev am: 2545f45a1f am: 2c102c3b73
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18284907
Change-Id: I9a684963b00da3ff6a994221cfece78846dbae32
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-16 17:39:49 +00:00
Sebastián Franco
2c102c3b73
Merge "Adding a case when there is only 1 system shortcut on the Popup Container" into tm-qpr-dev am: 2545f45a1f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18284907
Change-Id: Icc4848f780ae139a3a39fe747e383c00be25d94e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-16 17:22:25 +00:00
Sebastián Franco
2545f45a1f
Merge "Adding a case when there is only 1 system shortcut on the Popup Container" into tm-qpr-dev
2022-06-16 17:01:10 +00:00
Luca Zuccarini
c703f3a3e0
Unify the source of truth for NORMAL <> ALL_APPS transitions.
...
Bug: 231682175
Bug: 234812580
Test: manual
Change-Id: I5b66735474915d7a59bda337f67df37ff397908a
2022-06-16 16:40:26 +00:00
Tony Wickham
a69aea18de
Merge "Clear MotionPauseDetector onRecentsAnimationCanceled()" into tm-dev am: 9d5f64adf1 am: ca544c5a1b am: 45c6b165bf am: a4acb2276a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18914942
Change-Id: Ica75a7c0196988a10557d083af6df8c057351807
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-16 16:19:45 +00:00
Tony Wickham
258eda4d96
Merge "Clear MotionPauseDetector onRecentsAnimationCanceled()" into tm-dev am: 9d5f64adf1 am: 1cba5f9d47 am: d8439e7f80 am: 1dc22b725c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18914942
Change-Id: I02e4d0509d071f8a4bb1fa826608ef0eccbc5fed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-16 16:19:37 +00:00
Tony Wickham
7f75478ab2
Merge "Clear MotionPauseDetector onRecentsAnimationCanceled()" into tm-dev am: 9d5f64adf1 am: 1cba5f9d47 am: d100f6825f am: d19ab05376
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18914942
Change-Id: I305e42679d415fa0c07a220341c645b302dad944
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-16 16:18:28 +00:00
Tony Wickham
a4acb2276a
Merge "Clear MotionPauseDetector onRecentsAnimationCanceled()" into tm-dev am: 9d5f64adf1 am: ca544c5a1b am: 45c6b165bf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18914942
Change-Id: I37f013932cae2c8f20e2de3dd644e87cfb28e210
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-16 15:53:27 +00:00
Tony Wickham
1dc22b725c
Merge "Clear MotionPauseDetector onRecentsAnimationCanceled()" into tm-dev am: 9d5f64adf1 am: 1cba5f9d47 am: d8439e7f80
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18914942
Change-Id: I60dc035e17584da539296b667aef1fbfd0aeeef1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-16 15:53:19 +00:00
Tony Wickham
d19ab05376
Merge "Clear MotionPauseDetector onRecentsAnimationCanceled()" into tm-dev am: 9d5f64adf1 am: 1cba5f9d47 am: d100f6825f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18914942
Change-Id: I519d08a2682a9177090b1436525eadd845e6f1a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-16 15:52:50 +00:00
Tony Wickham
45c6b165bf
Merge "Clear MotionPauseDetector onRecentsAnimationCanceled()" into tm-dev am: 9d5f64adf1 am: ca544c5a1b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18914942
Change-Id: I3f37750d704d964aea35f7c31b0369da63799870
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-16 15:28:12 +00:00
Tony Wickham
d8439e7f80
Merge "Clear MotionPauseDetector onRecentsAnimationCanceled()" into tm-dev am: 9d5f64adf1 am: 1cba5f9d47
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18914942
Change-Id: Id0004e65570042b3953d94c3e9c1633b745e8a6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-16 15:28:05 +00:00
Tony Wickham
d100f6825f
Merge "Clear MotionPauseDetector onRecentsAnimationCanceled()" into tm-dev am: 9d5f64adf1 am: 1cba5f9d47
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18914942
Change-Id: Ib76e6458f71282ebb7753db8c4ea9b671fb0fa19
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-16 15:28:03 +00:00
Tony Wickham
ac9146938f
Merge "Clear MotionPauseDetector onRecentsAnimationCanceled()" into tm-dev am: 9d5f64adf1 am: 50f86b10a2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18914942
Change-Id: I1ad3f74bcee7dac1f3981c50f4b11f38db5ede75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-16 15:27:26 +00:00
Tony Wickham
1cba5f9d47
Merge "Clear MotionPauseDetector onRecentsAnimationCanceled()" into tm-dev am: 9d5f64adf1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18914942
Change-Id: I4c55e85b233eec4a6bca1d46590270b71ecbc4a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-16 15:10:12 +00:00
Tony Wickham
50f86b10a2
Merge "Clear MotionPauseDetector onRecentsAnimationCanceled()" into tm-dev am: 9d5f64adf1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18914942
Change-Id: I157da85409d44c803eab3fb5a712ef17cf1aeae0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-16 15:09:04 +00:00
Tony Wickham
ca544c5a1b
Merge "Clear MotionPauseDetector onRecentsAnimationCanceled()" into tm-dev am: 9d5f64adf1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18914942
Change-Id: Id802a0ac9cea65b662afd3e35582e0b7014f489b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-16 15:08:40 +00:00
Tony Wickham
9d5f64adf1
Merge "Clear MotionPauseDetector onRecentsAnimationCanceled()" into tm-dev
2022-06-16 14:55:48 +00:00
Alex Chau
47d2d5e196
Merge "Detect force visible nav bar based on kids mode." into tm-qpr-dev am: ccc55f1668 am: 5180f06252
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18910230
Change-Id: I142a55717dcbfb432db49f1184d1017a30d5bfe6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-16 14:51:55 +00:00
Alex Chau
5180f06252
Merge "Detect force visible nav bar based on kids mode." into tm-qpr-dev am: ccc55f1668
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18910230
Change-Id: I77bba64ee7931a8ea32499a7421b991b5a42df2d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-16 14:27:08 +00:00
Alex Chau
ccc55f1668
Merge "Detect force visible nav bar based on kids mode." into tm-qpr-dev
2022-06-16 13:55:14 +00:00
Thales Lima
df50439f5e
Merge "Fix QSB alignment" into tm-qpr-dev am: 85e52e2f9d am: d4b0c446b4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18910227
Change-Id: I2d3e0926567e158f1f33e0427ba71fdeeb89f859
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-16 13:01:49 +00:00
Thales Lima
d4b0c446b4
Merge "Fix QSB alignment" into tm-qpr-dev am: 85e52e2f9d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18910227
Change-Id: I6326575904727e1cce2a76f755d4167cdd641775
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-16 12:35:04 +00:00
Thales Lima
85e52e2f9d
Merge "Fix QSB alignment" into tm-qpr-dev
2022-06-16 12:19:45 +00:00
Alex Chau
b583f18e35
Merge "Animate inline QSB between home and apps" into tm-qpr-dev am: a5ae4c2e57 am: 7e77cda9d6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18799573
Change-Id: I3dae91a244c996474f4ec31a950323c1fc5c2716
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-16 08:49:02 +00:00
Alex Chau
7e77cda9d6
Merge "Animate inline QSB between home and apps" into tm-qpr-dev am: a5ae4c2e57
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18799573
Change-Id: I189fa4adfad99c21a9edbb88c34682b1f3c52d84
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-16 08:20:50 +00:00
Alex Chau
a5ae4c2e57
Merge "Animate inline QSB between home and apps" into tm-qpr-dev
2022-06-16 08:00:51 +00:00
Brandon Dayauon
da9e22f4e9
Merge "Fix work toggle button to be placed where it should be." into tm-qpr-dev am: 111473315d am: d7450579f3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18841742
Change-Id: If171dbd8e2cf9beec7b57d3cd4b8c769027b156d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-15 23:16:00 +00:00
Ling WO
9a8964b122
Cherrypick needed for merge conflict with ag/18875278
...
Support move to a specific location on workspace for all workspaceDragSource, so other workspaceDragSource such as HomeAppIconMenuItem can be moved to a fixed location during testing to avoid ui-diff flakiess
Design doc:
https://docs.google.com/document/d/1tZWbfsv86O6UAKtHJrDBGecu-x3ac51qmWvARDg057M
Test: atest
Bug: 216189838
Change-Id: Ia6ef7338beb257d0313be17a53a9fc59ae39fdb6
(cherry picked from commit fe8fb4d137 )
2022-06-15 22:38:04 +00:00
Brandon Dayauon
d7450579f3
Merge "Fix work toggle button to be placed where it should be." into tm-qpr-dev am: 111473315d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18841742
Change-Id: I5aad39dcdadf270c45255edbedfcf32a512285aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-15 22:25:46 +00:00
Brandon Dayauon
111473315d
Merge "Fix work toggle button to be placed where it should be." into tm-qpr-dev
2022-06-15 22:05:49 +00:00