From f9426d5df0592a67c8a998d3ab445a3bb5eafc18 Mon Sep 17 00:00:00 2001 From: Adam Cohen Date: Mon, 4 Jun 2012 17:26:21 -0700 Subject: Fix issue where landscape asset was appearing in QSB (issue 6605638) Change-Id: I6e66be228d2fa2d49f8cb191ab3f4d1a3dd66ef1 --- src/com/android/launcher2/Launcher.java | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java index 3354d49bd..9cae5e596 100644 --- a/src/com/android/launcher2/Launcher.java +++ b/src/com/android/launcher2/Launcher.java @@ -374,6 +374,13 @@ public final class Launcher extends Activity IntentFilter filter = new IntentFilter(Intent.ACTION_CLOSE_SYSTEM_DIALOGS); registerReceiver(mCloseSystemDialogsReceiver, filter); + updateGlobalIcons(); + + // On large interfaces, we want the screen to auto-rotate based on the current orientation + unlockScreenOrientation(true); + } + + private void updateGlobalIcons() { boolean searchVisible = false; boolean voiceVisible = false; // If we have a saved version of these external icons, we load them up immediately @@ -396,9 +403,6 @@ public final class Launcher extends Activity updateAppMarketIcon(sAppMarketIcon[coi]); } mSearchDropTargetBar.onSearchPackagesChanged(searchVisible, voiceVisible); - - // On large interfaces, we want the screen to auto-rotate based on the current orientation - unlockScreenOrientation(true); } private void checkForLocaleChange() { @@ -687,6 +691,10 @@ public final class Launcher extends Activity // (framework issue). On resuming, we ensure that any widgets are inflated for the current // orientation. reinflateWidgetsIfNecessary(); + + // Again, as with the above scenario, it's possible that one or more of the global icons + // were updated in the wrong orientation. + updateGlobalIcons(); } void reinflateWidgetsIfNecessary() { -- cgit v1.2.3