summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher3
diff options
context:
space:
mode:
authorSunny Goyal <sunnygoyal@google.com>2015-10-05 10:36:54 -0700
committerSunny Goyal <sunnygoyal@google.com>2015-10-05 13:23:52 -0700
commitec88204389ffc0d5fdbe656c683d5844b9c8b49b (patch)
tree600fbc16dad05adc51ccb373d40b88d1c310040a /src/com/android/launcher3
parent44818e07af5312fac0c97360929c62e599cfd164 (diff)
downloadandroid_packages_apps_Trebuchet-ec88204389ffc0d5fdbe656c683d5844b9c8b49b.tar.gz
android_packages_apps_Trebuchet-ec88204389ffc0d5fdbe656c683d5844b9c8b49b.tar.bz2
android_packages_apps_Trebuchet-ec88204389ffc0d5fdbe656c683d5844b9c8b49b.zip
Update the widget spans after the provider changes
Bug: 24003213 Change-Id: I51ad5919a808ef10385d62a48a94589eefcb06bc
Diffstat (limited to 'src/com/android/launcher3')
-rw-r--r--src/com/android/launcher3/LauncherAppWidgetHost.java3
-rw-r--r--src/com/android/launcher3/LauncherAppWidgetProviderInfo.java2
-rw-r--r--src/com/android/launcher3/compat/PackageInstallerCompatVL.java4
3 files changed, 6 insertions, 3 deletions
diff --git a/src/com/android/launcher3/LauncherAppWidgetHost.java b/src/com/android/launcher3/LauncherAppWidgetHost.java
index 6c3a1e896..28c5eacdd 100644
--- a/src/com/android/launcher3/LauncherAppWidgetHost.java
+++ b/src/com/android/launcher3/LauncherAppWidgetHost.java
@@ -125,5 +125,8 @@ public class LauncherAppWidgetHost extends AppWidgetHost {
LauncherAppWidgetProviderInfo info = LauncherAppWidgetProviderInfo.fromProviderInfo(
mLauncher, appWidget);
super.onProviderChanged(appWidgetId, info);
+ // The super method updates the dimensions of the providerInfo. Update the
+ // launcher spans accordingly.
+ info.initSpans();
}
}
diff --git a/src/com/android/launcher3/LauncherAppWidgetProviderInfo.java b/src/com/android/launcher3/LauncherAppWidgetProviderInfo.java
index 71a08a853..28d805269 100644
--- a/src/com/android/launcher3/LauncherAppWidgetProviderInfo.java
+++ b/src/com/android/launcher3/LauncherAppWidgetProviderInfo.java
@@ -59,7 +59,7 @@ public class LauncherAppWidgetProviderInfo extends AppWidgetProviderInfo {
initSpans();
}
- private void initSpans() {
+ public void initSpans() {
LauncherAppState app = LauncherAppState.getInstance();
InvariantDeviceProfile idp = app.getInvariantDeviceProfile();
diff --git a/src/com/android/launcher3/compat/PackageInstallerCompatVL.java b/src/com/android/launcher3/compat/PackageInstallerCompatVL.java
index 3ad51017d..6424e0379 100644
--- a/src/com/android/launcher3/compat/PackageInstallerCompatVL.java
+++ b/src/com/android/launcher3/compat/PackageInstallerCompatVL.java
@@ -107,7 +107,7 @@ public class PackageInstallerCompatVL extends PackageInstallerCompat {
@Override
public void onProgressChanged(int sessionId, float progress) {
SessionInfo session = mInstaller.getSessionInfo(sessionId);
- if (session != null) {
+ if (session != null && session.getAppPackageName() != null) {
sendUpdate(new PackageInstallInfo(session.getAppPackageName(),
STATUS_INSTALLING,
(int) (session.getProgress() * 100)));
@@ -124,7 +124,7 @@ public class PackageInstallerCompatVL extends PackageInstallerCompat {
private void pushSessionDisplayToLauncher(int sessionId) {
SessionInfo session = mInstaller.getSessionInfo(sessionId);
- if (session != null) {
+ if (session != null && session.getAppPackageName() != null) {
addSessionInfoToCahce(session, UserHandleCompat.myUserHandle());
LauncherAppState app = LauncherAppState.getInstanceNoCreate();