From 9d8ee9ea0196dd6dc6947dbee9e88742b7ae560e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20=C4=8C=C3=AD=C5=BEek?= Date: Wed, 30 Sep 2015 12:38:42 +0200 Subject: fix NPE when dragging icon to desktop, when QuickSearchBox is missing Change-Id: I82003c814a0f685d3d7781c79b6725cb49ec6530 --- src/com/android/launcher3/SearchDropTargetBar.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/com/android/launcher3') diff --git a/src/com/android/launcher3/SearchDropTargetBar.java b/src/com/android/launcher3/SearchDropTargetBar.java index 38daadd8a..66a85188e 100644 --- a/src/com/android/launcher3/SearchDropTargetBar.java +++ b/src/com/android/launcher3/SearchDropTargetBar.java @@ -217,7 +217,8 @@ public class SearchDropTargetBar extends FrameLayout implements DragController.D // Animate out the QSB search bar, and animate in the drop target bar prepareStartAnimation(mDropTargetBar); mDropTargetBarAnim.start(); - if (!isAnyFolderOpen() && (!mIsSearchBarHidden || mQSBSearchBar.getAlpha() > 0f)) { + if (!isAnyFolderOpen() && (!mIsSearchBarHidden || + (mQSBSearchBar != null && mQSBSearchBar.getAlpha() > 0f))) { prepareStartAnimation(mQSBSearchBar); mQSBSearchBarAnim.start(); } @@ -240,7 +241,8 @@ public class SearchDropTargetBar extends FrameLayout implements DragController.D // Restore the QSB search bar, and animate out the drop target bar prepareStartAnimation(mDropTargetBar); mDropTargetBarAnim.reverse(); - if (!isAnyFolderOpen() && (!mIsSearchBarHidden || mQSBSearchBar.getAlpha() < 1f)) { + if (!isAnyFolderOpen() && (!mIsSearchBarHidden || + (mQSBSearchBar != null && mQSBSearchBar.getAlpha() < 1f))) { if (mLauncher != null && mLauncher.shouldShowSearchBar() && mQSBSearchBar.getVisibility() != View.VISIBLE) { mQSBSearchBar.setVisibility(View.VISIBLE); -- cgit v1.2.3