Fixing issue where search icons were only loaded after binding instead of at creation.
Change-Id: Id422966e3b6dc0aca9a7df942fb835349cae6525
diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index 9cea69b..039e76b 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/src/com/android/launcher2/Launcher.java
@@ -418,15 +418,12 @@
// If we have a saved version of these external icons, we load them up immediately
if (LauncherApplication.isScreenXLarge()) {
- if (sGlobalSearchIcon != null) {
- updateGlobalSearchIcon(sGlobalSearchIcon);
+ if (sGlobalSearchIcon == null || sVoiceSearchIcon == null || sAppMarketIcon == null) {
+ updateIconsAffectedByPackageManagerChanges();
}
- if (sVoiceSearchIcon != null) {
- updateVoiceSearchIcon(sVoiceSearchIcon);
- }
- if (sAppMarketIcon != null) {
- updateAppMarketIcon(sAppMarketIcon);
- }
+ updateGlobalSearchIcon(sGlobalSearchIcon);
+ updateVoiceSearchIcon(sVoiceSearchIcon);
+ updateAppMarketIcon(sAppMarketIcon);
}
}