aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-02-27 23:36:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

When getting a widget provider by name, check all categories

Browse Source 
Some widgets have different categories for special cases for Pixel
widgets and because of that, some times we can't find the provider,
so we need to go through all of the categories.

Flag: NA
Test: Manaul testing =(
Test: All widgets in widget_section.xml with alsoKeepInApp set to false will previously dissapear on the preview.
Fix: 331628371
Change-Id: Iffbb788cbb27c79a215d06d21c9d623462d6f7e6
This commit is contained in:
Sebastian Franco
2024-04-14 17:05:44 -07:00
parent 2a6ce15290
commit 1f69351310
6 changed files with 40 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/com/android/launcher3/model/WidgetsModel.java
View File

@@ -18,6 +18,7 @@ import android.content.pm.PackageManager;
import android.os.UserHandle;
import android.util.Log;
import android.util.Pair;
import android.util.SparseArray;
import androidx.annotation.Nullable;
import androidx.collection.ArrayMap;
@@ -201,8 +202,16 @@ public class WidgetsModel {
// add and update.
mWidgetsList.putAll(rawWidgetsShortcuts.stream()
.filter(new WidgetValidityCheck(app))
.flatMap(widgetItem -> getPackageUserKeys(app.getContext(), widgetItem).stream()
.map(key -> new Pair<>(packageItemInfoCache.getOrCreate(key), widgetItem)))
.flatMap(
widgetItem -> getPackageUserKeys(app.getContext(), widgetItem)
.stream()
.map(
key -> new Pair<>(
packageItemInfoCache.getOrCreate(key),
widgetItem
)
)
)
.collect(groupingBy(pair -> pair.first, mapping(pair -> pair.second, toList()))));
// Update each package entry
@@ -240,19 +249,26 @@ public class WidgetsModel {
}
public WidgetItem getWidgetProviderInfoByProviderName(
ComponentName providerName, UserHandle user) {
ComponentName providerName, UserHandle user, Context context) {
SparseArray<WidgetSections.WidgetSection> sections = WidgetSections.get(
context);
if (!WIDGETS_ENABLED) {
return null;
}
List<WidgetItem> widgetsList = mWidgetsList.get(
new PackageItemInfo(providerName.getPackageName(), user));
if (widgetsList == null) {
return null;
}
for (WidgetItem item : widgetsList) {
if (item.componentName.equals(providerName)) {
return item;
// Checking if we hav ea provider in any of the categories.
for (int i = 0; i < sections.size(); i++) {
PackageItemInfo key = new PackageItemInfo(
providerName.getPackageName(),
sections.get(i).mCategory,
user
);
if (mWidgetsList.containsKey(key)) {
return mWidgetsList.get(key).stream().filter(
item -> item.componentName.equals(providerName)
)
.findFirst()
.orElse(null);
}
}
return null;
@@ -286,10 +302,12 @@ public class WidgetsModel {
categories.forEach(category -> {
if (category == NO_CATEGORY) {
packageUserKeys.add(
new PackageUserKey(item.componentName.getPackageName(),
item.user));
new PackageUserKey(item.componentName.getPackageName(), item.user)
);
} else {
packageUserKeys.add(new PackageUserKey(category, item.user));
packageUserKeys.add(
new PackageUserKey(item.componentName.getPackageName(), category, item.user)
);
}
});
return packageUserKeys;