diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2015-04-03 16:38:58 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-03 16:38:58 +0000 |
commit | ca139c7605ed5a18b59e1f7b09947d133127d415 (patch) | |
tree | f3aaea5d5797f3873e039e2c9f472faa5eaee378 /src/com/android/launcher3/Launcher.java | |
parent | 3c8d6644dbd969d5487812f078b0930a4fa2df87 (diff) | |
parent | adb75416488f04c237b724f30deeb7f6e3fe8a52 (diff) | |
download | android_packages_apps_Trebuchet-ca139c7605ed5a18b59e1f7b09947d133127d415.tar.gz android_packages_apps_Trebuchet-ca139c7605ed5a18b59e1f7b09947d133127d415.tar.bz2 android_packages_apps_Trebuchet-ca139c7605ed5a18b59e1f7b09947d133127d415.zip |
am adb75416: Merge "Reinflating QBS on resume, if the widget orientation is not same as launcher orientation" into ub-launcher3-burnaby
* commit 'adb75416488f04c237b724f30deeb7f6e3fe8a52':
Reinflating QBS on resume, if the widget orientation is not same as launcher orientation
Diffstat (limited to 'src/com/android/launcher3/Launcher.java')
-rw-r--r-- | src/com/android/launcher3/Launcher.java | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index 8a21d624c..c040d93f2 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -1047,6 +1047,7 @@ public class Launcher extends Activity // (framework issue). On resuming, we ensure that any widgets are inflated for the current // orientation. getWorkspace().reinflateWidgetsIfNecessary(); + reinflateQSBIfNecessary(); // Process any items that were added while Launcher was away. InstallShortcutReceiver.disableAndFlushInstallQueue(this); @@ -3505,6 +3506,15 @@ public class Launcher extends Activity return mQsb; } + private void reinflateQSBIfNecessary() { + if (mQsb instanceof LauncherAppWidgetHostView && + ((LauncherAppWidgetHostView) mQsb).isReinflateRequired()) { + mSearchDropTargetBar.removeView(mQsb); + mQsb = null; + mSearchDropTargetBar.setQsbSearchBar(getOrCreateQsbBar()); + } + } + @Override public boolean dispatchPopulateAccessibilityEvent(AccessibilityEvent event) { final boolean result = super.dispatchPopulateAccessibilityEvent(event); |