Commit Graph

49925 Commits

Author SHA1 Message Date
Tony Wickham 836385240c Merge "Move taskbar insets logic to TaskbarInsetsController" into tm-dev am: 74641da5b8 am: 7ba5a921d3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17778391

Change-Id: Idbdc6eb3e41710457c7bba8229a489a56fab8c08
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 00:20:15 +00:00
Tony Wickham 7ba5a921d3 Merge "Move taskbar insets logic to TaskbarInsetsController" into tm-dev am: 74641da5b8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17778391

Change-Id: I240925929ec5e061b1e8ab7c0071124e4068877e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 00:04:11 +00:00
Tony Wickham 74641da5b8 Merge "Move taskbar insets logic to TaskbarInsetsController" into tm-dev 2022-04-20 23:43:50 +00:00
Vinit Nayak b614e81ced Merge "Check for auto-rotation when initializing RecentsOrientedState" into tm-dev am: bf33e85cb7 am: 927e6ec8bb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17776932

Change-Id: Ia9c6f64e963b38084419ed10ce6671df269fa28f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 21:37:31 +00:00
Vinit Nayak 927e6ec8bb Merge "Check for auto-rotation when initializing RecentsOrientedState" into tm-dev am: bf33e85cb7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17776932

Change-Id: I6415e6cdc6fbffd4fa26ab66e529f5c753cc0ab7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 21:19:32 +00:00
Tony Wickham 81bff9becd Disallow long press below taskbar icons
Test: long press below icons, doesn't stash; can still swipe up
Fixes: 201239461
Change-Id: Ifdf355138d7958c0442814d968f0722f54e12ae1
2022-04-20 13:58:53 -07:00
Vinit Nayak bf33e85cb7 Merge "Check for auto-rotation when initializing RecentsOrientedState" into tm-dev 2022-04-20 20:58:30 +00:00
Tony Wickham 36c9d888d8 Move taskbar insets logic to TaskbarInsetsController
Test: TaplTestsTaskbar; manually stash/unstash taskbar, open IME
Bug: 215411414
Change-Id: I73622dc020c4f8c8b3d317fcb1dd072bcfc3d274
Merged-In: I73622dc020c4f8c8b3d317fcb1dd072bcfc3d274
2022-04-20 19:27:48 +00:00
Pat Manning d434afc8a5 Merge "Prevent edit state workspace scale from hiding next pages." into tm-dev am: de5d9718ed am: 282058d406
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17730701

Change-Id: Ida1aa36a9b92cd229b8d71f6816508fbce9f87ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 18:40:02 +00:00
Brian Isganitis 0d727db44d Merge "Decrease overview degree threshold from 45 to 15 degrees." into tm-dev am: 7bd3e02e2f am: f764ccea03
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17838566

Change-Id: I1d1570f4bcf39b564a8d8e80e0454a70f16863e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 18:39:54 +00:00
Brian Isganitis 8e10f7df6c Merge "Log taskbar all apps entrypoint, launches, and drags" into tm-dev am: 6d780af405 am: 6413365b17
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17694348

Change-Id: I141e6caffe197d8539aadd3b07b6f819f7c68d2c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 18:39:41 +00:00
Vadim Tryshev db25258ed5 Merge "Sampling too long Launcher tests" into tm-dev am: 70dffbe896 am: 807c895c4d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17838280

Change-Id: I7f2f15df72e7efe68847b63d5e6e8621dc1ff36a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 18:37:49 +00:00
Pat Manning 282058d406 Merge "Prevent edit state workspace scale from hiding next pages." into tm-dev am: de5d9718ed
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17730701

Change-Id: I57a8af052e5ae512c8685d0c492d286f8e84008b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 17:46:11 +00:00
Brian Isganitis f764ccea03 Merge "Decrease overview degree threshold from 45 to 15 degrees." into tm-dev am: 7bd3e02e2f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17838566

Change-Id: I7e8d669f80f03edd6555c7ae551f0b5ed20a45dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 17:44:30 +00:00
Brian Isganitis 6413365b17 Merge "Log taskbar all apps entrypoint, launches, and drags" into tm-dev am: 6d780af405
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17694348

Change-Id: I2303d2dda164af78fd303134c922ead5e15ab5b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 17:44:23 +00:00
Vadim Tryshev 807c895c4d Merge "Sampling too long Launcher tests" into tm-dev am: 70dffbe896
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17838280

Change-Id: I1a227f563f05ce5f11cf7c73597b7e4f5e3d4d40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 17:43:46 +00:00
Pat Manning de5d9718ed Merge "Prevent edit state workspace scale from hiding next pages." into tm-dev 2022-04-20 17:21:31 +00:00
Brian Isganitis 7bd3e02e2f Merge "Decrease overview degree threshold from 45 to 15 degrees." into tm-dev 2022-04-20 17:14:42 +00:00
Brian Isganitis 6d780af405 Merge "Log taskbar all apps entrypoint, launches, and drags" into tm-dev 2022-04-20 17:13:52 +00:00
Vadim Tryshev 70dffbe896 Merge "Sampling too long Launcher tests" into tm-dev 2022-04-20 17:09:26 +00:00
Sunny Goyal 3946ecd441 Removing some unused code from All-Apps
Bug: 229860311
Test: Verified on device
Change-Id: I72394fb421679688f87cdbf725859ec35529a59e
2022-04-20 09:54:48 -07:00
Pat Manning ea5c1d29fe Prevent edit state workspace scale from hiding next pages.
Fix: 228969651
Test: manual
Change-Id: I0cceb3bfab19e0721b21fb8c55fe1218b1f25af8
2022-04-20 14:41:46 +01: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
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 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 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 34ba5a9534 Merge "Attach work badge to Weather and Battery widgets" into tm-dev 2022-04-20 02:01:11 +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
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
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 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 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 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 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