Commit Graph

47302 Commits

Author SHA1 Message Date
Pat Manning 23c33dddbe Merge "Update widget edit icon to use material colors." into tm-dev am: 37edea679c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17656215

Change-Id: Ib30cbb630aca9b46e954e50c02e442c5e7305041
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 14:49:18 +00:00
Bill Yi 8ae6de1484 Merge changes from topic "presubmit-am-a62f0e9adce947e1a367ff070ebd684f" into sc-v2-dev-plus-aosp am: 707121042b am: b9f52e7f94
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17801246

Change-Id: I1326ce63ace680bc72b1c124bbc48bb2bc895c54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 14:36:43 +00:00
Bill Yi eeddaff398 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: df307ef14f am: 6442445f43 -s ours am: 910f83ad85 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17801246

Change-Id: Ib9c28758ce551426b6bc703a251216382983a198
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 14:36:41 +00:00
Xin Li 3cbf58a04b [automerger skipped] Merge sc-v2-dev-plus-aosp-without-vendor@8433047 am: f688b04eab -s ours am: b604f81a25 -s ours am: 8dd8207d60 -s ours
am skip reason: Merged-In I310e7924c7767b24b697fc96a098b37db4cf1216 with SHA-1 b891ee715f is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17805140

Change-Id: Ic928f4b8d72ffe772ef76733e40d9d23b609a095
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 13:05:25 +00:00
Pat Manning 37edea679c Merge "Update widget edit icon to use material colors." into tm-dev 2022-04-20 11:54:36 +00:00
Bill Yi b9f52e7f94 Merge changes from topic "presubmit-am-a62f0e9adce947e1a367ff070ebd684f" into sc-v2-dev-plus-aosp am: 707121042b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17801246

Change-Id: I2ab1c9286da30ea063ea373477a85593770237a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 06:01:48 +00:00
Bill Yi 910f83ad85 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: df307ef14f am: 6442445f43 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17801246

Change-Id: Ifc9e99b9dfa48c5095d87ec395446e28487cc800
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 06:01:47 +00:00
Xin Li 8dd8207d60 [automerger skipped] Merge sc-v2-dev-plus-aosp-without-vendor@8433047 am: f688b04eab -s ours am: b604f81a25 -s ours
am skip reason: Merged-In I310e7924c7767b24b697fc96a098b37db4cf1216 with SHA-1 b891ee715f is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17805140

Change-Id: I219dd41614be920aa79302dbd05038f0bf5f8c36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 04:47:32 +00:00
Sihua Ma 9fdcda8222 Merge "Attach work badge to Weather and Battery widgets" into tm-dev am: 34ba5a9534
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17691442

Change-Id: I8e61b56a411eb696f06ab470a5a33c12a9a38495
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 02:24:35 +00:00
Sihua Ma 34ba5a9534 Merge "Attach work badge to Weather and Battery widgets" into tm-dev 2022-04-20 02:01:11 +00:00
Sihua Ma 4c5bd537bb Attach work badge to Weather and Battery widgets
Moving the part where widget icon is generated from WidgetsListHeader (UI thread) to IconCache (backend)

Test: Open widget picker -> switch to work widget picker -> verify that Battery and Weather are badged
Fix: 226132413, 209995894
Change-Id: I3d649f2b26d7d8e7b756129b5bae4433ea344d43
2022-04-19 15:41:56 -07:00
Brian Isganitis d57fb33eec Merge "Prevent arrow popup from going off screen bottom when below icon." into tm-dev am: 65df4506bf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17707263

Change-Id: I39f2c5e8f2e4ca70e820c41acff45a045c9718bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-19 22:18:51 +00:00
Brian Isganitis 65df4506bf Merge "Prevent arrow popup from going off screen bottom when below icon." into tm-dev 2022-04-19 21:56:48 +00:00
TreeHugger Robot 1e3f6fd87d Merge "Putting back generics for Workspace" into tm-dev am: 1a93004398
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17757985

Change-Id: I6bc5e5901897c088431800fa82eb54dfe7c30990
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-19 20:49:15 +00:00
TreeHugger Robot 1a93004398 Merge "Putting back generics for Workspace" into tm-dev 2022-04-19 20:25:37 +00:00
Brian Isganitis 79c938e8be Prevent arrow popup from going off screen bottom when below icon.
The current approach sometimes causes popups to go off the bottom of the screen, because we are not account for top insets and we are double counting extraVerticalSpace.

Test: Manual
Fix: 228326181
Change-Id: I148f9ff579e4406a0834195977e1cb7abf3707e5
2022-04-19 18:08:04 +00:00
Thales Lima 6e76ba8512 Merge "Make hotseat RTL aware" into tm-dev am: ee80d6919e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17523011

Change-Id: I6f3b94f7c3f1805f317b225a3825b39decb4abfd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-19 16:54:46 +00:00
Thales Lima ee80d6919e Merge "Make hotseat RTL aware" into tm-dev 2022-04-19 16:47:52 +00:00
Thales Lima 497b8672cb Merge "Tune menu size" into tm-dev am: 1dcf3d1ab9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17570024

Change-Id: I51d6f4175302f92ba1968ca837190bc9484934aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-19 15:51:53 +00:00
Thales Lima 1dcf3d1ab9 Merge "Tune menu size" into tm-dev 2022-04-19 15:36:10 +00:00
Sunny Goyal 1847ff0a76 Merge "Updating target SDK for Launcher" into tm-dev am: df472f8db7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17771194

Change-Id: Idd92c8b27402226a5e59e9837ea24e0c1d39d2bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-19 03:55:37 +00:00
Sunny Goyal df472f8db7 Merge "Updating target SDK for Launcher" into tm-dev 2022-04-19 03:32:27 +00:00
TreeHugger Robot 9473f9b997 Merge "Trying to remove waiting for broadcasts" into tm-dev am: ce43fb91bb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17805035

Change-Id: Ia699b7637a4c0cb3b6face1ad04df7c679ffee1c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-19 01:38:33 +00:00
TreeHugger Robot ce43fb91bb Merge "Trying to remove waiting for broadcasts" into tm-dev 2022-04-19 01:06:28 +00:00
Bill Yi 049537f8f8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 1a9dc4e906 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17785754

Change-Id: Ifa1efbe1ed50bc3c6f665ce5177c03fa1f106606
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-19 00:38:11 +00:00
Bill Yi 8d482046b2 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: da78e7047e -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17785754

Change-Id: I948ffd9f86edc4f6a2c2816173fd36f1188e2e03
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-19 00:38:06 +00:00
Bill Yi 707121042b Merge changes from topic "presubmit-am-a62f0e9adce947e1a367ff070ebd684f" into sc-v2-dev-plus-aosp
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: df307ef14f
  Import translations. DO NOT MERGE ANYWHERE
2022-04-19 00:29:25 +00:00
Bill Yi 1a9dc4e906 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-04-19 00:20:25 +00:00
Xin Li b604f81a25 [automerger skipped] Merge sc-v2-dev-plus-aosp-without-vendor@8433047 am: f688b04eab -s ours
am skip reason: Merged-In I310e7924c7767b24b697fc96a098b37db4cf1216 with SHA-1 b891ee715f is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17805140

Change-Id: I4704d93b30833d6f7230643a355db37d3c7127cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-19 00:08:16 +00:00
Sunny Goyal 26092c8e43 Revert "Revert "Removing AM.getTasks call on UI thread during touch down"" am: 7ee087f53f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17802989

Change-Id: Ib8715acfcc5f4a59e79cc47b2dd9912e7da6f08b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-18 22:42:04 +00:00
vadimt 3a60866b70 Trying to remove waiting for broadcasts
Way back we suspected that this would prevent Launcher restarts while the test runs, but later we seem to have found another solution.

Now the tests can sit for, like, 90 sec in this call.

So let's remove it and see what happens.

Test: presubmit
Bug: 187761685
Change-Id: I4baa174b48151151d657e833f121b2e6daa27453
2022-04-18 14:42:36 -07:00
Xin Li f688b04eab Merge sc-v2-dev-plus-aosp-without-vendor@8433047
Bug: 226662282
Merged-In: I310e7924c7767b24b697fc96a098b37db4cf1216
Change-Id: I8bd98ceff90846a20679bfb6c55b37c1765fd13b
2022-04-18 21:01:08 +00:00
Sunny Goyal cd2ac0f3e9 Updating target SDK for Launcher
Bug: 229173942
Bug: 226461147
Test: Presubmit
Change-Id: Id9e303f113cba87adf26442f1417ed2814555c54
2022-04-18 13:55:01 -07:00
Sam Dubey 7716ec4aff Merge "Revert "Removing AM.getTasks call on UI thread during touch down"" into tm-dev am: 1e0648475b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17800077

Change-Id: I27387d7a794b220bc26359dd0b1a722be860ff86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-18 17:31:11 +00:00
Sunny Goyal 7ee087f53f Revert "Revert "Removing AM.getTasks call on UI thread during touch down""
This reverts commit f9042d32ae.

Reason for revert: build breakage fixed

Change-Id: I5dac8826e1dc6064e7961ebbf3bc249b5fb307c7
2022-04-18 10:15:08 -07:00
Sam Dubey 1e0648475b Merge "Revert "Removing AM.getTasks call on UI thread during touch down"" into tm-dev 2022-04-18 17:11:50 +00:00
Sunny Goyal b64cec047e Merge "Removing AM.getTasks call on UI thread during touch down" into tm-dev am: 2207b577d0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17735255

Change-Id: I6dcf5d6832fcc8349ecd4e9ca3ba63f8b20801e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-18 16:55:33 +00:00
Sam Dubey f9042d32ae Revert "Removing AM.getTasks call on UI thread during touch down"
This reverts commit 013a8a75ab.

Reason for revert: Broke builds

Bug: 229619753
Change-Id: Idb1aecf1d43db50aa4f11dbb88079c37e401d694
2022-04-18 16:47:24 +00:00
Sunny Goyal 2207b577d0 Merge "Removing AM.getTasks call on UI thread during touch down" into tm-dev 2022-04-18 16:19:41 +00:00
Bill Yi 6442445f43 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: df307ef14f
Blank merge reason: commit message contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17801246

Change-Id: I17e80e6a8365751f8352929e23dd0312e938e48a
2022-04-18 12:39:12 +00:00
Bill Yi df307ef14f Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I3c53c19568b209eda0365f8a4169d963cade9098
2022-04-18 12:39:05 +00:00
Bill Yi da78e7047e Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I9ff5d01375187fe18ba873d32b73590a73844f50
2022-04-17 08:56:19 +00:00
Brandon Dayauon 6b65dc9814 Merge "Fixed overlap issue where toggle button gets overlapped by 3 button nav bar..now button shifts up so it's not totally obscured" into tm-dev am: 32f1e89193
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17652943

Change-Id: I9b82d284f3f5cc3844c43b941c8204e06faac077
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-16 19:54:09 +00:00
Brandon Dayauon 32f1e89193 Merge "Fixed overlap issue where toggle button gets overlapped by 3 button nav bar..now button shifts up so it's not totally obscured" into tm-dev 2022-04-16 19:36:27 +00:00
TreeHugger Robot c764cbaf27 Merge "Catch SecurityException from NoMan to workaround possible race condition" into tm-dev am: 1cd4d369a2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17775689

Change-Id: If53aeb575fac03a7bd91e9c8fc1d480eaaf844ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-16 05:26:36 +00:00
TreeHugger Robot 1cd4d369a2 Merge "Catch SecurityException from NoMan to workaround possible race condition" into tm-dev 2022-04-16 05:10:12 +00:00
TreeHugger Robot d0b7edd060 Merge "Polish the back to home gesture animation to match the spec." into tm-dev am: cf80645111
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17646341

Change-Id: I15123f319e79ae994a3b5b31f64596f29194d0f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-16 02:29:40 +00:00
TreeHugger Robot cf80645111 Merge "Polish the back to home gesture animation to match the spec." into tm-dev 2022-04-16 01:51:10 +00:00
Brandon Dayauon 241293aaee Fixed overlap issue where toggle button gets overlapped by 3 button nav bar..now button shifts up so it's not totally obscured
Test: Manual - On Raven
Before: https://screenshot.googleplex.com/sYq2i7YGjqmMjXe
After: https://screenshot.googleplex.com/9WRtgisGChisbFj
Bug: 223996104
Change-Id: Ic302e26b2fb6db9a9e06b335c753266e92b6c671
2022-04-15 16:29:35 -07:00
Tony Wickham 0a3c742918 Merge "Move Taskbar background drawing to TaskbarBackgroundRenderer" into tm-dev am: 8bb0bdc42b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17766315

Change-Id: I1a51c2339c777615653b606bc1d60144ae1c6a57
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-15 23:14:46 +00:00