Commit Graph

78507 Commits

Author SHA1 Message Date
Vinit Nayak 4e3636e8d0 Refactor SplitSelectStateController to add testing
Bug: 266482558
Change-Id: I2d62a3a310043710d66a26bc533df2309084b81e
2023-02-22 10:51:49 -08:00
Stefan Andonian 429460beae Re-add LockedUserState util that was reverted after TAPL test failures.
Bug: 251502424
Test: Unit tests all passed.
Change-Id: I80f1d521d430edf6c4d5e027d14e2087ed7e04f1
2023-02-22 18:49:21 +00:00
Sunny Goyal 4391018119 Merge "Simplifying some scrollbar binding logic in all-apps" into tm-qpr-dev am: 936cd17a11
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21272506

Change-Id: Icff6d6a26d28c17c55ff9f965f4863f792a6ccdc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-22 18:27:59 +00:00
Sebastián Franco ee24d3f9f4 Merge "Correctly add seam to MultipageCellLayout when resizing widget" into tm-qpr-dev 2023-02-22 18:24:09 +00:00
Sebastian Franco 0451d239ed Binding tests to TouchInteractionService to preventing it from getting destroyed
Fix: 257514573
Bug: 266716173
Test: atest MemoryTests
Test: atest TaplTestsLauncher3#testDragAppIcon
Change-Id: Ib53bf11f45f9e05bf55116d52f3406f45dfaf6c2
2023-02-22 10:14:29 -08:00
Tony Wickham b83d56bc27 Merge "Fix taskbar drag view scale when returning to original icon" into tm-qpr-dev am: 3d1bb16493 am: c8207a7e23
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21533764

Change-Id: I4af1a2fe1e79d2f36d275a057178efd7e750b0e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-22 18:10:26 +00:00
Sunny Goyal 936cd17a11 Merge "Simplifying some scrollbar binding logic in all-apps" into tm-qpr-dev 2023-02-22 18:09:32 +00:00
Tony Wickham c8207a7e23 Merge "Fix taskbar drag view scale when returning to original icon" into tm-qpr-dev am: 3d1bb16493
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21533764

Change-Id: I04cbb24dc071677a8e6f5c4fa8981efc5bec6d34
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-22 16:59:30 +00:00
Tony Wickham 3d1bb16493 Merge "Fix taskbar drag view scale when returning to original icon" into tm-qpr-dev 2023-02-22 16:24:48 +00:00
Luca Zuccarini 0954024b6d Merge "Introduce launchable versions of common view types." into tm-qpr-dev am: 8ca28c4e63 am: 1252e573af am: 4de6d066df
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21150245

Change-Id: Ib6524ab8adf9dad3c981ccbe6b3bf4eef33ad4fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-22 14:30:33 +00:00
Nick Chameyev 4e6797e65e Merge "[Unfold transition] Hide invisible workspaces during animation" into tm-qpr-dev am: 92c93bdda5 am: de32174e7f am: f6fc3019a6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21335338

Change-Id: If4269cc23bd1644e2ef6b0afe58b58ba5a75ebfc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-22 14:29:24 +00:00
Pat Manning 95d4191974 Merge "Animate grid tasks to modal state." into tm-qpr-dev am: 1b27affb03 am: 3eadaa7d77 am: 4faa11aea1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21060663

Change-Id: I07f05126ac8c398bb36f1757e12e003c5cffde48
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-22 14:28:52 +00:00
Luca Zuccarini 4de6d066df Merge "Introduce launchable versions of common view types." into tm-qpr-dev am: 8ca28c4e63 am: 1252e573af
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21150245

Change-Id: Iff2bfcbfbca642edf503c5ed481d6f0855ee9315
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-22 14:14:15 +00:00
Nick Chameyev f6fc3019a6 Merge "[Unfold transition] Hide invisible workspaces during animation" into tm-qpr-dev am: 92c93bdda5 am: de32174e7f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21335338

Change-Id: I6176aa0c3e5a472c3e57793bb26039f6e74baeba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-22 14:09:56 +00:00
Pat Manning 4faa11aea1 Merge "Animate grid tasks to modal state." into tm-qpr-dev am: 1b27affb03 am: 3eadaa7d77
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21060663

Change-Id: Icd9a71482cfbb235d03b0fadfbfd6f74d4bc44d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-22 14:09:34 +00:00
Luca Zuccarini 1252e573af Merge "Introduce launchable versions of common view types." into tm-qpr-dev am: 8ca28c4e63
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21150245

Change-Id: I23b0a77aa6ad256360e0bca7e2eb8556fff0abb5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-22 13:02:04 +00:00
Nick Chameyev de32174e7f Merge "[Unfold transition] Hide invisible workspaces during animation" into tm-qpr-dev am: 92c93bdda5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21335338

Change-Id: I6392ab3ad9873eacecc03291a5af1f06f42853a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-22 13:01:45 +00:00
Pat Manning 3eadaa7d77 Merge "Animate grid tasks to modal state." into tm-qpr-dev am: 1b27affb03
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21060663

Change-Id: I3fc5d3fde2fadf3e95383c3827be7901b3712ef5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-22 13:00:42 +00:00
Thales Lima ab6f7e4c52 Merge "Rename variables for better understanding" into tm-qpr-dev am: 85f734b587 am: e786623053 am: 1db4318a5d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20883272

Change-Id: I7118beff37630a0bae258e7441b921641fa1672f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-22 12:58:36 +00:00
Andy Wickham 4e7ca551df Merge "Set All Apps scale to 1 to start." into tm-qpr-dev am: 41d0cec7de am: dd5f417e9a am: 0f5743e960
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21407989

Change-Id: I09136257f62161e20474a18f687429d6ffeec763
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-22 12:57:19 +00:00
Luca Zuccarini 8ca28c4e63 Merge "Introduce launchable versions of common view types." into tm-qpr-dev 2023-02-22 12:19:50 +00:00
Thales Lima 1db4318a5d Merge "Rename variables for better understanding" into tm-qpr-dev am: 85f734b587 am: e786623053
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20883272

Change-Id: I4fcd6bc321aa5db2f63f732df2ecf1012dcda926
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-22 11:32:10 +00:00
Andy Wickham 0f5743e960 Merge "Set All Apps scale to 1 to start." into tm-qpr-dev am: 41d0cec7de am: dd5f417e9a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21407989

Change-Id: I925f5eee59c4611083a6d56783f2d3e6516e950a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-22 11:27:22 +00:00
Nick Chameyev 92c93bdda5 Merge "[Unfold transition] Hide invisible workspaces during animation" into tm-qpr-dev 2023-02-22 11:20:16 +00:00
Pat Manning 1b27affb03 Merge "Animate grid tasks to modal state." into tm-qpr-dev 2023-02-22 11:18:47 +00:00
Thales Lima e786623053 Merge "Rename variables for better understanding" into tm-qpr-dev am: 85f734b587
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20883272

Change-Id: I72a03881b833a58627bbeb71cf04ca11e063aa07
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-22 10:33:06 +00:00
Andy Wickham dd5f417e9a Merge "Set All Apps scale to 1 to start." into tm-qpr-dev am: 41d0cec7de
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21407989

Change-Id: If64eea2e13f4207d6bac18afab50ff9ddc5c57cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-22 10:28:19 +00:00
Thales Lima 85f734b587 Merge "Rename variables for better understanding" into tm-qpr-dev 2023-02-22 09:36:43 +00:00
Andy Wickham 41d0cec7de Merge "Set All Apps scale to 1 to start." into tm-qpr-dev 2023-02-22 09:23:14 +00:00
Tracy Zhou 87a93c6ecb Expose taskbar toggled signal to Launcher
Bug: 246660615
Test: N/A
Change-Id: I6051bffa1097c43c617cbb9e8a6b8815dd065a30
2023-02-22 08:55:38 +00:00
Kevin Lim 6a8f5054c1 Merge "[DenserUI] Add feature flag for app icon in inline shortcuts." into tm-qpr-dev am: 2d5c2399ed am: 9acf5f147f am: 888a3fe0ca
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21407092

Change-Id: I7c5fc62e05fd3cb433e6f69c010546ac798d73f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-22 08:02:45 +00:00
Tony Wickham 9f5c3ad522 Merge "Fix a couple of drag and drop issues from transient taskbar" into tm-qpr-dev am: 2a567ec85a am: b506ae73b0 am: 3a36d4890a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21527497

Change-Id: Ifefe4fe4ae929ef7b5166f80e04c4738cd180df0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-22 07:53:59 +00:00
Vinit Nayak 8faa91eed2 Merge "Move split functions from RecentsView to SplitSelectStateController" into tm-qpr-dev am: 54c262cd67 am: 06ed4db282 am: 8e17afacdd am: 5720905625
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21468212

Change-Id: I1fcd8eacb2ec25d13fc99e8e50ae949602e214f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-22 06:32:28 +00:00
Brandon Dayauon 9b66fe67fd Merge "Make shortcuts on people row themed" into tm-qpr-dev am: 97baa50a07 am: 2cdd533c77 am: b4ce6989d0 am: d0f6e17b20
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21271707

Change-Id: Ia0a86cd58bdb1dd77933a84eb63ae9a286233df9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-22 06:30:18 +00:00
Kevin Lim 888a3fe0ca Merge "[DenserUI] Add feature flag for app icon in inline shortcuts." into tm-qpr-dev am: 2d5c2399ed am: 9acf5f147f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21407092

Change-Id: I0f53da52a09f6914323c8d9c6938451396e47e54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-22 06:23:53 +00:00
Tony Wickham 3a36d4890a Merge "Fix a couple of drag and drop issues from transient taskbar" into tm-qpr-dev am: 2a567ec85a am: b506ae73b0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21527497

Change-Id: I51be618db419357a60d0597f3f195ad284bd2c83
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-22 06:22:44 +00:00
Android Build Coastguard Worker d02f3aa214 Merge cherrypicks of ['googleplex-android-review.googlesource.com/21522366'] into udc-release.
Change-Id: Ib0f75dbb667a604cce69ab4be03ee3aed46769d5
2023-02-22 05:30:28 +00:00
Stefan Andonian 21cec7e9ff Revert "Migrate IDP_GRID_NAME usage to LauncherPrefs"
This reverts commit 6f9a57186c.

Reason for revert: A Bug where only device preferences were being used, not the main shared preference file.

Bug: 269569568
Test: Verified this on device.
Change-Id: I8422b2d7073537bd46c3a91033bd2281bbd306b7
(cherry picked from commit df11959779)
Merged-In: I8422b2d7073537bd46c3a91033bd2281bbd306b7
2023-02-22 05:30:07 +00:00
Kevin Lim 9acf5f147f Merge "[DenserUI] Add feature flag for app icon in inline shortcuts." into tm-qpr-dev am: 2d5c2399ed
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21407092

Change-Id: Idb18cd3d009cd7f1b6cd4871987bd07191091be6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-22 05:24:45 +00:00
Tony Wickham b506ae73b0 Merge "Fix a couple of drag and drop issues from transient taskbar" into tm-qpr-dev am: 2a567ec85a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21527497

Change-Id: Ica30f4d7a313b5966b8ca72654f4002e581faf31
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-22 05:23:21 +00:00
Vinit Nayak 5720905625 Merge "Move split functions from RecentsView to SplitSelectStateController" into tm-qpr-dev am: 54c262cd67 am: 06ed4db282 am: 8e17afacdd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21468212

Change-Id: I2b6a69c928075075ba1885f63cdd672e1febdde1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-22 05:23:12 +00:00
Vinit Nayak 4f5fb6a91d Merge "Move split functions from RecentsView to SplitSelectStateController" into tm-qpr-dev am: 54c262cd67 am: 06ed4db282 am: 8e17afacdd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21468212

Change-Id: I55afcbef04c0b2a987f20065fe23932733d05a54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-22 05:21:03 +00:00
Brandon Dayauon d0f6e17b20 Merge "Make shortcuts on people row themed" into tm-qpr-dev am: 97baa50a07 am: 2cdd533c77 am: b4ce6989d0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21271707

Change-Id: I80a577e7d0dcfe9fbebe2976e31e81d8017c4ebd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-22 05:20:16 +00:00
Brandon Dayauon 1d45d5a12f Merge "Make shortcuts on people row themed" into tm-qpr-dev am: 97baa50a07 am: 2cdd533c77 am: b4ce6989d0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21271707

Change-Id: I9ef541bc016122027a00e81a86f4712cc3414fbb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-22 05:18:39 +00:00
Android Build Coastguard Worker 2ab9122573 Snap for 9635132 from af1c102e69 to udc-release
Change-Id: I2defc32b7c25c25140101c6a9d652b545ffacf67
2023-02-22 04:27:10 +00:00
Kevin Lim 2d5c2399ed Merge "[DenserUI] Add feature flag for app icon in inline shortcuts." into tm-qpr-dev 2023-02-22 04:05:40 +00:00
Vinit Nayak 8e17afacdd Merge "Move split functions from RecentsView to SplitSelectStateController" into tm-qpr-dev am: 54c262cd67 am: 06ed4db282
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21468212

Change-Id: I4f8fab35c7c4c1de91927fc01a3b8a90d8d4aacd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-22 03:51:29 +00:00
Brandon Dayauon b4ce6989d0 Merge "Make shortcuts on people row themed" into tm-qpr-dev am: 97baa50a07 am: 2cdd533c77
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21271707

Change-Id: I70c1e758cec25e5cec513082e6277e23fd50487f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-22 03:50:10 +00:00
Tony Wickham 00f89fbbf6 Fix taskbar drag view scale when returning to original icon
- Use getSourceVisualDragBounds() if the target view is BubbleTextView;
  this accounts for padding as well as extra ring inset for
  PredictedAppIcon
- Also ensure we always use the final drag view scale when switching to
  the system drag and drop, instead of using the current scale which
  might be in the process of animating

Test: drag regular and predicted icons in taskbar, but drop it in a
region that doesn't accept it (e.g. the taskbar itself), check that the
return animation scales and offsets more correctly than before
Bug: 269814838

Change-Id: Ie8398b2617340e1d2568773563aa0263a3366940
2023-02-22 03:41:03 +00:00
Tony Wickham 2a567ec85a Merge "Fix a couple of drag and drop issues from transient taskbar" into tm-qpr-dev 2023-02-22 03:38:38 +00:00