Commit Graph

58436 Commits

Author SHA1 Message Date
Bill Yi 5f4d904dd7 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: df307ef14f am: 6442445f43 -s ours am: 910f83ad85 -s ours am: cc94222ff9 -s ours am: 7a0fe16f54 -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: I826c6fb560bfbed7cab71abe677a05dddc909af2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 13:07:32 +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 c92c2e2ba6 Merge "Update widget edit icon to use material colors." into tm-dev am: 37edea679c am: 8db98c43be
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17656215

Change-Id: I189165ccaeca0f238a34ab50a958dca4f4e3855a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 13:05:06 +00:00
Pat Manning 8db98c43be 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: Ic5465a476cd9f3f42ae931c2b65a9910eb04e4a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 12:39:59 +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 f1b73bc12c Merge changes from topic "presubmit-am-a62f0e9adce947e1a367ff070ebd684f" into sc-v2-dev-plus-aosp am: 707121042b am: b9f52e7f94 am: fe9501cfa5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17801246

Change-Id: I966e97208883b637481ed82f2a314322ea39525e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 11:37:17 +00:00
Bill Yi 7a0fe16f54 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: df307ef14f am: 6442445f43 -s ours am: 910f83ad85 -s ours am: cc94222ff9 -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: I632c35e4e5e9bbe88d4fdb21694563eff255cdd6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 11:37:15 +00:00
Bill Yi fe9501cfa5 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: I07da2de091aad687b50fb9b59369684932c1d9de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 08:33:37 +00:00
Bill Yi cc94222ff9 [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: I4cabb1e638c166ba5060db17aaa4bf477c0987ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 08:33:36 +00:00
Shikha Malhotra e957b600d3 Refactor code to be used in LauncherLily features
Refactor add to workspace code to be used in Lily Launcher.
Also utilising code swap feature to swap out functionality of sorting
items on workspaces and finding next vacant space.

Bug: b/218186705
Test: Manually tested Launcher3 works.
Change-Id: I42a44eabeb307e1d23ef333e0a169437f9062bb6
2022-04-20 07:22:20 +00:00
Xin Li 949732d294 [automerger skipped] Merge sc-v2-dev-plus-aosp-without-vendor@8433047 am: f688b04eab -s ours am: b604f81a25 -s ours am: 8dd8207d60 -s ours am: a7f858441e -s ours am: bf0f0ef709 -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: I580387713526eb1e9d6b87c7fa5d60be11917f83
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 06:17:11 +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 bf0f0ef709 [automerger skipped] Merge sc-v2-dev-plus-aosp-without-vendor@8433047 am: f688b04eab -s ours am: b604f81a25 -s ours am: 8dd8207d60 -s ours am: a7f858441e -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: I35a0a3603f0134f980c4e41cfb0eb6d3bcb62a48
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 05:33:19 +00:00
Xin Li a7f858441e [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: Ic1e270c57e23a5a5c0dd029874a166563741285c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 05:13:26 +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 006bbca335 Merge "Attach work badge to Weather and Battery widgets" into tm-dev am: 34ba5a9534 am: 1d68980ce1 am: a2d2e05d78
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17691442

Change-Id: I04c5de2d2b48e2f15f305a62160ed7d472605abd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 03:28:28 +00:00
Android Build Coastguard Worker db6d581054 Snap for 8474975 from 2fd5cbd2bf to tm-qpr1-release
Change-Id: I8c4aa3119040ff52a587833a9a3e5ca9def363bc
2022-04-20 03:09:15 +00:00
Sihua Ma a2d2e05d78 Merge "Attach work badge to Weather and Battery widgets" into tm-dev am: 34ba5a9534 am: 1d68980ce1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17691442

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

Change-Id: I9eae0a00fef45d60191d98f295fdff7b12f58daf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 03:02:21 +00:00
Sihua Ma 1d68980ce1 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: I0a110ee4f142a79d941b175172ea0e904d591c47
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 02:25:18 +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
Android Build Coastguard Worker cbcf42edf4 Snap for 8474198 from 65df4506bf to tm-release
Change-Id: I06d0ceee0f33d0b3aaa5e3ff50e4b8fe5a9e95dd
2022-04-20 01:09:25 +00:00
vadimt 25fbd5b0bb Sampling too long Launcher tests
A test that takes > 3 min will generate an artifact file containing stacks of all threads of the test process taken every 3 sec. This artifact will be also generated if the test process is killed, for example, by timeout.

This artifact should help EngProd's effort to speed up presubmits.

Bug: 225186335
Test: local runs
Change-Id: I721779bfbe5bc6289315998ed2660f5f46165611
2022-04-19 18:02:56 -07:00
Tony Wickham 0a73beb65d Move taskbar insets logic to TaskbarInsetsController
Test: TaplTestsTaskbar; manually stash/unstash taskbar, open IME
Bug: 215411414
Change-Id: I73622dc020c4f8c8b3d317fcb1dd072bcfc3d274
2022-04-19 23:24:04 +00:00
Brian Isganitis 586fc7a97f Merge "Prevent arrow popup from going off screen bottom when below icon." into tm-dev am: 65df4506bf am: d9319683ec am: 2fd5cbd2bf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17707263

Change-Id: I89b936a67803d9d792b339b565e6657d1ebf3855
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-19 23:21:58 +00:00
Brian Isganitis 95cad640c7 Decrease overview degree threshold from 45 to 15 degrees.
Met with arifhuda@ to confirm the benefit of lowering to 15 degrees.

This change also updates AbsSwipeHandler to differentiate between X and
Y flings in calculateEndTarget.

Test: Manual
Fix: 222117127
Change-Id: I416986145a4306d1babe23735e0563e87660c417
2022-04-19 23:14:36 +00:00
Brian Isganitis 2fd5cbd2bf Merge "Prevent arrow popup from going off screen bottom when below icon." into tm-dev am: 65df4506bf am: d9319683ec
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17707263

Change-Id: I8edb41e4e42d70d379638778d6e7c88b4e97c7a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-19 22:46:51 +00:00
Brian Isganitis b9a5256d63 Merge "Prevent arrow popup from going off screen bottom when below icon." into tm-dev am: 65df4506bf am: d57fb33eec
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17707263

Change-Id: I12a5ff2ef6b754ce649a890b69627ba594046ce8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-19 22:44:30 +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 d9319683ec 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: I25e8f81ce511d1847133f5559e2046393af22ec4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-19 22:19:15 +00: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 74662e1846 Merge "Putting back generics for Workspace" into tm-dev am: 1a93004398 am: 84bc016469 am: 13f39503ec
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17757985

Change-Id: I79766b13374a98b49f3afd38fcf44fd202aa1308
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-19 21:49:33 +00:00
TreeHugger Robot 13f39503ec Merge "Putting back generics for Workspace" into tm-dev am: 1a93004398 am: 84bc016469
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17757985

Change-Id: I34706e685a17ab580a187407abff16a780cde39c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-19 21:12:26 +00:00
TreeHugger Robot 1e114bce67 Merge "Putting back generics for Workspace" into tm-dev am: 1a93004398 am: 1e3f6fd87d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17757985

Change-Id: Iff54c697ddc44a06c012a984635d12430b6bacef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-19 21:11:50 +00:00
TreeHugger Robot 84bc016469 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: I55313a526af1f7e732852df59000a039d52141ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-19 20:50:03 +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
Bill Yi a7572a77d6 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I99b021e480994659cd0a29f18d6e315d8daff052
2022-04-19 19:04:37 +00:00
Tony Wickham 22f8ad0dc0 Set mState = mCurrentStableState in onAnimationCancel()
Context: there was a bug where you could get stuck in HintState if you
did the following (timing is critical):
1. Short swipe from nav region towards HintState, but not far enough or
   fast enough to commit before letting go; this cancels the state
   animation, returning towards Normal (but, crucially, StateManager
   still has state set as Hint)
2. While previous animation is animating back to Normal, swipe up again,
   but this time faster/farther to actually reach Hint; this time, the
   animation does go towards Hint, but gets stuck there. The reason it
   gets stuck is because StateManager thinks we're already in Hint from
   step 1, so doesn't call onStateTransitionEnd(Hint) in step 2. Thus,
   we never get QuickstepLauncher#onStateSetEnd(Hint), which is what we
   rely on to return to Normal.

Fix is to have StateManager change its internal state to
mCurrentStableState (the state the transition started from) if the
animation is canceled. (Also need to keep that state if restarting the
animation, which AbstractStateChangeTouchController does in onDragEnd,
regardless of whether it ends up going to mFromState or mToState.)

Test: short swipe followed immediately by fast fling from nav region on home successfully goes to HintState and back to Normal
Fixes: 228276181
Change-Id: I2e3aeac06d482b57729416d5de55cc6ffc9df23c
2022-04-19 11:59:04 -07:00
Jon Miranda f020447a47 Add Developer Options string to xml.
Bug: 228178703
Test: manual
Change-Id: Ib633d324709a17551cbf093c5e6f3195c51ddba7
2022-04-19 11:42:01 -07: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 52d4b3df99 Merge "Make hotseat RTL aware" into tm-dev am: ee80d6919e am: 19a81442fd am: f9c7765f11
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17523011

Change-Id: I98cb214338de0dbdb432bcf01afda365d6a3a60a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-19 17:30:32 +00:00
Thales Lima f9c7765f11 Merge "Make hotseat RTL aware" into tm-dev am: ee80d6919e am: 19a81442fd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17523011

Change-Id: Idb4798a0f2bc1cdb6f57ec915f4772f0f22d583e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-19 17:06:06 +00:00
Thales Lima 44fb861754 Merge "Make hotseat RTL aware" into tm-dev am: ee80d6919e am: 6e76ba8512
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17523011

Change-Id: I657bd21d19040f98dfcc32b91ad54afe7e3166cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-19 17:05:16 +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 19a81442fd 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: Ia537d674ef1600cf9dd3381e97c645ba976cd406
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-19 16:48:50 +00:00
Thales Lima ee80d6919e Merge "Make hotseat RTL aware" into tm-dev 2022-04-19 16:47:52 +00:00