Commit Graph

78507 Commits

Author SHA1 Message Date
Xin Li 7735035902 [automerger skipped] Merge "Merge Android 13 QPR2" am: 050fd1f936 -s ours
am skip reason: Merged-In I58b416c43fda20b9b028106e6bb4e451addbbbaa with SHA-1 96fbc57162 is already in history

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

Change-Id: Ifc6aa009b7fa1914fc89cd449af55c15f3acf31e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 22:33:50 +00:00
Xin Li ec0facc1b2 [automerger skipped] Merge Android 13 QPR2 am: b0d15db067 -s ours
am skip reason: Merged-In I58b416c43fda20b9b028106e6bb4e451addbbbaa with SHA-1 96fbc57162 is already in history

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

Change-Id: Iba7369a8c75fdd2d06839981012c6dfd1861f7a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 22:32:03 +00:00
Brandon Dayauon 798b89252b Merge "Shortcut/people icon horizontal layout polish" into tm-qpr-dev am: 50eef33f20 am: e6b8134769
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21980491

Change-Id: I264f150313f4252607f10a3c4378a2e94acc4fca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 22:14:32 +00:00
Stefan Andonian 2b91006ef9 Merge "Enable CONTINUOUS_VIEW_TREE_CAPTURE FeatureFlag." into udc-dev am: e74c24d6f4 am: f633f487cd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21932870

Change-Id: If81f0d3040c0320e6ae3fb6aa3e0e76477bfae4c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 22:06:58 +00:00
Pat Manning 5ea8540089 Merge "Scale using workspace width for handheld device on swiping from home to overview." into tm-qpr-dev am: 105d72b6ea am: 285121bddf am: ef2e9c51e3 am: 062584a591
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21958125

Change-Id: I53ae04aadb19fde4b7d4483eb742e761c71a5bd1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 22:06:32 +00:00
Stefan Andonian 5feeaa555b Merge "Enable CONTINUOUS_VIEW_TREE_CAPTURE FeatureFlag." into udc-dev am: e74c24d6f4 am: 8a44021866
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21932870

Change-Id: I3f628b203629b30b95141d135ad37fa51dadf411
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 22:04:18 +00:00
Pat Manning 02d7f3ab21 Merge "Scale using workspace width for handheld device on swiping from home to overview." into tm-qpr-dev am: 105d72b6ea am: 285121bddf am: ef2e9c51e3 am: df96bb0ed8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21958125

Change-Id: I20a223abc0c26cab86be6c082dd5ff53e0a189d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 22:03:21 +00:00
Xin Li 050fd1f936 Merge "Merge Android 13 QPR2" 2023-03-14 21:40:25 +00:00
Stefan Andonian f633f487cd Merge "Enable CONTINUOUS_VIEW_TREE_CAPTURE FeatureFlag." into udc-dev am: e74c24d6f4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21932870

Change-Id: I0a977ea6fc9101904376399aed276911c8705c77
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 21:29:45 +00:00
Stefan Andonian 8a44021866 Merge "Enable CONTINUOUS_VIEW_TREE_CAPTURE FeatureFlag." into udc-dev am: e74c24d6f4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21932870

Change-Id: Ia7d051fa7ed0e1e1c488da8bb2ac6da7288d8eb6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 21:27:19 +00:00
Pat Manning 062584a591 Merge "Scale using workspace width for handheld device on swiping from home to overview." into tm-qpr-dev am: 105d72b6ea am: 285121bddf am: ef2e9c51e3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21958125

Change-Id: I5bed9ce6dd4d9b243276421013095b9e6d0cb475
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 21:27:04 +00:00
Pat Manning df96bb0ed8 Merge "Scale using workspace width for handheld device on swiping from home to overview." into tm-qpr-dev am: 105d72b6ea am: 285121bddf am: ef2e9c51e3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21958125

Change-Id: I99d6cb87321761d7c835623517f8b535460b6a3b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 21:26:23 +00:00
Brandon Dayauon e6b8134769 Merge "Shortcut/people icon horizontal layout polish" into tm-qpr-dev am: 50eef33f20
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21980491

Change-Id: I8d04b7e94c912252bd49fcd262630d73f33ce16c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 21:25:37 +00:00
Vinit Nayak 40595ac4c0 Add debug logging for touch handling for all tests
* This information comes up often enough in test failures, good
to have at the outset to rule out obvious issues.

Bug: 270214626
Change-Id: Iee70fffed7a742565f41d8bf5aa38cdabefca3b4
2023-03-14 14:10:33 -07:00
Brandon Dayauon b1957cd6fb Set textSize and compound drawable padding for mDisplay == DISPLAY_SEARCH_RESULT
This is so it matches closely to all apps icons but the difference is that the icon size is 48dp.

bug: 261047689
test: manual - https://screenshot.googleplex.com/83YwnfwSfR6CJRB and https://screenshot.googleplex.com/68Yqz9hk5NHETKK
Change-Id: I381d9415d2a80a9d36291828a1a31d0c83fc395e
2023-03-14 13:27:30 -07:00
Stefan Andonian e74c24d6f4 Merge "Enable CONTINUOUS_VIEW_TREE_CAPTURE FeatureFlag." into udc-dev 2023-03-14 20:21:32 +00:00
Pat Manning ef2e9c51e3 Merge "Scale using workspace width for handheld device on swiping from home to overview." into tm-qpr-dev am: 105d72b6ea am: 285121bddf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21958125

Change-Id: I0852334fd194b2c5478d1945814731dfb3ba09a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 20:20:42 +00:00
Stefan Andonian 2b4e19a01a Enable CONTINUOUS_VIEW_TREE_CAPTURE FeatureFlag.
Bug: 224595733
Test: Feature works wonderfully.
Change-Id: Idf20cc673d32484eeb4501060c58b1d334dd6ad3
2023-03-14 20:20:23 +00:00
Brandon Dayauon 50eef33f20 Merge "Shortcut/people icon horizontal layout polish" into tm-qpr-dev 2023-03-14 20:18:54 +00:00
Jeremy Sim 0047070247 Merge "Fix two issues with splitting from Taskbar" into tm-qpr-dev am: b439c837d8 am: 0389929e5f am: 0529dbe41f am: ca2997bba6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21966877

Change-Id: I1bf94ac6ed142bed96200847af2f9ad0e41708bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 19:46:11 +00:00
Automerger Merge Worker 47f9efcc9a Merge "Merge "Fix two issues with splitting from Taskbar" into tm-qpr-dev am: b439c837d8 am: 0389929e5f am: 0529dbe41f am: c5cdf7f7a1" 2023-03-14 19:45:24 +00:00
Brian Isganitis 2dc02e885b Merge "Log when FLAG_STASHED_IN_APP_AUTO changes." into tm-qpr-dev am: 201a8f5ea3 am: c9905fed66 am: 7654a32a29 am: 02a8e64b02
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21778876

Change-Id: I582c9a260208047e048287fe940217ebbc9113ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 19:45:16 +00:00
Jeremy Sim 529cfa8e06 Merge "Fix two issues with splitting from Taskbar" into tm-qpr-dev am: b439c837d8 am: 0389929e5f am: 0529dbe41f am: c5cdf7f7a1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21966877

Change-Id: I7c010e725aba2e55bccf8d503f81ea9b357bd3d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 19:45:11 +00:00
Brian Isganitis e5488628f3 Merge "Log when FLAG_STASHED_IN_APP_AUTO changes." into tm-qpr-dev am: 201a8f5ea3 am: c9905fed66 am: 7654a32a29 am: 458c3aef29
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21778876

Change-Id: I23d00dc96fcd5c2866aa6eb70d052a4010100de0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 19:44:03 +00:00
Pat Manning 285121bddf Merge "Scale using workspace width for handheld device on swiping from home to overview." into tm-qpr-dev am: 105d72b6ea
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21958125

Change-Id: I86a3c8d0cfb6b258031669d8fb9e6b15a1fb2733
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 19:43:43 +00:00
Charlie Anderson 3ddd00ee3c Revert "Revert "flip app shortcut popup design on for U""
This reverts commit 5156b48f6c.

Reason for revert: Fixed test failures from flipping the flag on in ag/22066273 and ag/21992972

Change-Id: I0478869c22a8f23d81a688bfa07a40230521f638
2023-03-14 19:39:40 +00:00
Pat Manning 105d72b6ea Merge "Scale using workspace width for handheld device on swiping from home to overview." into tm-qpr-dev 2023-03-14 19:13:31 +00:00
Jeremy Sim ca2997bba6 Merge "Fix two issues with splitting from Taskbar" into tm-qpr-dev am: b439c837d8 am: 0389929e5f am: 0529dbe41f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21966877

Change-Id: I667a69e835fbc718940548d88711735d96166e09
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 19:05:31 +00:00
Jeremy Sim c5cdf7f7a1 Merge "Fix two issues with splitting from Taskbar" into tm-qpr-dev am: b439c837d8 am: 0389929e5f am: 0529dbe41f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21966877

Change-Id: I089badd99119ea3990e7078c8a0fcc0be5e9a903
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 19:04:55 +00:00
Brian Isganitis 458c3aef29 Merge "Log when FLAG_STASHED_IN_APP_AUTO changes." into tm-qpr-dev am: 201a8f5ea3 am: c9905fed66 am: 7654a32a29
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21778876

Change-Id: I38f524341bcada333de36563b6771e2831d0b2b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 19:02:53 +00:00
Brian Isganitis 02a8e64b02 Merge "Log when FLAG_STASHED_IN_APP_AUTO changes." into tm-qpr-dev am: 201a8f5ea3 am: c9905fed66 am: 7654a32a29
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21778876

Change-Id: I804a51b6dab4f153e083832e61fdc39e347ebab1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 19:02:46 +00:00
Jeremy Sim 0529dbe41f Merge "Fix two issues with splitting from Taskbar" into tm-qpr-dev am: b439c837d8 am: 0389929e5f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21966877

Change-Id: I89e1057e9d11c22e06e3dd1bd42851d83fee06f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 18:23:40 +00:00
Brian Isganitis 7654a32a29 Merge "Log when FLAG_STASHED_IN_APP_AUTO changes." into tm-qpr-dev am: 201a8f5ea3 am: c9905fed66
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21778876

Change-Id: I56f40e88f58630b919fc1231fc1b230074c186bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 18:22:53 +00:00
Fengjiang Li 0aa58b32eb Merge "[Predictive Back] Taskbar allapps -> home" into udc-dev am: 7f4d53b074 am: d3d5cdc301
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21991746

Change-Id: I50e8aac832123e64d1cfb34b59c35981e53a56cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 18:06:41 +00:00
Jeremy Sim 0389929e5f Merge "Fix two issues with splitting from Taskbar" into tm-qpr-dev am: b439c837d8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21966877

Change-Id: I0aa5b2f2ee81d12fb3f7157fa8406f96f62eda39
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 18:06:34 +00:00
Jon Miranda f262cf989e Fix taskbar spring when going from home to overview.
Bug: 246660243
Test: go home -> overview
Change-Id: Id49d8f7457940ce28684c0259ed1f204b9026609
2023-03-14 11:04:16 -07:00
Brandon Dayauon 2b3343018e Shortcut/people icon horizontal layout polish
- allow two line for SearchResultShortcutIcons (also be used in search_result_icon_container)

bug: 261047689
test: manual - https://screenshot.googleplex.com/9wwjxp3nqf4iyJr
Change-Id: Ie8d1415ea94f843f32abb9e4416064c1b674be6d
2023-03-14 11:03:18 -07:00
Jeremy Sim b439c837d8 Merge "Fix two issues with splitting from Taskbar" into tm-qpr-dev 2023-03-14 17:53:25 +00:00
Jeremy Sim 6152c902ed Fix two issues with splitting from Taskbar
This patch fixes two issues that would arise when the user initiated split from Taskbar:
1) The Overview Actions View would animate out, then erroneously pop back in.
2) When initiating split from home repeatedly, the task thumbnail grid would not animate downward properly, instead staying in the wrong y-position.

Both issues were caused by the fact that we now have a new way to enter OverviewSplitSelect (directly from Taskbar/Home), which rendered some of our old assumptions incorrect. Namely:
1) When we finish transitioning to OverviewSplitSelect, we need to update OverviewActionsView visibility so that it stays hidden.
2) mSplitHiddenTaskView is no longer a good way to tell if we are in split select state or not.

Fixed by adding a new call to updateCurrentTaskActionsVisibility() to the end of the split staging animation, and by making sure translations get reset every time resetFromSplitSelect() is called.

Fixes: 271624078
Fixes: 261544937
Test: Manual, verified on large and small tablet screens with various types of split invocations and rotation combinations.

Change-Id: Ied0f4818ce6da599845ccd07e9dc96ef4ba030c3
2023-03-14 17:53:11 +00:00
Fengjiang Li cbfdf0e868 Merge "[Predictive Back] Taskbar allapps -> home" into udc-dev am: 7f4d53b074 am: 64c2efc0d1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21991746

Change-Id: I015198a3850d17800ccf35c5db7bfe5d628194b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 17:45:45 +00:00
Brian Isganitis c9905fed66 Merge "Log when FLAG_STASHED_IN_APP_AUTO changes." into tm-qpr-dev am: 201a8f5ea3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21778876

Change-Id: I4c0f86fb4e29f90468e9f74da5d7ffe3045fb2b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 17:45:09 +00:00
Fengjiang Li d3d5cdc301 Merge "[Predictive Back] Taskbar allapps -> home" into udc-dev am: 7f4d53b074
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21991746

Change-Id: Ibbdd386397d7c414f67498d56b4b503fa06f1b78
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 17:28:32 +00:00
Brian Isganitis 201a8f5ea3 Merge "Log when FLAG_STASHED_IN_APP_AUTO changes." into tm-qpr-dev 2023-03-14 17:16:43 +00:00
Fengjiang Li 64c2efc0d1 Merge "[Predictive Back] Taskbar allapps -> home" into udc-dev am: 7f4d53b074
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21991746

Change-Id: Ic47e9dc698f829d62118f74391eec4882fe36a37
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 17:10:35 +00:00
Fengjiang Li 7f4d53b074 Merge "[Predictive Back] Taskbar allapps -> home" into udc-dev 2023-03-14 16:40:48 +00:00
Charlie Anderson 63be5b53db polish for the app shortcut popup, fixing padding on several elements.
Bug: 269343928
Test: manually verify against spec
Change-Id: Ib8dd7ab2778644e2220622d43f9774c1de6357e9
2023-03-14 11:33:38 -04:00
Xin Li b0d15db067 Merge Android 13 QPR2
Bug: 273316506
Merged-In: I58b416c43fda20b9b028106e6bb4e451addbbbaa
Change-Id: I3327b5dbf50f95ba54336541ef476c6770693fef
2023-03-13 23:11:27 -07:00
Tony Wickham de93a4e725 Merge "Restore old interpolators for Overview -> Home" into tm-qpr-dev am: b4af207224 am: d34690bc4e am: a3a8bb9162 am: 9ff81250dc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21801036

Change-Id: Ie11f27b78142b26a8338deff2664a84b894ab850
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 04:27:27 +00:00
Tony Wickham 09cdcc73f5 Merge "Restore old interpolators for Overview -> Home" into tm-qpr-dev am: b4af207224 am: d34690bc4e am: a3a8bb9162 am: f8a86c8b22
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21801036

Change-Id: Ic9bf6f533e5a2e5b63ae38e142dd828eae6caf4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 04:27:04 +00:00
Tony Wickham f8a86c8b22 Merge "Restore old interpolators for Overview -> Home" into tm-qpr-dev am: b4af207224 am: d34690bc4e am: a3a8bb9162
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21801036

Change-Id: Icc70d4f05ac5c8d38cde53a0b30d7a9ee97fc6cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 03:34:02 +00:00