diff options
author | Adam Cohen <adamcohen@google.com> | 2012-08-27 15:23:42 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-08-27 15:23:42 -0700 |
commit | 2b3396f9c0e88d1633e16483322d2c52cfc271f3 (patch) | |
tree | e734c0ee813f531c06af537da578c093d129e839 /src/com/android/launcher2 | |
parent | 1dc3b9abd5ab0a39bab7694669d6784b89d362ef (diff) | |
parent | adf0c180c1c0899f0a91ec91bcdc2002f90a56a5 (diff) | |
download | android_packages_apps_Trebuchet-2b3396f9c0e88d1633e16483322d2c52cfc271f3.tar.gz android_packages_apps_Trebuchet-2b3396f9c0e88d1633e16483322d2c52cfc271f3.tar.bz2 android_packages_apps_Trebuchet-2b3396f9c0e88d1633e16483322d2c52cfc271f3.zip |
Merge "Adding additional null checks for instances where the qsb is not defined. (Bug 6940769)" into jb-mr1-dev
Diffstat (limited to 'src/com/android/launcher2')
-rw-r--r-- | src/com/android/launcher2/Launcher.java | 41 |
1 files changed, 32 insertions, 9 deletions
diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java index d82753126..1e138f772 100644 --- a/src/com/android/launcher2/Launcher.java +++ b/src/com/android/launcher2/Launcher.java @@ -451,7 +451,9 @@ public final class Launcher extends Activity if (sAppMarketIcon[coi] != null) { updateAppMarketIcon(sAppMarketIcon[coi]); } - mSearchDropTargetBar.onSearchPackagesChanged(searchVisible, voiceVisible); + if (mSearchDropTargetBar != null) { + mSearchDropTargetBar.onSearchPackagesChanged(searchVisible, voiceVisible); + } } private void checkForLocaleChange() { @@ -1527,7 +1529,10 @@ public final class Launcher extends Activity appSearchData = new Bundle(); appSearchData.putString(Search.SOURCE, "launcher-search"); } - Rect sourceBounds = mSearchDropTargetBar.getSearchBarBounds(); + Rect sourceBounds = new Rect(); + if (mSearchDropTargetBar != null) { + sourceBounds = mSearchDropTargetBar.getSearchBarBounds(); + } startGlobalSearch(initialQuery, selectInitialQuery, appSearchData, sourceBounds); @@ -2515,7 +2520,9 @@ public final class Launcher extends Activity } // Hide the search bar - mSearchDropTargetBar.hideSearchBar(false); + if (mSearchDropTargetBar != null) { + mSearchDropTargetBar.hideSearchBar(false); + } } @Override @@ -2591,7 +2598,9 @@ public final class Launcher extends Activity hideDockDivider(); // Hide the search bar - mSearchDropTargetBar.hideSearchBar(false); + if (mSearchDropTargetBar != null) { + mSearchDropTargetBar.hideSearchBar(false); + } } dispatchOnLauncherTransitionPrepare(fromView, animated, false); dispatchOnLauncherTransitionStart(fromView, animated, false); @@ -2743,7 +2752,9 @@ public final class Launcher extends Activity // Show the search bar (only animate if we were showing the drop target bar in spring // loaded mode) - mSearchDropTargetBar.showSearchBar(wasInSpringLoadedMode); + if (mSearchDropTargetBar != null) { + mSearchDropTargetBar.showSearchBar(wasInSpringLoadedMode); + } // We only need to animate in the dock divider if we're going from spring loaded mode showDockDivider(animated && wasInSpringLoadedMode); @@ -2846,7 +2857,11 @@ public final class Launcher extends Activity mDividerAnimator = LauncherAnimUtils.createAnimatorSet(); mDividerAnimator.playTogether(LauncherAnimUtils.ofFloat(mQsbDivider, "alpha", 1f), LauncherAnimUtils.ofFloat(mDockDivider, "alpha", 1f)); - mDividerAnimator.setDuration(mSearchDropTargetBar.getTransitionInDuration()); + int duration = 0; + if (mSearchDropTargetBar != null) { + duration = mSearchDropTargetBar.getTransitionInDuration(); + } + mDividerAnimator.setDuration(duration); mDividerAnimator.start(); } } @@ -2867,7 +2882,10 @@ public final class Launcher extends Activity if (!LauncherApplication.isScreenLarge()) { if (animated) { if (mHotseat.getAlpha() != 1f) { - int duration = mSearchDropTargetBar.getTransitionInDuration(); + int duration = 0; + if (mSearchDropTargetBar != null) { + duration = mSearchDropTargetBar.getTransitionInDuration(); + } mHotseat.animate().alpha(1f).setDuration(duration); } } else { @@ -2883,7 +2901,10 @@ public final class Launcher extends Activity if (!LauncherApplication.isScreenLarge()) { if (animated) { if (mHotseat.getAlpha() != 0f) { - int duration = mSearchDropTargetBar.getTransitionOutDuration(); + int duration = 0; + if (mSearchDropTargetBar != null) { + duration = mSearchDropTargetBar.getTransitionOutDuration(); + } mHotseat.animate().alpha(0f).setDuration(duration); } } else { @@ -3474,7 +3495,9 @@ public final class Launcher extends Activity public void bindSearchablesChanged() { boolean searchVisible = updateGlobalSearchIcon(); boolean voiceVisible = updateVoiceSearchIcon(searchVisible); - mSearchDropTargetBar.onSearchPackagesChanged(searchVisible, voiceVisible); + if (mSearchDropTargetBar != null) { + mSearchDropTargetBar.onSearchPackagesChanged(searchVisible, voiceVisible); + } } /** |