aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-02-28 15:56:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

resolve merge conflicts of 6f725f283 to ub-launcher3-master

Browse Source 
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I3559969b62a9a4b1ec04697109636e8cb0fd9fc8
This commit is contained in:
Tony Wickham
2017-04-20 16:24:09 -07:00
parent 2feac00e2b 6f725f2831
commit 623daea93b
7 changed files with 115 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/com/android/launcher3/model/PackageUpdatedTask.java
View File

@@ -30,6 +30,7 @@ import com.android.launcher3.InstallShortcutReceiver;
import com.android.launcher3.ItemInfo;
import com.android.launcher3.LauncherAppState;
import com.android.launcher3.LauncherAppWidgetInfo;
import com.android.launcher3.LauncherModel;
import com.android.launcher3.LauncherModel.CallbackTask;
import com.android.launcher3.LauncherModel.Callbacks;
import com.android.launcher3.LauncherSettings;
@@ -44,6 +45,7 @@ import com.android.launcher3.util.FlagOp;
import com.android.launcher3.util.ItemInfoMatcher;
import com.android.launcher3.util.ManagedProfileHeuristic;
import com.android.launcher3.util.PackageManagerHelper;
import com.android.launcher3.util.PackageUserKey;
import java.util.ArrayList;
import java.util.Arrays;
@@ -370,6 +372,14 @@ public class PackageUpdatedTask extends ExtendedModelTask {
callbacks.notifyWidgetProvidersChanged();
}
});
} else if (Utilities.isAtLeastO() && mOp == OP_ADD) {
// Load widgets for the new package.
for (int i = 0; i < N; i++) {
LauncherModel model = app.getModel();
model.refreshAndBindWidgetsAndShortcuts(
model.getCallback(), false /* bindFirst */,
new PackageUserKey(packages[i], mUser) /* packageUser */);
}
}
}
}