Fix bugs with dragging items out of folders
A folder of one item wasn't converted to a single
item - this fixes that regression
It was also possible, in some rare cases, that the
Folder cleanup code never ran after uninstalling
an app
Change-Id: Iee2490ed95d4f4a243b6f93411397a397aef7ae1
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index fa96279..b1fbd75 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -802,6 +802,12 @@
(System.currentTimeMillis() - startTimeCallbacks));
}
}
+ if (mOnResumeCallbacks.size() > 0) {
+ for (int i = 0; i < mOnResumeCallbacks.size(); i++) {
+ mOnResumeCallbacks.get(i).run();
+ }
+ mOnResumeCallbacks.clear();
+ }
// Reset the pressed state of icons that were locked in the press state while activities
// were launching
@@ -3438,11 +3444,11 @@
}
public void addOnResumeCallback(Runnable run) {
- mBindOnResumeCallbacks.add(run);
+ mOnResumeCallbacks.add(run);
}
public void removeOnResumeCallback(Runnable run) {
- mBindOnResumeCallbacks.remove(run);
+ mOnResumeCallbacks.remove(run);
}
/**