Commit Graph

620 Commits

Author SHA1 Message Date
Kholoud Mohamed 0e2b622014 Merge "update enterprise strings on ACTION_DEVICE_POLICY_RESOURCE_UPDATED" into tm-dev 2022-05-09 14:57:40 +00:00
kholoud mohamed d5a4d60483 update enterprise strings on ACTION_DEVICE_POLICY_RESOURCE_UPDATED
Also updated work folder name provider to retrieve it from dpm

Bug: 218322904
Test: manual
Change-Id: Id80a9e90806f3a07f132b5cc1e9871bb35df42b0
2022-05-09 10:01:10 +01:00
Alex Chau 664c1c18e7 Sort hotseat items in migration to preserve position
Fix: 231601760
Test: manual with local backup/restore
Change-Id: Ie89f0134485296c3cd252cf6b86bb3f88a0f90de
2022-05-06 15:47:11 +01:00
Sunny Goyal 32084d49d3 Replacing ItemInfoMatcher with predicate
This removed unnecessary componentName lookups when it
is not required. Many checks just rely on IDs and
userHandle

Bug: 231153610
Test: Presubmit
Change-Id: Ief93954abc5861062a9f55dc2ef181d3de106c62
2022-05-03 10:07:22 -07:00
Shikha Malhotra 2e255ed0ac Merge "Refactor code to be used in LauncherLily features" into tm-dev 2022-04-21 07:50:32 +00:00
Shikha Malhotra e957b600d3 Refactor code to be used in LauncherLily features
Refactor add to workspace code to be used in Lily Launcher.
Also utilising code swap feature to swap out functionality of sorting
items on workspaces and finding next vacant space.

Bug: b/218186705
Test: Manually tested Launcher3 works.
Change-Id: I42a44eabeb307e1d23ef333e0a169437f9062bb6
2022-04-20 07:22:20 +00:00
Sunny Goyal 645af0a6b3 Revert "fix broken build on erorrprone"
Revert submission 17730702-fixErrorProneBuild

Reason for revert: Breaks Launcher3 unbundled build by using hidden library in main Launcher code
Reverted Changes:
Id0ce4d308:Change version checks to use SdkLevel.isAtLeast*
I8fc801b00:fix broken build on erorrprone

Change-Id: Ib1cd50a746bad3b6fb9fbd455a7cdce30f341d8b
2022-04-14 16:54:07 -07:00
Sihua Ma da8759ae29 Showing alert dialog when shortcut version higher than the App
Creating an AlertDialog when the disabled reason of the shortcut is DISABLED_REASON_VERSION_LOWER, which happens when the backed-up shortcut was created from an application that has a version higher than the one installed on the device. The AlertDialog will direct the user to the play store and update the application.

Test: Manual
Fix: 224796975
Change-Id: I0125fada60b48176775de6782ba03ee6790904aa
2022-04-14 01:34:44 -07:00
Andras Kloczl 68e1af2bc2 Separate workspace item finding logic
Extract the item finding logic from AddWorkspaceItemsTask
to a separate class and write tests.

Test: AddWorkspaceItemsTaskTest.kt , WorkspaceItemSpaceFinderTest.kt
Bug: 199160559
Change-Id: Ie1bc4fcd4f94cd7cb0601c21bbdf273452b9dd1f
2022-03-29 13:31:31 +01:00
TreeHugger Robot f8137e5ecb Merge "Fix overriden deep shortcut titles and icons" into tm-dev 2022-03-21 20:56:13 +00:00
kholoud mohamed af6641414c RESTRICT AUTOMERGE Fix newAPI lint error
Fixes: 225612636
Test: m -j out/soong/.intermediates/packages/apps/Launcher3/Launcher3/android_common/lint/lint-report.txt
Change-Id: Ib7f7df0010702b0f26d99bbd7b27ee38a6ed5e17
2022-03-21 10:50:29 +00:00
Kholoud Mohamed ac0574781c Merge "RESTRICT AUTOMERGE Moved enteprise resource updatability to Launcher3" into tm-dev 2022-03-19 06:30:09 +00:00
Schneider Victor-tulias c8c761621b Fix overriden deep shortcut titles and icons
Bulk Icon loading causes all icons that share a component name to share a title and bitmap. This didn't work for deep shortcuts since they were already being loaded individually. Added a check to filter out deep shortcuts.

Note: If future traces show that individual deep shortcut loading is taking too long, then deep shortcut loading can be refactored into bulk icon loading.

Fixes: 224891898
Test: manual
Change-Id: I112fcd4a889071e5b523d56731bad8ecdee08abc
2022-03-18 17:50:22 +00:00
kholoud mohamed e210b47c20 RESTRICT AUTOMERGE Moved enteprise resource updatability to Launcher3
Bug: 217388602
Bug: 218875965
Test: atest EnterpriseResourcesTests
Test: manual
Change-Id: I095a1da30766e4b4eab33f42b034601b3322eb3d
2022-03-15 17:24:04 +00:00
Alex Chau d5859e80d7 Change grid migration to start from top to bottom
Fix: 222236363
Test: GridSizeMigrationTaskV2Test
Test: 4x4 -> 4x5/5x5 migration, 5x5 -> 4x5/4x4 migration
Change-Id: Id5d87b5d0bf9d7cc9154de81dd5edfb0ca9fa633
2022-03-15 17:21:24 +00:00
Alex Chau fe9a07bb96 Pass in dbFile from idpGridState for grid migration
- IDP can get re-initializeed during grid migration task, causing src/dest dbFile to be the same when prepareForMigration, which fails the migration and causes a wipe
- The fix is to cache IDP state as DeviceGridState, and use DeviceGridState to determine migration, trigger migration and save configuration after migration
- This should avoid migration failure in b/198965093 that causes homescreen wipe. Homescreen icon may still be messed up by the migration, but won't completely disappear

Bug: 198965093
Fix: 223579388
Test: manually trigger grid migration
Change-Id: I9890a6d5d530ff87aed8f601ec7d35a672b7cd46
2022-03-09 14:52:17 +00:00
Thiru Ramasamy d7af3cc784 Add support for logging multiple attributes per item.
This change will make use of new attributes field in LauncherAtoms to log multiple item attributes by converting them int array and then writes proto bytes into statsd.

Test: wwdebug && wwlogcat http://gpaste/5985977337118720
Change-Id: Iabda0b14100558f5625d01ba829d3ad96a6419fc
2022-03-04 08:40:44 -08:00
Thales Lima bfb275bf21 Merge "Create new logic for grid migration" into tm-dev 2022-02-23 18:07:06 +00:00
Thales Lima 0a7ff8780f Create new logic for grid migration
Fixes 217564863
Test: manual, changing grids from Wallpaper & Style and checking against spec

Change-Id: I94cf77111b37810282527f1a212b6e4126d3eba1
2022-02-23 15:20:50 +00:00
kholoud mohamed 9b38947b32 Fix crash when loading string cache
Crash was caused by a null context in ModelDelegate

Fixes: 218305827
Test: manual
Change-Id: I1b046e24427dbdc6752ac100f488c428838ac31f
2022-02-21 11:29:24 +00:00
Jon Miranda 701774d021 Add debug logs for testPromiseIcon_addedFromEligibleSession
Bug: 202985412
Test: PromiseIconUiTest
Change-Id: I160b9229bebe07015575f8184ac2d53bcbf2bad0
2022-02-10 17:26:11 -08:00
Jon Miranda 14568de2ae Merge "Avoid sending FirstScreenBroadcast if there is nothing to send." 2022-01-31 23:48:24 +00:00
TreeHugger Robot 65ffe19260 Merge "Allow overriding enterprise related strings in Launcher" 2022-01-28 18:52:43 +00:00
kholoud mohamed c76b2035aa Allow overriding enterprise related strings in Launcher
Test: manual
Bug: 188414133
Bug: 211422509
Bug: 188410712
Change-Id: I75858cdcf2057e7c270da5893cd9a90c6753f182
2022-01-28 16:33:03 +00:00
Andy Wickham 8e3131898f Merge "Utilities.trim never returns null." 2022-01-28 00:35:50 +00:00
TreeHugger Robot d7757f5aed Merge "Enable bulk icon loading on master" 2022-01-26 09:04:40 +00:00
Jon Miranda 5a8b62b38f Avoid sending FirstScreenBroadcast if there is nothing to send.
Bug: 216389279
Test: manual
Change-Id: I1c30f02cbb287c25a140cb4801d6b66b07cec3a7
2022-01-25 18:06:10 -08:00
Schneider Victor-tulias 1702a0ea90 Enable bulk icon loading on master
Bug: 195674813
Test: none
Change-Id: I01fb4b77e652b2fd71e8a7a0edf5ddbe024f9d48
2022-01-25 13:03:37 -08:00
Sunny Goyal 7dece749a3 Updating logic to check if icon needs badging
Bug: 209503720
Test: Manual
Change-Id: I66f0dbaf81be3190a106323fe3ce87717626d8e7
2022-01-19 17:22:46 +05:30
Andy Wickham 56be73be80 Utilities.trim never returns null.
This fixes a crash loop I was seeing on my device and also
preemptively fixes similar NullPointerExceptions.

Bug: 213931730
Test: Manually verified crash loop stopped with this change.
Change-Id: I8d2fc8475d42ac60b7fdc9219421a8c9733c7b9f
2022-01-18 09:13:43 -08:00
Alex Chau e09067c2f4 Allow items to be added alongside smartspace
- Allow icons to be added to first row where search container does not occupy
- On upgrade, clean up first row of screen 0 which may have junk data, as we used to assume first forw of screen 0 is always occupied

Bug: 210127246
Test: manual
Change-Id: I835a321964984e02632c8a70474a6551b5e360f7
2022-01-10 18:24:15 +00:00
Alex Chau f3dbb049dc Add 6 col grid to UIEvents
Bug: 210118169
Test: manual
Change-Id: I811c970ba41641a0abfae0d0a395a6b31a9da5dd
2022-01-06 14:53:51 +00:00
TreeHugger Robot 61da68ed8c Merge "Set default value for rank field in launcher logs to ItemInfo.rank." into sc-v2-dev am: ed6cbbc9a6 am: 67daf300e2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16360368

Change-Id: I9deab9ebbb33ac8ed8f6708120416679cb0f2647
2021-12-13 19:39:44 +00:00
TreeHugger Robot ed6cbbc9a6 Merge "Set default value for rank field in launcher logs to ItemInfo.rank." into sc-v2-dev 2021-12-13 18:48:09 +00:00
TreeHugger Robot 890bfc8914 Merge "Allow restore across form factors" into sc-v2-dev am: 5599b02141 am: 7f4adf679e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16440220

Change-Id: Ic4b2b4cb76e646ed750b5a9bccbf14b07310f59a
2021-12-11 00:50:38 +00:00
Alex Chau ab26c62c4a Allow restore across form factors
- Removed deviceTypeCompatible check and allow restore across for mfactors
- In AOSP default device_profile, mark 3x3, 4x4, and 5x5 as phone only. On tablets they'll reflow to 6x5.

Bug: 198575341
Bug: 210129187
Test: Only 3x3, 4x4 and 5x5 are enabled on phone
Test: Only 6x5 is enabled on tablet
Test: Phone backup of 4x4 get restored and reflow to 6x5 on tablet
Change-Id: I36a641d47fcee86ace0fea3d9194d61d12517f13
2021-12-10 22:00:49 +00:00
TreeHugger Robot 2636a5d5b2 Merge "Add launcher grid spec for tablet" into sc-v2-dev am: b1ae1ca124 am: 287d976c91
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16371727

Change-Id: I609dbebde278dfb335a5a66c6bd71fcfa62a3102
2021-12-08 23:30:14 +00:00
Alex Chau 1c883d861e Add launcher grid spec for tablet
- Introduced device_category to allow grids to be only enabled for certain device types. By default grids are enabled for all device types, so old OEM device_profiles aren't affected
  - Removed device_profiles_split.xml as a result and merged with device_profiles.xml
- Added deviceType in InvariantDeviceProfile to replace isSplitDisplay and centralize the logic
- Only has 6x5 grid with new default layout that works better for tablets

Bug: 198575341
Test: manual
Change-Id: I03f6727ce837ffeee6321b6d7c53942338d0cf30
2021-12-08 18:22:34 +00:00
Brian Isganitis 79efba935f Adding support for logging wallpaper container info.
Test: https://paste.googleplex.com/5350571797118976 shows logging carousel size and index of wallpaper tapped. If the wallpaper is a live wallpaper, we also log its application info.
Bug: 188222480
Change-Id: I6dd7ac20af7afd675d8a886d5b838263680f773e
Merged-In: I6dd7ac20af7afd675d8a886d5b838263680f773e
2021-12-08 00:22:59 +00:00
Brian Isganitis 111a5c5df5 Adding support for logging wallpaper container info.
Test: https://paste.googleplex.com/5350571797118976 shows logging carousel size and index of wallpaper tapped. If the wallpaper is a live wallpaper, we also log its application info.
Bug: 188222480
Change-Id: I6dd7ac20af7afd675d8a886d5b838263680f773e
2021-12-06 18:37:07 +00:00
Sunny Goyal 331e6e94f9 Merge "Updating icon badging logic" 2021-12-03 02:14:42 +00:00
Sunny Goyal d872a97bd0 Updating icon badging logic
Bug: 201682172
Test: Manual
Change-Id: I57421b0c77e12f1cd464e532d2a1383c2cf93981
2021-12-02 22:14:25 +00:00
Schneider Victor-tulias c817dac4cd Merge ag/16307859 into master without bug fix.
- Copied ag/16307859, with a modification to QuickstepModelDelegate#getContainer. This allows the crash from b/173838775 to continue occuring with additional debuging logs.

Bug: 173838775
Test: manual
Change-Id: Ic96a25665457c80f5c9ab45a896fada34a3a68ff
2021-11-30 12:08:23 -08:00
Thiru Ramasamy 24fbda5448 Set default value for rank field in launcher logs to ItemInfo.rank.
Bug: 188222480
Test: wwdebug & wwlogcat
Change-Id: I16786eb2e6f1d4ce44dbda5eff27b1cd7f50ee8e
2021-11-29 16:14:02 -08:00
Schneider Victor-tulias 8664cb1261 Revert "Fix ClassCastException in QuickstepModelDelegate"
This reverts commit 380f8fd890.

Reason for revert: remove bug fix on master

Bug: 173838775
Change-Id: I3cbb3e383c52095a10b3e22ea4c586c0c3c8d7a9
2021-11-29 22:34:04 +00:00
TreeHugger Robot 32ebd9f94f Merge "Fix ClassCastException in QuickstepModelDelegate" into sc-v2-dev 2021-11-25 04:00:37 +00:00
Schneider Victor-tulias 380f8fd890 Fix ClassCastException in QuickstepModelDelegate
- Added a casting check as an immediate fix to b/173838775
- Added logging to help debug the corrupt state where an item of type other than FolderInfo is used as an other item's container.
- Added LoaderMemoryLogger for adding large logs that are only conditionally printed.

Bug: 173838775
Test: manually checked logs
Change-Id: I9491cb421b9fb807d5fb110b04ad069481de768f
2021-11-24 14:26:45 -08:00
Andras Kloczl 953eb8041e Fix LauncherProvider newScreenId issue
Remove maxScreenId from LauncherProvider and whenever we need
a new screenId, query the database to calculate a new screenId.
Also converted and refactored AddWorkspaceItemsTaskTest
and added some extra test cases.

Test: manual & AddWorkspaceItemsTaskTest.kt
Bug: 199160559
Change-Id: I185f6823fed171d778af0130497f5ffaf89c0a70
2021-11-12 19:56:07 +00:00
Becky Qiu 1fc202867e [AA+ Search] Add logging for header search icon tapping events.
Logging example for the search icon tapping event: https://paste.googleplex.com/4809431536631808

Bug: 198507048
Test: tested with AiAi apk with search icon sent as child of header.
Change-Id: Ibbaec61b93c30a99ea2ffef8d7342490ba37335d
2021-11-09 16:50:47 -08:00
Alina Zaidi 08c3e8f526 Use equals() to compare UserHandle when building LauncherAtom#ItemInfo.
Bug: 204756057
Test: Manually verified correct behave through logs
Change-Id: Ic314e38978893984bac89988bfc3229a21d0214e
2021-11-02 14:10:37 +00:00