4b2cd96bdc
Merge "Fix test and DeviceProfile dump" into tm-qpr-dev am: b0ed7dae63 am: 1635e321bb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20542666
Change-Id: Idb4eb8fe27b3f86d3d9229f9fd9d7f313cc95748
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-24 12:46:28 +00:00
1635e321bb
Merge "Fix test and DeviceProfile dump" into tm-qpr-dev am: b0ed7dae63
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20542666
Change-Id: I7b0313b2e1f566e6a74e3ebc0fdbd53ef5cd94a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-24 12:10:33 +00:00
b0ed7dae63
Merge "Fix test and DeviceProfile dump" into tm-qpr-dev
2022-11-24 11:32:56 +00:00
923e6eead5
Merge "Check for isTaskbarPresent in addition to isTransientTaskbar when the method is called outside of taskbar." into tm-qpr-dev am: 3535426bea am: 01dae31db7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20544533
Change-Id: I40d80d5c41243ff383c156112966769232765cd3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-24 03:15:09 +00:00
01dae31db7
Merge "Check for isTaskbarPresent in addition to isTransientTaskbar when the method is called outside of taskbar." into tm-qpr-dev am: 3535426bea
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20544533
Change-Id: I8d77fb2ef6f2a7572627f8cbcdd8b4102c3b78f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-24 01:59:25 +00:00
3535426bea
Merge "Check for isTaskbarPresent in addition to isTransientTaskbar when the method is called outside of taskbar." into tm-qpr-dev
2022-11-24 01:28:18 +00:00
adc426bd71
Merge "Prevent empty recents going home when splitting with taskbar present" into tm-qpr-dev am: dba5a396b0 am: 87d546e94a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20545270
Change-Id: Iced00f7a660c58ee6547c9faa795c45226919c17
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-23 23:35:13 +00:00
87d546e94a
Merge "Prevent empty recents going home when splitting with taskbar present" into tm-qpr-dev am: dba5a396b0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20545270
Change-Id: Id8f6f8c23515fa95ca58a395f8536e5efedd3df7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-23 23:01:52 +00:00
dba5a396b0
Merge "Prevent empty recents going home when splitting with taskbar present" into tm-qpr-dev
2022-11-23 22:20:44 +00:00
d4341633a1
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 50286fe326 -s ours am: 08c4290de2 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20545272
Change-Id: Idd4e4a8bb0b196ed87025bdb4da01ec7f1628fa5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-23 20:36:14 +00:00
10a2474384
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 82e885471d -s ours am: e6b215b93a -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20545272
Change-Id: I6afbf520da5268924b700ad33062ff04e1d47aef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-23 20:35:57 +00:00
08c4290de2
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 50286fe326 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20545272
Change-Id: I966bb54422288fed2c32871c0c6285f186b45fc1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-23 20:14:13 +00:00
e6b215b93a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 82e885471d -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20545272
Change-Id: I524c27aea7f67a0b84aa010df8bef417bf46861d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-23 20:13:56 +00:00
807823155d
Check for isTaskbarPresent in addition to isTransientTaskbar
...
when the method is called outside of taskbar.
This prevents the case where phone runs transient taskbar logic.
Bug: 260006210
Test: added local logs, tested in phone mode
Change-Id: I600c06d6c797bd68461ac033dcc2c6158f221024
2022-11-23 12:05:43 -08:00
50286fe326
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2022-11-23 19:38:40 +00:00
da42719fec
Merge "Set grid progress even when task count is 0." into tm-qpr-dev am: 82f05a857d am: 78fcf6aaeb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20508307
Change-Id: I4a6114da8e3789418c8a2f378e0d88d01c2f7703
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-23 12:34:03 +00:00
78fcf6aaeb
Merge "Set grid progress even when task count is 0." into tm-qpr-dev am: 82f05a857d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20508307
Change-Id: I8ef71e65d4eb2a7c9625a83d09360d16559041b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-23 12:01:02 +00:00
82f05a857d
Merge "Set grid progress even when task count is 0." into tm-qpr-dev
2022-11-23 11:31:35 +00:00
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
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
b96e084557
Merge "[Toast] Add a feature flag for rich answer" into tm-qpr-dev
2022-11-23 01:10:10 +00:00
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
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
82e885471d
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I0987e308a9d904411dcfa29aabfbdf482ea59942
2022-11-22 13:34:50 -08:00
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
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
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
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
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
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
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
bb1e2a526a
Merge "Remove on drag listener after drag ended" into tm-qpr-dev
2022-11-22 19:24:37 +00:00
09f04d34a3
Merge "Adding the flag for putting widget host in the background" into tm-qpr-dev
2022-11-22 19:22:09 +00:00
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
da858aab44
Merge "Override displacement for transient taskbar instead of mCurrentShift" into tm-qpr-dev
2022-11-22 18:37:22 +00:00
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
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
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
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
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
ad932045ac
Merge "Refactor GridSizeMigrationTaskV2" into tm-qpr-dev
2022-11-22 17:22:39 +00:00
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
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
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
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
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
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
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
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
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
Thales Lima
Jon Miranda
Vinit Nayak
TreeHugger Robot
Bill Yi
Pat Manning
Becky Qiu
Ikram Gabiyev
Sihua Ma
Tony Wickham
Pinyao Ting
Xiaowen Lei