MrSluffy
32700b0100
Merge branch 'android14-release' into 14-dev
2023-12-13 18:47:55 +08:00
MrSluffy
19bf26dd5a
Merge branch 'aosp-13' into 13-wip
2023-10-21 09:52:01 +08:00
Colin Cross
7b5878e03e
Fix kotlin nullable errors in Launcher3
...
Fix kotlin nullable errors that were exposed by setting the retention
of android.annotation.NonNull and android.annotation.Nullable to
class retention.
Bug: 294110802
Test: builds
Change-Id: I26edfec35dca14abe90b08e3c74de0446eda95d2
Merged-In: I26edfec35dca14abe90b08e3c74de0446eda95d2
2023-08-10 11:16:55 -07:00
TreeHugger Robot
a2b770b484
Merge "Allow grids to specify if we should start align taskbar in 3 button nav." into tm-qpr-dev am: 65ac592f40
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22361600
Change-Id: I71c7f33286ccfa770f87b812c8ec27fa4ecb25ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-05 22:06:49 +00:00
Jon Miranda
04f051045c
Allow grids to specify if we should start align taskbar in 3 button
...
nav.
Bug: 259712417
Test: check layout on tablet
check layout on multi_display devices
Change-Id: I282f51e5d76a30e9ad9d8c52d03d4853e965d65a
2023-04-05 10:29:51 -07:00
Sunny Goyal
e2d73bf57d
Merge "Removing unnecessary device sumaltion code" into tm-qpr-dev am: 08a13d6aae
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22432108
Change-Id: I883a06a1bf44f7f25928b1355637bd3a8b5d7bdc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-04 17:20:58 +00:00
Sunny Goyal
076e04bcc2
Removing unnecessary device sumaltion code
...
Bug: 276774148
Test: Verified on device
Change-Id: Icb8c2e7649e5b0e107af184b63f7e30f2df717bd
2023-04-03 12:38:52 -07:00
Schneider Victor-tulias
d8e5795131
Merge "Fix TwoPanelWorkspaceTests" into tm-qpr-dev am: 90259a6db4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22185922
Change-Id: I916c0e191cb2e335b9e393ea76c34cff39778481
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-30 16:47:04 +00:00
Schneider Victor-tulias
7cd0ae3f73
Fix TwoPanelWorkspaceTests
...
- Marking the hotseat long press edu as seen on setup to allow the popup menu to be shown immediately in tests
- Recording onWorkspaceItemLongClick on prediction item long click
Flag: not needed
Fixes: 273239675
Test: TwoPanelWorkspaceTest
Change-Id: I76354fd2e3adde11b2a428374fa9c8855ce2ece9
2023-03-27 14:24:35 -07:00
Schneider Victor-tulias
3bc74626d5
Merge "Add debug logs to help investigate view and activity leak test failures." into tm-qpr-dev am: afdf2f1020
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22163529
Change-Id: Id0a43dbfc13080b07f4ef9d60939f9ea3f6c1b66
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-27 17:47:14 +00:00
Schneider Victor-tulias
afdf2f1020
Merge "Add debug logs to help investigate view and activity leak test failures." into tm-qpr-dev
2023-03-27 17:22:02 +00:00
Hyunyoung Song
739dcca38a
Merge "Icon should not disappear on drag and drop" into tm-qpr-dev am: 7eae6a4ce1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22255567
Change-Id: Ied5d3740325666cc74f407fd0c9d8821bfa8be8e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-26 07:57:20 +00:00
Hyunyoung Song
7eae6a4ce1
Merge "Icon should not disappear on drag and drop" into tm-qpr-dev
2023-03-26 07:22:55 +00:00
hyunyoungs
825480fbcc
Icon should not disappear on drag and drop
...
Bug: 275009677
Test: BubbleTextViewTest
Change-Id: Iddff7a0130c9a0ddb76223064338459dbe9b52e8
2023-03-24 15:16:20 -07:00
Jon Miranda
3cd39729dc
Merge "Add taskbarIconSize to GridOption/DisplayOptions" into tm-qpr-dev am: 085c53869f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22228076
Change-Id: I687ea2a249e73036f8d4c4d187d999fd224b9f02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-24 22:02:13 +00:00
Jon Miranda
085c53869f
Merge "Add taskbarIconSize to GridOption/DisplayOptions" into tm-qpr-dev
2023-03-24 21:51:42 +00:00
Jon Miranda
9c478b6c29
Add taskbarIconSize to GridOption/DisplayOptions
...
- Renamed variables to make it more clear what they represent
- DeviceProfile will be source of truth for taskbar
sizes
Bug: 265144213
Test: phone, multi-display, tablet
Change-Id: Id9c19d15a65894fd7645e0f876a4b6527b713c34
Flag: ENABLE_TRANSIENT_TASKBAR=true
2023-03-24 12:29:11 -07:00
Vinit Nayak
cbc884e191
Merge "Log receiving broadcast for managed user unlocked" into tm-qpr-dev am: 4ed9562b37
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22238827
Change-Id: I9517d17659a5e650d91037f9f687b81ca5f193d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-24 18:55:40 +00:00
Vinit Nayak
4ed9562b37
Merge "Log receiving broadcast for managed user unlocked" into tm-qpr-dev
2023-03-24 18:25:51 +00:00
Vinit Nayak
d3925b662d
Log receiving broadcast for managed user unlocked
...
Bug: 243688989
Change-Id: I6f1b575a90e51ad1674154f60199ffef5004a224
2023-03-23 15:38:19 -07:00
Stefan Andonian
e78b57101d
Merge "Stop enabling the Boot Aware Launcher prefs code during Tests after running LauncherPref unit tests." into tm-qpr-dev am: acaecb6511
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22163308
Change-Id: I63c1ea9e14474d3b4fdd4cb6974246ce021a54df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-22 17:44:31 +00:00
Stefan Andonian
acaecb6511
Merge "Stop enabling the Boot Aware Launcher prefs code during Tests after running LauncherPref unit tests." into tm-qpr-dev
2023-03-22 17:17:57 +00:00
Schneider Victor-tulias
dc25fca903
Add debug logs to help investigate view and activity leak test failures.
...
Flag: not needed
Test: MemoryTests
Bug: 260260325
Change-Id: Ie9ed8e607c574e81696a4246f701534c18cf0b7c
2023-03-20 15:54:47 -07:00
Stefan Andonian
956b88e561
Stop enabling the Boot Aware Launcher prefs code during Tests after
...
running LauncherPref unit tests.
There is something in the LauncherPrefs code that interacts with the
boot aware shared preference data that is not compatible with the
Widgets.Reorder tests. A todo has been added to fix that before
releasing that feature. For now, implementing a simple fix to stop
enabling this feature for while doing post submit testing.
Bug: 271434610
Test: Used go/abdt to verify that this CL fixes the post submit tests.
They no longer fail like they did before this was pushed.
Change-Id: Id6bd94f5d0e0ee9afc2ccea3a4808cf723a4e688
2023-03-20 20:59:50 +00:00
Sunny Goyal
92e392d55b
Merge "Scale folder if it doesn't fit the screen" into tm-qpr-dev am: d2a34a2d54
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22139063
Change-Id: I9e77f805e0b3e198ef44a075f6176b9fcc8f6cd9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-20 20:27:54 +00:00
Sunny Goyal
d2a34a2d54
Merge "Scale folder if it doesn't fit the screen" into tm-qpr-dev
2023-03-20 20:01:52 +00:00
Thales Lima
7eee74b3f8
Scale folder if it doesn't fit the screen
...
Scale folder attrs if a full folder doesn't fit the screen width. This will make icons and text smaller than the workspace.
As a follow-up, another bug will be created to only scale full folders instead of all folders.
Bug: 271554689
Test: manually create a full folder, change the display size to large+
Change-Id: I47dc4bd4fe0c9eae989095fc1d179b81d350ef77
2023-03-17 14:13:04 -03:00
Jeremy Sim
7f61f22560
Merge "Revert "Revert "Create TAPL test suite for splitscreen""" into tm-qpr-dev am: 7b286a4f68
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22079982
Change-Id: I4b59606fe141dc2e08bbbc68f8fab42a35cec522
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-15 21:38:36 +00:00
Jeremy Sim
7b286a4f68
Merge "Revert "Revert "Create TAPL test suite for splitscreen""" into tm-qpr-dev
2023-03-15 21:08:24 +00:00
Vinit Nayak
e1a0fab43d
Merge "Add debug logs for WorkTabExists test" into tm-qpr-dev am: 51a864893b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21550343
Change-Id: I9c370088fc04039b7a6af7b9d2781a9eca0b3449
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-14 23:37:36 +00:00
Vinit Nayak
51a864893b
Merge "Add debug logs for WorkTabExists test" into tm-qpr-dev
2023-03-14 22:46:07 +00:00
Jeremy Sim
da75737d63
Revert "Revert "Create TAPL test suite for splitscreen""
...
This reverts commit 313a44039f .
Merging will reenable the TAPL suite TaplTestsSplitscreen.java, which was failing on phones due to a function call that only works on tablets.
Fixed by conditionally running the function only on tablet devices.
Fixes: 271852893
Test: Ran tests locally on phone and tablet.
Change-Id: If3e692924ed9c5ee113872e4f8ff0652890d1280
2023-03-14 15:36:32 -07:00
Vinit Nayak
7a68378fe4
Add debug logs for WorkTabExists test
...
Bug: 243688989
Change-Id: Iafec4cae86f1527acac9a25fceb501609ca308f6
2023-03-13 14:27:55 -07:00
Andrew Cole
ff70e24a50
Merge "Asking the test to wait for launcher to commit the uninstall transaction before opening all apps." into tm-qpr-dev am: f905365e5a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21961037
Change-Id: Id12ff32a78dc4a6b53578473b94af9e3dfd33184
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-13 21:27:06 +00:00
Andrew Cole
f905365e5a
Merge "Asking the test to wait for launcher to commit the uninstall transaction before opening all apps." into tm-qpr-dev
2023-03-13 20:51:38 +00:00
Andrew Cole
66e5c91380
Asking the test to wait for launcher to commit the uninstall transaction before opening all apps.
...
Bug: 258071914
Test: Run testUnintallFromAllApps
Change-Id: Iceba2650e24b06c162f42767955fa6ae3e3b19c8
2023-03-13 09:58:26 -07:00
Brandon Dayauon
888291b866
Merge "Clean up bubble text view test so that the feature flag is off at the end" into tm-qpr-dev am: c5677f824f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21964113
Change-Id: Iec943c917c17c789a04ae995bd55355d667ce09a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-11 02:45:24 +00:00
Brandon Dayauon
c5677f824f
Merge "Clean up bubble text view test so that the feature flag is off at the end" into tm-qpr-dev
2023-03-11 01:48:38 +00:00
Brandon Dayauon
7d10db66de
Clean up bubble text view test so that the feature flag is off at the end
...
- When running the test with feature flag is on, the TestLauncherApp is unable to be found when rerunning the failed TaplTests the bug states. I suspect this because the BubbleTextViewTest.java test is not properly torn down in the test environment which seems to be the case.
bug: 272798314
bug: 272797678
test: locally - able to repro when two line is on
Change-Id: I7379a5411de70f24804b404dbe5c7cf7f6769977
2023-03-10 15:51:28 -08:00
Sebastián Franco
b8614e298c
Merge "Making sure there is a propper Chrome icon for the test to long press" into tm-qpr-dev am: 4122868216
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21778872
Change-Id: I274f6eae4cda80ea45ee48328b6d2a5abfb1e648
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-10 19:47:55 +00:00
Sebastián Franco
4122868216
Merge "Making sure there is a propper Chrome icon for the test to long press" into tm-qpr-dev
2023-03-10 19:19:42 +00:00
Brandon Dayauon
e0bddb5b42
Merge "Support two line text in AllApps/OnDeviceSearch w/ feature flag" into tm-qpr-dev am: 5ddc6ab4da
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20898210
Change-Id: Ibf5cb36dc8e5ec0def0012b17b14e848a33d9d83
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-10 17:58:48 +00:00
Brandon Dayauon
cf88ea1e62
Support two line text in AllApps/OnDeviceSearch w/ feature flag
...
Made separate feature flag for on device search
Add unit test to test twoLine string
- Unit tests for testing newStringThatShouldSupportTwoLineText() in BubbleTextView.java. This class tests a couple of strings
and uses the getLineCount() to determine if the test passes. Verifying with getLineCount() is sufficient since BubbleTextView can only be in one line or two lines,
and this is enough to ensure whether the string should be specifically wrapped onto the second line and to ensure truncation.
bug: 201388851
test: presubmit, ran locally on big and small device, before: https://screenshot.googleplex.com/3Q6pwveFDZqxDXL (ORIGINAL TWO LINE TEXT)
after: https://screenshot.googleplex.com/7pkwUto6HGzMYoT
Change-Id: I93e6ed179e1081d5cdffc6db9c7ae34de8021c24
2023-03-09 15:13:04 -08:00
Sebastian Franco
239ae0a995
Making sure there is a propper Chrome icon for the test to long press
...
In some cases, the test was long pressing on a recommendation for
google chrome and not a regular chrome icon and the events didn't
match. I don't think is good to relly on chrome getting recommended
so I'm making sure there is always a chrome app icon on the hotseat
Fix: 269163620
Test: atest TaplTestsLauncher3:testWorkspace (run on pixel 7 pro)
Change-Id: Ic8ee744a9af18d60de9bbedd42043f5abbbd7356
2023-03-09 14:59:21 -08:00
TreeHugger Robot
9fbd4b9c4e
Merge "Revert "Create TAPL test suite for splitscreen"" into tm-qpr-dev am: 19c0877745
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21806280
Change-Id: I1c37aee0caa430161761f2bdddc89669be6f553c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-08 20:18:52 +00:00
TreeHugger Robot
19c0877745
Merge "Revert "Create TAPL test suite for splitscreen"" into tm-qpr-dev
2023-03-08 20:04:50 +00:00
Schneider Victor-tulias
f15fc66db2
Merge "Fix flaky RequestPinItemTests" into tm-qpr-dev am: bd98aef4a4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21733879
Change-Id: I3926c1f9862f7856ed2cb578af59afb9ec5d3da0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-07 23:52:38 +00:00
Schneider Victor-tulias
bd98aef4a4
Merge "Fix flaky RequestPinItemTests" into tm-qpr-dev
2023-03-07 23:36:10 +00:00
Brandon Dayauon
6a1f4f0ddb
Merge "Add logging to testDragAppIconToWorkspaceCell()" into tm-qpr-dev am: 9de1c05cbf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21532182
Change-Id: I01961910daa717ea911e1df8d4f0407882456cd5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-07 19:46:03 +00:00
Brandon Dayauon
9de1c05cbf
Merge "Add logging to testDragAppIconToWorkspaceCell()" into tm-qpr-dev
2023-03-07 19:37:44 +00:00