Commit Graph

60459 Commits

Author SHA1 Message Date
Pat Manning 82f05a857d Merge "Set grid progress even when task count is 0." into tm-qpr-dev 2022-11-23 11:31:35 +00:00
Holly Sun 259723de32 Catch exception to prevent crash.
Bug: 258234624
Test: QA verify
Change-Id: I31df77b33f19426d136673d1ce9866fa6e60729c
2022-11-22 20:58:36 -08:00
Becky Qiu ae89879d9d Merge "[Toast] Add a feature flag for rich answer" into tm-qpr-dev am: b96e084557 am: db6c009df7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20442286

Change-Id: I0c3bf3f82200749fcde1b814dce0383d361999fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-23 02:06:09 +00:00
Becky Qiu db6c009df7 Merge "[Toast] Add a feature flag for rich answer" into tm-qpr-dev am: b96e084557
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20442286

Change-Id: I148448983a23977a81ddc610466fe9ce996f878c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-23 01:32:24 +00:00
Becky Qiu b96e084557 Merge "[Toast] Add a feature flag for rich answer" into tm-qpr-dev 2022-11-23 01:10:10 +00:00
Android Build Coastguard Worker 8bad4a54f2 Snap for 9321341 from 691c6e511f to tm-qpr2-release
Change-Id: Ia0ed2abc03e130bbc419291a6ad27d5ba00e5d70
2022-11-23 00:29:24 +00:00
Shan Huang 19a0dc1d3d Rename BackEvent to IBackEvent in LauncherBackAnimationController.
Bug: 238475284
Test: m -j
Change-Id: Ie8e2b184bf460b1c09268f4547fe110e27bb3a40
2022-11-22 16:27:13 -08:00
TreeHugger Robot e4dafd4750 Merge changes from topic "revert-20479526-revert-20427045-258023561-BPDASTWITO-FBDWZBDEFC" into tm-qpr-dev am: 691c6e511f am: dd683ab6c5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20487426

Change-Id: I8a28b830bc3db11bc49b32f7627494d392ca74a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-22 22:12:04 +00:00
TreeHugger Robot dd683ab6c5 Merge changes from topic "revert-20479526-revert-20427045-258023561-BPDASTWITO-FBDWZBDEFC" into tm-qpr-dev am: 691c6e511f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20487426

Change-Id: I186279c0d3a7c8c3a92d83984c298e4687aae60b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-22 21:37:34 +00:00
Bill Yi 82e885471d Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I0987e308a9d904411dcfa29aabfbdf482ea59942
2022-11-22 13:34:50 -08:00
Vinit Nayak 182eb9dc15 Prevent empty recents going home when splitting with taskbar present
* Recents is empty, so it thinks we need to go home
* Split selection state prevents that, since second app can be
choosen from taskbar

Fixes: 260024461
Test: Recents still goes home when taskbar not present and
has no recent tasks. Doesn't go home when split with a single task;
second task launches correctly from taskbar

Change-Id: Ib5fc7989c66c5efccde53ea48319f9669cd664e2
2022-11-22 13:20:49 -08:00
TreeHugger Robot 691c6e511f Merge changes from topic "revert-20479526-revert-20427045-258023561-BPDASTWITO-FBDWZBDEFC" into tm-qpr-dev
* changes:
  Fixing the revert by not continuing the reorder if the solution is null.
  Revert "Revert "Reorder widgets no longer overlaps when no space..."
2022-11-22 21:18:42 +00:00
Ikram Gabiyev 3d6c8de2af Merge "Remove on drag listener after drag ended" into tm-qpr-dev am: bb1e2a526a am: c9cb25ab3b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20538917

Change-Id: I895c98ddcc0fc3c3c84708b9115f0537117a8f72
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-22 19:46:09 +00:00
Sihua Ma 09a9d797cd Merge "Adding the flag for putting widget host in the background" into tm-qpr-dev am: 09f04d34a3 am: 06dbe3f685
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20535705

Change-Id: I0c02eec74ba1347866f4099f3b2f7aa53a4f4a27
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-22 19:46:01 +00:00
Tony Wickham 9a9a36268e Merge "Override displacement for transient taskbar instead of mCurrentShift" into tm-qpr-dev am: da858aab44 am: ed63ab8e14
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20535957

Change-Id: If3107046c9870361257132d48ed067466871c9cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-22 19:45:51 +00:00
Ikram Gabiyev c9cb25ab3b Merge "Remove on drag listener after drag ended" into tm-qpr-dev am: bb1e2a526a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20538917

Change-Id: I3f427604661c9c3baa38f01d65c9ab52c2b06f48
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-22 19:41:37 +00:00
Sihua Ma 06dbe3f685 Merge "Adding the flag for putting widget host in the background" into tm-qpr-dev am: 09f04d34a3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20535705

Change-Id: I9a3764920bca4ab369c2ca070f02473d052a9d30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-22 19:40:17 +00:00
Ikram Gabiyev bb1e2a526a Merge "Remove on drag listener after drag ended" into tm-qpr-dev 2022-11-22 19:24:37 +00:00
Sihua Ma 09f04d34a3 Merge "Adding the flag for putting widget host in the background" into tm-qpr-dev 2022-11-22 19:22:09 +00:00
Tony Wickham ed63ab8e14 Merge "Override displacement for transient taskbar instead of mCurrentShift" into tm-qpr-dev am: da858aab44
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20535957

Change-Id: Ida928802918f736d178ad16926256982c02c479c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-22 19:12:31 +00:00
Tony Wickham da858aab44 Merge "Override displacement for transient taskbar instead of mCurrentShift" into tm-qpr-dev 2022-11-22 18:37:22 +00:00
Pinyao Ting 55621f4001 Merge "Refactor GridSizeMigrationTaskV2" into tm-qpr-dev am: ad932045ac am: ff521c99ad
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20535959

Change-Id: Ic7a3f0ac4db6facf7ce17208133bf6b85dc25644
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-22 17:52:26 +00:00
Jon Miranda ee8a66445c Merge "Add revised thresholds for transient taskbar behind flag ENABLE_TASKBAR_REVISED_THRESHOLDS." into tm-qpr-dev am: e57cab1da8 am: e5e4d5a070
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20536952

Change-Id: I15b41ee05ddf6082fffc45fd7b8393ab6aa83dbe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-22 17:52:16 +00:00
Xiaowen Lei 6a7074cbc7 Merge "Fix issue in RTL where swipes on Launcher Smartspace are intercepted." into tm-qpr-dev am: 8eb1c3bde5 am: a5255f7295
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20498445

Change-Id: I0e205c926e5e8058c8aac4c1db0b937e946d409c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-22 17:51:28 +00:00
Pinyao Ting ff521c99ad Merge "Refactor GridSizeMigrationTaskV2" into tm-qpr-dev am: ad932045ac
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20535959

Change-Id: Idb226f20849c78a5c06c6dcf4078d15cfb9090da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-22 17:46:42 +00:00
Jon Miranda e5e4d5a070 Merge "Add revised thresholds for transient taskbar behind flag ENABLE_TASKBAR_REVISED_THRESHOLDS." into tm-qpr-dev am: e57cab1da8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20536952

Change-Id: I4afa4d3e50c501f8504d727e1973588927bcffb9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-22 17:45:51 +00:00
Pinyao Ting ad932045ac Merge "Refactor GridSizeMigrationTaskV2" into tm-qpr-dev 2022-11-22 17:22:39 +00:00
Jon Miranda e57cab1da8 Merge "Add revised thresholds for transient taskbar behind flag ENABLE_TASKBAR_REVISED_THRESHOLDS." into tm-qpr-dev 2022-11-22 17:20:21 +00:00
Xiaowen Lei a5255f7295 Merge "Fix issue in RTL where swipes on Launcher Smartspace are intercepted." into tm-qpr-dev am: 8eb1c3bde5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20498445

Change-Id: I0351da87d19752c112ba7654bb4670b9f8896b52
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-22 17:17:37 +00:00
Xiaowen Lei 8eb1c3bde5 Merge "Fix issue in RTL where swipes on Launcher Smartspace are intercepted." into tm-qpr-dev 2022-11-22 16:53:04 +00:00
Thales Lima 171ee669de Fix test and DeviceProfile dump
The test  was parsing the paddings file with the wrong context passed to the dump method.

Fix: 259998761
Test: DeviceProfileTest
Change-Id: Ia5c243348d7334387bd7a15c3e496a1dc81570a5
2022-11-22 15:57:42 +00:00
Ikram Gabiyev 7d633ecb07 Remove on drag listener after drag ended
Remove the on drag listener for the drag layer
in the taskbar after ACTION_DRAG_ENDED is received

This is an additional refactoring discussed
in ag/20490352

Bug: 258850827

Test: manually reproduced the steps in the bug
Change-Id: Ibe207001f41d3ba97a8acaf17d633cbd6682fafd
2022-11-22 06:07:09 +00:00
TreeHugger Robot 70fe810931 Merge "Cleanup overview threshold which was only needed for 2-button mode" into tm-qpr-dev am: 654ba7f6a8 am: 8ae825c3ff
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20524510

Change-Id: I4abfaadf653b016bec37778ba245f964e8ca02eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-22 02:24:01 +00:00
TreeHugger Robot 8ae825c3ff Merge "Cleanup overview threshold which was only needed for 2-button mode" into tm-qpr-dev am: 654ba7f6a8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20524510

Change-Id: I4b79ec1b38509bdc5c7e855d06b529e756f2cdbf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-22 01:50:19 +00:00
TreeHugger Robot 654ba7f6a8 Merge "Cleanup overview threshold which was only needed for 2-button mode" into tm-qpr-dev 2022-11-22 01:16:26 +00:00
Android Build Coastguard Worker 77cff84b31 Snap for 9316743 from db81133e94 to tm-qpr2-release
Change-Id: Ia37f0434852003c1f09c9d251a9fee7d8c714d0c
2022-11-22 00:29:51 +00:00
Xiaowen Lei 6d66ad20cf Fix issue in RTL where swipes on Launcher Smartspace are intercepted.
The `+ getScrollX()` translation is a duplicate, because
`mapCoordInSelfToDescendant` also does it internally. Same for the `+
getScrollY()`.

This wasn't an issue in LTR because the top left corner of the root view
is the same as the top left corner of the first page.  `getScrollX()`
returns 0 in that case.

In RTL, the second page is to the left of the first page. If the touch
is on the first page, `+ getScrollX()` translates it outside of the
first page. This incorrectly sets mIsEventOverFirstPagePinnedItem to
false, leading to the swipe being intercepted.

Bug: 240380590
Fix: 240380590
Test: manual
Change-Id: I51f534695401ce527da8d2158130a4d54b086f3d
2022-11-21 23:52:20 +00:00
Jon Miranda 3d72ac1a78 Add revised thresholds for transient taskbar behind flag ENABLE_TASKBAR_REVISED_THRESHOLDS.
Bug: 260002412
Test: enable flag
Change-Id: I4d82a853061b1540b6c6aea5e58b05a3ea6638e0
2022-11-21 23:46:34 +00:00
Pinyao Ting dec4305d0c Refactor GridSizeMigrationTaskV2
The majority of the logic in grid size migration should be implemented
as static functions in the first place since (1) they only runs once
after instantiation and (2) they are executed immediately after they are
instantiated.

This CL removes most of the instance variables from grid size migration
in favor of static methods since the later is more efficient, more
testable and therefore considered better programming practice in
general.

Bug: 256859723
Test: atest GridSizeMigrationUtilTest
Change-Id: Ief4654d79ad5cfd636e6145fdcc9dfe5a39cdf62
2022-11-21 15:24:38 -08:00
TreeHugger Robot d5529bd651 Merge "Removing ENABLE_LOCAL_COLOR_POPUPS feature flag" into tm-qpr-dev am: db81133e94 am: 1326dc1981
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20523600

Change-Id: Idfed55fab3f55b7b8dfacd42a854c2db5078f5ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-21 22:36:58 +00:00
Sihua Ma 04ce9fa3ef Adding the flag for putting widget host in the background
Bug: 235358918
Test: N/A
Change-Id: I300bb5e293de6995a0e69402a6e337739055ca59
2022-11-21 14:17:50 -08:00
TreeHugger Robot 1326dc1981 Merge "Removing ENABLE_LOCAL_COLOR_POPUPS feature flag" into tm-qpr-dev am: db81133e94
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20523600

Change-Id: I021598ca2f8cc2cc159ff0cb849b56ef3cadc682
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-21 22:01:44 +00:00
TreeHugger Robot db81133e94 Merge "Removing ENABLE_LOCAL_COLOR_POPUPS feature flag" into tm-qpr-dev 2022-11-21 21:45:47 +00:00
Tony Wickham 7a19cccafe Override displacement for transient taskbar instead of mCurrentShift
mCurrentShift is based on displacement, but is used and set in different
places. To keep consistency throughout, we should override the
displacement at the source instead.

Test: manually swiped up between home/overview threshold and catch up
threshold; let go to go to overview and ensure no jump occurs.
Flag: teamfood (ENABLE_TRANSIENT_TASKBAR)
Fixes: 259981285

Change-Id: Id9f5b2bcdc2e56e15ddb6d93c4ee5d5ececc094d
2022-11-21 20:14:56 +00:00
Becky Qiu 654c3d1b98 [Toast] Add a feature flag for rich answer
Bug: 241295640
Test: tested with opt-in suggest data.
Change-Id: I424525eed93c60e77566bcaf673f9f1ff61e1fa1
2022-11-21 19:44:44 +00:00
Ats Jenk 3b47499e3a Merge "Add onTaskMovedToFront to close floating views" into tm-qpr-dev am: 1a8b95a9d4 am: 5dd9cffa5d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20483285

Change-Id: I6d3f263d76eb6cb7e788da724562a23895b584bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-21 19:27:25 +00:00
Brian Isganitis a1585054e0 Merge "Do not start drag from pre-drag if cancelled during animation." into tm-qpr-dev am: 0ccbd7334c am: 5ff72eaa46
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20522179

Change-Id: I83fb16775b5080ed29fab628b7a4ddf7f3113237
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-21 19:27:17 +00:00
Brian Isganitis 817b135167 Merge "Still launch disabled item if we can't handle its click." into tm-qpr-dev am: 455eca41be am: 183f07e0da
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20514045

Change-Id: I1ef05a3627aa58874d4911acd8fba153b01d2b36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-21 19:27:09 +00:00
Schneider Victor-tulias d2f650d1c3 Merge "Revert "Add debug logs to help identify when setRecentsAttachedToAppWindow will not animate properly."" into tm-qpr-dev am: b9e03da563 am: 8b9090cc35
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20521649

Change-Id: Ic9eeffb4cdfd4fd065e19de8abd046a9a553f69f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-21 19:26:53 +00:00
TreeHugger Robot 7b022b93f8 Merge "Increase icon size to be closer to spec" into tm-qpr-dev am: 81a994e9a7 am: 1414f12c14
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20500530

Change-Id: Ic92db57de677e39bb299f7d175b9ed191992d7d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-21 19:26:39 +00:00