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

Work folder name is only fetched from activity, not ActivityContext

Browse Source 
Bug: 217872881
Test: builds
Change-Id: I36bc9c386772c20fce2d10bf1bfaad565046d38f
(cherry picked from commit 57810aefa4)
Merged-In:I36bc9c386772c20fce2d10bf1bfaad565046d38f
This commit is contained in:
Hyunyoung Song
2022-02-08 10:23:41 -08:00
committed by Android Build Coastguard Worker
parent 1e11c35368
commit 74fe0425af
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/launcher3/folder/FolderNameProvider.java
+1 -5
View File
@@ -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<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);
}