summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdam Cohen <adamcohen@google.com>2012-06-04 17:39:58 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-06-04 17:39:58 -0700
commit0964ec26989827b4e4a948d9442df9de1e26b463 (patch)
tree4ba757fc599f7e3619f4243d47a4a1a94ef46fd4
parenta7d57335f2c66e170f949c2c4a6abac9ed2ae589 (diff)
parentf9426d5df0592a67c8a998d3ab445a3bb5eafc18 (diff)
downloadandroid_packages_apps_Trebuchet-0964ec26989827b4e4a948d9442df9de1e26b463.zip
android_packages_apps_Trebuchet-0964ec26989827b4e4a948d9442df9de1e26b463.tar.gz
android_packages_apps_Trebuchet-0964ec26989827b4e4a948d9442df9de1e26b463.tar.bz2
am f9426d5d: Fix issue where landscape asset was appearing in QSB (issue 6605638)
* commit 'f9426d5df0592a67c8a998d3ab445a3bb5eafc18': Fix issue where landscape asset was appearing in QSB (issue 6605638)
-rw-r--r--src/com/android/launcher2/Launcher.java14
1 files changed, 11 insertions, 3 deletions
diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index 3354d49..9cae5e5 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() {