af26e5d298
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 53bc743c58 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24975341
Change-Id: I70cd7b81083a46e9c6a5e3eaf1c7b525251c32a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-10 00:00:52 +00:00
aa217bec1d
Snap for 10922969 from 928e0521b2 to udc-qpr1-release
...
Change-Id: If866bc4fea7d8377ef44c62799c2e7a5c0a2069e
2023-10-09 23:53:36 +00:00
ca39bd99cc
Merge "Add screenrecord to testOverviewActionsMenu_iconAppChipMenu" into main
2023-10-09 21:29:11 +00:00
02a4fb41c7
Unifying constant app names used in Tests
...
Bug: 298234173
Test: No-op changes, all test should pass
Change-Id: I3cd4854b150d827393bff6eada7aa9a9201dadaa
2023-10-09 14:25:49 -07:00
488defcac2
Merge "Removing logs of test investigation" into main
2023-10-09 21:23:22 +00:00
6bc3f5e0e1
Merge "Introducing a method for execution an action on Launcher for teardown" into main
2023-10-09 21:22:47 +00:00
5bd641e3f5
Merge "Fix task bar crashing in small screen with task bar / nav bar unification on" into main
2023-10-09 20:26:25 +00:00
833bc3a1ca
[automerger skipped] DO NOT MERGE Temporary fix for race condition. am: 928e0521b2 am: d25afb7eab -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24955345
Change-Id: If90d4051041f6596ee05f54bde166a3e11b8132e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-09 18:56:26 +00:00
39b4fad9b0
Introducing a method for execution an action on Launcher for teardown
...
If the test fails to initialize properly, tearDown is still called,
and we may have null Launcher activity.
We want to safely skip using that activity to avoid a NullPointerException
that would hide the original error message.
Bug: 304306290
Test: presubmit
Flag: N/A
Change-Id: I89774a92ede046fa3afadacc62df25f4f496f4e7
2023-10-09 11:29:42 -07:00
d25afb7eab
DO NOT MERGE Temporary fix for race condition. am: 928e0521b2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24955345
Change-Id: Iae4f125b437f3fc4528851d48432757b1121f353
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-09 18:21:59 +00:00
76fcdd909d
Removing logs of test investigation
...
Fix: 288944469
Test: uninstallWorkspaceIcon
Change-Id: I4ffaa0dd589a891f880296c7be35b5fce85362e3
2023-10-09 10:52:33 -07:00
461b65fa4e
Merge "Use mock TaskStackChangeListeners in RecentsModelTest" into main
2023-10-09 16:39:13 +00:00
5cc3767e60
Stop Active Gesture Error Detection for Non Gestural Navigation Mode
...
Bug: 290266108
Bug: 294926731
Test: Presubmit
Flag: not needed
Change-Id: I111d60fbedbeb7e8b553cdeadc0e3f39a9a351b2
2023-10-09 09:34:30 -07:00
b95ee09a69
Merge "Dismiss split selection for workspace long-press" into main
2023-10-09 16:13:52 +00:00
7e6107caaf
Add NullPointerException to try/catch since it's possible to have such an error
...
getShortcutIconDrawable could return null "Method invocation 'getShortcutIconDrawable' may produce 'NullPointerException'" and it leads to the code crashing. Adding NullPointerException as one of the exceptions in the try/catch would resolve this issue
Fix: 299525046
Test: verify after merging that the null pointer exception stops occurring
Flag: no flag
Change-Id: I52cfba9c7b08ea4e1b0f4506c461e79c3e91dc6c
2023-10-09 09:05:44 -07:00
a0c149fc8d
Use mock TaskStackChangeListeners in RecentsModelTest
...
- Also unregistered TaskStackChangeListeners and TaskIconCache listeners in RecentsModel.close(), so clean-up will happen if it's in a SandboxContext
Bug: 303259446
Test: RecentsModelTest
Change-Id: I438a499be8e737de7df79b670ecfd26f0ee70662
2023-10-09 14:31:58 +01:00
928e0521b2
DO NOT MERGE Temporary fix for race condition.
...
Bug: 303078360
Test: Manual
Change-Id: I7355e3b64424492b6fab4f416014d2a9a797973d
2023-10-07 22:55:17 +00:00
3b26a6ef18
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I377cbd4c47099777bb6a8dde57582f0687ac0b1d
2023-10-06 19:03:42 -07:00
53bc743c58
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I6f3aec8a927fbd499f6693596d7233d7f3f8a988
2023-10-06 19:03:18 -07:00
9d6dbd0a8d
App Pairs: Implement app pairs icon
...
[App Pairs 5/?]
This patch implements the app pairs icon, which displays the two member apps and rotates with the device.
Flag: ENABLE_APP_PAIRS (set to false)
Bug: 274835596
Test: Manual
Change-Id: I07085339d1e2d28f004c1661f0948c59e605c76a
2023-10-06 18:57:09 -07:00
5a7e0f4c89
Merge changes from topic "am-559890116368446f962a3311347c0b69" into main
...
* changes:
[automerger skipped] Merge "Merge Android 14" into main am: 691104e82eb80f0cf7a45974c63c48bf38b4f81d4794801b4bf3d805e7f251c4ef1a3f9cb6abcd09267ff143793ef97638da
2023-10-07 00:38:03 +00:00
07f3e9dc04
Merge "Move test from TaplTestsLauncher3 to TaplUninstallRemove" into main
2023-10-07 00:36:22 +00:00
5d0a62882a
[automerger skipped] Merge "Merge Android 14" into main am: 691104e82e -s ours am: b80f0cf7a4 -s ours am: 5974c63c48 -s ours am: bf38b4f81d -s ours am: 4794801b4b -s ours
...
am skip reason: Merged-In If4c6783472d7fa05a1162e2f176a613d28f7bec3 with SHA-1 20d7edb05fhttps://android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/2776973
Change-Id: Icc1fb313343bf5a72f921ef010b282f4a86ad500
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-07 00:24:19 +00:00
c6d6285cea
Merge "Prevent workspace app icons/widgets from handling long click in split selection" into main
2023-10-07 00:21:08 +00:00
4f850a42a0
Merge changes I9e56ddbe,I8767deea into main
...
* changes:
Disallow taskbar long click when in split selection state
Add method to determine if launcher is in split selection state
2023-10-07 00:20:24 +00:00
dace3dfb15
[automerger skipped] Merge Android 14 am: f3d805e7f2 -s ours am: 51c4ef1a3f -s ours am: 9cb6abcd09 -s ours am: 267ff14379 -s ours am: 3ef97638da -s ours
...
am skip reason: Merged-In If4c6783472d7fa05a1162e2f176a613d28f7bec3 with SHA-1 20d7edb05fhttps://android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/2776973
Change-Id: I535a06c3bc1805159bb9642db8f4a72d4212934b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-07 00:19:37 +00:00
01849e4c63
Merge "Null reference to activity as runnable back handler" into main
2023-10-07 00:15:54 +00:00
f56bfabaa4
Merge "Change Taskbar Window height logic for taskbar pinning." into main
2023-10-06 23:33:30 +00:00
d0fc718a0a
Dismiss split selection for workspace long-press
...
Bug: 295426148
Test: Enter split contextual from homescreen,
long-press on empty space, split gets dismissed
Flag: ENABLE_SPLIT_WORKSPACE_TO_WORKSPACE
Change-Id: I3a893bea7b22645fe60c65c4c5ab8c2087d769da
2023-10-06 16:05:54 -07:00
36a9c19487
Merge "Defer nav handle action until after the recents transition is complete" into main
2023-10-06 22:47:32 +00:00
263644524e
Add screenrecord to testOverviewActionsMenu_iconAppChipMenu
...
Bug: 303329286
Test: n/a
Flag: no flag
Change-Id: Iab1f9e38ef1d05d56b08f62a5b3b973e96cc6f60
2023-10-06 15:38:08 -07:00
3a3aa518f9
Prevent workspace app icons/widgets from handling long click in split selection
...
Bug: 295981634
Test: Enter split selection on workspace, long pressing on
app icon or widget does nothing
Flag: ENABLE_SPLIT_FROM_WORKSPACE_TO_WORKSPACE
Change-Id: Ib439249477a7bb8bbbda9fd42e08ab02af7a831b
2023-10-06 15:13:06 -07:00
9fbc52f02d
Add CUSTOM_LPNH_THRESHOLDS feature flag to customize LPNH
...
When this flag is enabled, new Developer Options appear which
allow you to customize the slop and timeout to invoke LPNH.
The slop is defined as a multiplier to the default edge slop
(which I discovered while looking into this - it appears to
be intended for touches along the device edge and is 50%
larger than the default touch slop; currently used by Back).
Timeout is defined in milliseconds, defaulting to 400, at least
on my device.
Bug: 301680992
Bug: 300955321
Flag: CUSTOM_LPNH_THRESHOLDS - should be no-op with default off
Test: Manual with flag on and adjusting sliders, and flag off
Change-Id: Iabc7b3706f4fdd6f0392c858b81a856e375ffd51
2023-10-06 15:06:13 -07:00
186e60e94c
Merge changes from topic "overview-to-desktop" into main
...
* changes:
Account for freeform tasks being visible in overview
Enable live tile for desktop
2023-10-06 22:05:06 +00:00
114293fb56
Disallow taskbar long click when in split selection state
...
* This is specifically when contextual is initiated on home
screen and then user swipes up into overview.
* We no longer want to rely on LauncherStates for split specific
management
Bug: 295981634
Test: Start split on home, swipe up to overview, long press on
taskbar app icons, nothing happens
Flag: ENABLE_SPLIT_FROM_WORKSPACE_TO_WORKSPACE
Change-Id: I9e56ddbe1f536be779d4848769a993724d5395da
2023-10-06 14:42:22 -07:00
1525cd7269
Add method to determine if launcher is in split selection state
...
* Available for both launcher and taskbar via
ActivityContext
Bug: 295981634
Change-Id: I8767deea0b2432da3047209037874c966b83c3b3
2023-10-06 14:40:49 -07:00
576f7a5e80
Removing some usage of shared prefs
...
Bug: 301661768
Test: Presubmit
Flag: N/A
Change-Id: I158e9a5148d2c9404ea4d2e9e239696b29dbeb20
2023-10-06 14:35:56 -07:00
447b09057a
Merge "Prevent NPE from changing all apps visibility in shared state." into main
2023-10-06 20:59:33 +00:00
f79785065b
Merge "Have dragged search items return to All Apps icon if cancelled." into main
2023-10-06 20:44:06 +00:00
0bd2c4ea75
Merge "Add smartspace removal option as a toggle" into main
2023-10-06 20:35:14 +00:00
97789c9c5e
Merge "Add flag for smartspace removal toggle" into main
2023-10-06 20:35:14 +00:00
acfb180a3d
Merge "Next batch of modifications to ignore-lists of anomaly detectors" into main
2023-10-06 20:33:52 +00:00
8265d04e0a
Merge "Fix NullPointerException in OverviewInputConsumer" into main
2023-10-06 20:30:39 +00:00
0754559171
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Iad07a789f62865e2a190dc47d41f2310a166f64c
2023-10-06 13:16:51 -07:00
50f8bed76f
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I188b2bc905489318760cbe5869deef836d2e04b2
2023-10-06 13:16:06 -07:00
4a926d3bfd
Null reference to activity as runnable back handler
...
Bug: 302551868
Change-Id: Ia21c5696ef58c113a8d038cb0f8dfef413d991de
2023-10-06 11:15:14 -07:00
75fae9b0b4
Next batch of modifications to ignore-lists of anomaly detectors
...
Bug: 286251603
Test: presubmit
Flag: N/A
Change-Id: Ic5eb0a7bfa95c5a3cd890582e7ddf3de2f2bda1c
2023-10-06 11:00:01 -07:00
96224ef755
Merge "Migrate Kotlin tests to use mockito-kotlin2." into main
2023-10-06 17:54:56 +00:00
b34296face
Merge "Making AsyncClockEventDelegate a singleton" into main
2023-10-06 16:58:41 +00:00
4a0a867dcc
Merge "Fix NullPointerException in RotationHelper" into main
2023-10-06 15:21:32 +00:00
Bill Yi
Android Build Coastguard Worker
Federico Baron
Sebastian Franco
Vadim Tryshev
Tracy Zhou
Andreas Agvard
Alex Chau
Jagrut Desai
Vinit Nayak
Jeremy Sim
Automerger Merge Worker
Xin Li
Winson Chung
Andy Wickham
Ats Jenk
Sunny Goyal
Brian Isganitis
Schneider Victor-tulias