Fixing issue where search icons were only loaded after binding instead of at creation.

Change-Id: Id422966e3b6dc0aca9a7df942fb835349cae6525

1 files changed, 5 insertions, 8 deletions

diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index 9cea69b49..039e76bae 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/src/com/android/launcher2/Launcher.java
@@ -418,15 +418,12 @@ public final class Launcher extends Activity
 
         // If we have a saved version of these external icons, we load them up immediately
         if (LauncherApplication.isScreenXLarge()) {
-            if (sGlobalSearchIcon != null) {
-                updateGlobalSearchIcon(sGlobalSearchIcon);
-            }
-            if (sVoiceSearchIcon != null) {
-                updateVoiceSearchIcon(sVoiceSearchIcon);
-            }
-            if (sAppMarketIcon != null) {
-                updateAppMarketIcon(sAppMarketIcon);
+            if (sGlobalSearchIcon == null || sVoiceSearchIcon == null || sAppMarketIcon == null) {
+                updateIconsAffectedByPackageManagerChanges();
             }
+            updateGlobalSearchIcon(sGlobalSearchIcon);
+            updateVoiceSearchIcon(sVoiceSearchIcon);
+            updateAppMarketIcon(sAppMarketIcon);
         }
     }