From 6bec75fe70d700e4c8e9b0ddfacb132d49b8cc19 Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Thu, 1 Oct 2015 18:50:48 -0700
Subject: [PATCH] Do not reinflate/rebind widgets if we are going the rebind
 the full workspace anyway.

Bug: 23820213
Bug: 24582781
Change-Id: I2cb4927916fed64a69100beb41ee14653ea1d70a
---
 src/com/android/launcher3/Launcher.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 56c8d76cab..8d3b14cbb5 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -1047,7 +1047,9 @@ public class Launcher extends Activity
         // 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) {