Do not reinflate/rebind widgets if we are going the rebind the full
workspace anyway.
Bug: 23820213
Bug: 24582781
Change-Id: I2cb4927916fed64a69100beb41ee14653ea1d70a
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 56c8d76..8d3b14c 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -1047,7 +1047,9 @@
// Consequently, the widgets will be inflated in the orientation of the foreground activity
// (framework issue). On resuming, we ensure that any widgets are inflated for the current
// orientation.
- getWorkspace().reinflateWidgetsIfNecessary();
+ if (!isWorkspaceLoading()) {
+ getWorkspace().reinflateWidgetsIfNecessary();
+ }
reinflateQSBIfNecessary();
if (DEBUG_RESUME_TIME) {