From 74fe0425af6c7cb0c0baa4e9201aa61106710dff Mon Sep 17 00:00:00 2001 From: Hyunyoung Song Date: Tue, 8 Feb 2022 10:23:41 -0800 Subject: [PATCH] Work folder name is only fetched from activity, not ActivityContext Bug: 217872881 Test: builds Change-Id: I36bc9c386772c20fce2d10bf1bfaad565046d38f (cherry picked from commit 57810aefa4709915d68eeefc26c99fc38c0d655d) Merged-In:I36bc9c386772c20fce2d10bf1bfaad565046d38f --- src/com/android/launcher3/folder/FolderNameProvider.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/com/android/launcher3/folder/FolderNameProvider.java b/src/com/android/launcher3/folder/FolderNameProvider.java index 7793b16807..2b621bd58b 100644 --- a/src/com/android/launcher3/folder/FolderNameProvider.java +++ b/src/com/android/launcher3/folder/FolderNameProvider.java @@ -27,14 +27,12 @@ import com.android.launcher3.R; import com.android.launcher3.model.AllAppsList; import com.android.launcher3.model.BaseModelUpdateTask; import com.android.launcher3.model.BgDataModel; -import com.android.launcher3.model.StringCache; import com.android.launcher3.model.data.AppInfo; import com.android.launcher3.model.data.FolderInfo; import com.android.launcher3.model.data.WorkspaceItemInfo; import com.android.launcher3.util.IntSparseArrayMap; import com.android.launcher3.util.Preconditions; import com.android.launcher3.util.ResourceBasedOverride; -import com.android.launcher3.views.ActivityContext; import java.util.ArrayList; import java.util.Arrays; @@ -109,9 +107,7 @@ public class FolderNameProvider implements ResourceBasedOverride { Set users = workspaceItemInfos.stream().map(w -> w.user) .collect(Collectors.toSet()); if (users.size() == 1 && !users.contains(Process.myUserHandle())) { - StringCache cache = ActivityContext.lookupContext(context).getStringCache(); - String workFolderName = cache != null - ? cache.workFolderName : context.getString(R.string.work_folder_name); + String workFolderName = context.getString(R.string.work_folder_name); setAsLastSuggestion(nameInfos, workFolderName); }