PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move FolderNameProvider to dagger.

Browse Source 
Helps us to delete ResourceBasedOverride class.
Delete "folder_name_provider_class" resource from config.

Introduce FolderNameSuggestionLoader for easy dagger injection for
folderNameProvider.

Bug: 361850561
Test: Presubmit
Flag: EXEMPT dagger
Change-Id: I58a68cb4ce11331458a1cccef2e692f74c14ea53
This commit is contained in:
Anushree Ganjam
2025-04-18 23:07:01 +00:00
parent 77f22bf9cf
commit 41998110bd
9 changed files with 94 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/launcher3/folder/Folder.java
+4 -7
View File
@@ -92,6 +92,7 @@ import com.android.launcher3.accessibility.FolderAccessibilityHelper;
import com.android.launcher3.anim.KeyboardInsetAnimationCallback;
import com.android.launcher3.compat.AccessibilityManagerCompat;
import com.android.launcher3.config.FeatureFlags;
import com.android.launcher3.dagger.LauncherComponentProvider;
import com.android.launcher3.dragndrop.DragController.DragListener;
import com.android.launcher3.dragndrop.DragOptions;
import com.android.launcher3.graphics.ShapeDelegate;
@@ -106,7 +107,6 @@ import com.android.launcher3.model.data.WorkspaceItemFactory;
import com.android.launcher3.model.data.WorkspaceItemInfo;
import com.android.launcher3.pageindicators.PageIndicatorDots;
import com.android.launcher3.pageindicators.PaginationArrow;
import com.android.launcher3.util.Executors;
import com.android.launcher3.util.LauncherBindableItemsContainer;
import com.android.launcher3.util.Thunk;
import com.android.launcher3.views.ActivityContext;
@@ -1220,12 +1220,9 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo
mActivityContext.getModelWriter().moveItemsInDatabase(items, mInfo.id, 0);
}
if (!isBind && total > 1 /* no need to update if there's one icon */) {
Executors.MODEL_EXECUTOR.post(() -> {
FolderNameInfos nameInfos = new FolderNameInfos();
FolderNameProvider fnp = FolderNameProvider.newInstance(getContext());
fnp.getSuggestedFolderName(getContext(), mInfo.getAppContents(), nameInfos);
mInfo.suggestedFolderNames = nameInfos;
});
LauncherComponentProvider.get(getContext()).getFolderNameSuggestionLoader()
.getSuggestedFolderName(mInfo.getAppContents(),
folderNameInfos -> mInfo.suggestedFolderNames = folderNameInfos);
}
}