diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/launcher2/LauncherModel.java | 4 | ||||
| -rw-r--r-- | src/com/android/launcher2/SearchDropTargetBar.java | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/com/android/launcher2/LauncherModel.java b/src/com/android/launcher2/LauncherModel.java index bc88a987d..fc1a26d4b 100644 --- a/src/com/android/launcher2/LauncherModel.java +++ b/src/com/android/launcher2/LauncherModel.java @@ -1089,7 +1089,9 @@ public class LauncherModel extends BroadcastReceiver { // App shortcuts that used to be automatically added to Launcher // didn't always have the correct intent flags set, so do that here - if (intent.getAction().equals(Intent.ACTION_MAIN) && + if (intent.getAction() != null && + intent.getCategories() != null && + intent.getAction().equals(Intent.ACTION_MAIN) && intent.getCategories().contains(Intent.CATEGORY_LAUNCHER)) { intent.addFlags( Intent.FLAG_ACTIVITY_NEW_TASK | diff --git a/src/com/android/launcher2/SearchDropTargetBar.java b/src/com/android/launcher2/SearchDropTargetBar.java index 5a1ba6904..153e3acc6 100644 --- a/src/com/android/launcher2/SearchDropTargetBar.java +++ b/src/com/android/launcher2/SearchDropTargetBar.java @@ -155,6 +155,7 @@ public class SearchDropTargetBar extends FrameLayout implements DragController.D } else { mQSBSearchBar.setVisibility(View.VISIBLE); mQSBSearchBar.setAlpha(1f); + mQSBSearchBar.setTranslationY(0); } mIsSearchBarHidden = false; } @@ -165,6 +166,7 @@ public class SearchDropTargetBar extends FrameLayout implements DragController.D } else { mQSBSearchBar.setVisibility(View.INVISIBLE); mQSBSearchBar.setAlpha(0f); + mQSBSearchBar.setTranslationY(0); } mIsSearchBarHidden = true; } |