Merge cherrypicks of [20119299] into tm-qpr1-release.
Change-Id: I2e5f8a7d63dc2f0a691b767c53357713d8fe2c45
diff --git a/src/com/android/launcher3/allapps/SearchTransitionController.java b/src/com/android/launcher3/allapps/SearchTransitionController.java
index a1f5bc6..11ceb0a 100644
--- a/src/com/android/launcher3/allapps/SearchTransitionController.java
+++ b/src/com/android/launcher3/allapps/SearchTransitionController.java
@@ -20,6 +20,7 @@
import static androidx.recyclerview.widget.RecyclerView.NO_POSITION;
+import static com.android.launcher3.LauncherSettings.Favorites.ITEM_TYPE_APPLICATION;
import static com.android.launcher3.anim.AnimatorListeners.forEndCallback;
import static com.android.launcher3.anim.AnimatorListeners.forSuccessCallback;
import static com.android.launcher3.anim.Interpolators.DEACCEL_1_7;
@@ -38,6 +39,7 @@
import com.android.launcher3.LauncherState;
import com.android.launcher3.R;
import com.android.launcher3.Utilities;
+import com.android.launcher3.model.data.ItemInfo;
/** Coordinates the transition between Search and A-Z in All Apps. */
public class SearchTransitionController {
@@ -186,7 +188,9 @@
top = searchResultView.getTop();
}
- if (searchResultView instanceof BubbleTextView) {
+ if (searchResultView instanceof BubbleTextView
+ && searchResultView.getTag() instanceof ItemInfo
+ && ((ItemInfo) searchResultView.getTag()).itemType == ITEM_TYPE_APPLICATION) {
// The first app icon will set appRowHeight, which will also contribute to
// totalHeight. Additional app icons should remove the appRowHeight to remain in
// the same row as the first app.
@@ -196,6 +200,8 @@
totalHeight += appRowHeight;
}
// Don't scale/fade app row.
+ searchResultView.setScaleY(1);
+ searchResultView.setAlpha(1);
continue;
}