| commit | 2d441b9d1a4629bbbad9fe8869c40fdf5f763a27 | [log] [tgz] |
|---|---|---|
| author | Michael Jurka <mikejurka@google.com> | Mon May 14 17:14:22 2012 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Mon May 14 17:14:22 2012 -0700 |
| tree | 47c94eb4d12158684bb87be6d446fd9c4cfdff10 | |
| parent | 45167ac5cd04eb055b288707f863f33725bb11ff [diff] | |
| parent | 920d7f433e5be7b928fe52312c2e65d278b13ee5 [diff] |
Merge "Preventing drawing pages in Workspace if possible" into jb-dev
diff --git a/res/drawable-hdpi/search_frame.9.png b/res/drawable-hdpi/search_frame.9.png index d0c78c4..7fbf24f 100644 --- a/res/drawable-hdpi/search_frame.9.png +++ b/res/drawable-hdpi/search_frame.9.png Binary files differ
diff --git a/res/drawable-mdpi/search_frame.9.png b/res/drawable-mdpi/search_frame.9.png index 7a0e46c..e6e048a 100644 --- a/res/drawable-mdpi/search_frame.9.png +++ b/res/drawable-mdpi/search_frame.9.png Binary files differ
diff --git a/res/drawable-xhdpi/search_frame.9.png b/res/drawable-xhdpi/search_frame.9.png index cb6f294..706b1d8 100644 --- a/res/drawable-xhdpi/search_frame.9.png +++ b/res/drawable-xhdpi/search_frame.9.png Binary files differ
diff --git a/src/com/android/launcher2/LauncherModel.java b/src/com/android/launcher2/LauncherModel.java index bc88a98..fc1a26d 100644 --- a/src/com/android/launcher2/LauncherModel.java +++ b/src/com/android/launcher2/LauncherModel.java
@@ -1089,7 +1089,9 @@ // 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 5a1ba69..153e3ac 100644 --- a/src/com/android/launcher2/SearchDropTargetBar.java +++ b/src/com/android/launcher2/SearchDropTargetBar.java
@@ -155,6 +155,7 @@ } else { mQSBSearchBar.setVisibility(View.VISIBLE); mQSBSearchBar.setAlpha(1f); + mQSBSearchBar.setTranslationY(0); } mIsSearchBarHidden = false; } @@ -165,6 +166,7 @@ } else { mQSBSearchBar.setVisibility(View.INVISIBLE); mQSBSearchBar.setAlpha(0f); + mQSBSearchBar.setTranslationY(0); } mIsSearchBarHidden = true; }
