commit 57810aefa4709915d68eeefc26c99fc38c0d655d
author Hyunyoung Song <hyunyoungs@google.com> Tue Feb 08 10:23:41 2022 -0800
committer Hyunyoung Song <hyunyoungs@google.com> Tue Feb 08 10:25:21 2022 -0800
tree d999c70614612beba91aa5e767396408b27d402f
parent c1b94255cfc1687b2b9d2d0192603aaca8c847d5

Work folder name is only fetched from activity, not ActivityContext

Bug: 217872881
Test: builds
Change-Id: I36bc9c386772c20fce2d10bf1bfaad565046d38f

src/com/android/launcher3/folder/FolderNameProvider.java

diff --git a/src/com/android/launcher3/folder/FolderNameProvider.java b/src/com/android/launcher3/folder/FolderNameProvider.java
index 7793b16..2b621bd 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.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 @@
         Set<UserHandle> 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);
         }