diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-10-10 23:01:50 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-10-10 23:01:50 +0000 |
commit | 0385aa48f8623ef1c38b065dc0016fc6d66296b3 (patch) | |
tree | cb42fdce54a33e8d6e53d54b2772d6a95bbc047e | |
parent | b1646165fe9a811b25cb2dfce67d682dda40305c (diff) | |
parent | 441cdeb0824da44cb507595098dd563f89c21ef8 (diff) | |
download | Launcher3-android13-qpr1-s6-release.tar.gz |
Merge cherrypicks of [20119299] into tm-qpr1-release.android-13.0.0_r30android-13.0.0_r29android-13.0.0_r28android-13.0.0_r27android-13.0.0_r24android-13.0.0_r23android-13.0.0_r22android-13.0.0_r21android-13.0.0_r20android-13.0.0_r19android-13.0.0_r18android-13.0.0_r17android-13.0.0_r16android13-qpr1-s8-releaseandroid13-qpr1-s7-releaseandroid13-qpr1-s6-releaseandroid13-qpr1-s5-releaseandroid13-qpr1-s4-releaseandroid13-qpr1-s3-releaseandroid13-qpr1-s2-releaseandroid13-qpr1-s1-releaseandroid13-qpr1-release
Change-Id: I2e5f8a7d63dc2f0a691b767c53357713d8fe2c45
-rw-r--r-- | src/com/android/launcher3/allapps/SearchTransitionController.java | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/com/android/launcher3/allapps/SearchTransitionController.java b/src/com/android/launcher3/allapps/SearchTransitionController.java index a1f5bc696f..11ceb0a55c 100644 --- a/src/com/android/launcher3/allapps/SearchTransitionController.java +++ b/src/com/android/launcher3/allapps/SearchTransitionController.java @@ -20,6 +20,7 @@ import static android.view.View.VISIBLE; 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.Launcher; 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 @@ public class SearchTransitionController { 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 @@ public class SearchTransitionController { totalHeight += appRowHeight; } // Don't scale/fade app row. + searchResultView.setScaleY(1); + searchResultView.setAlpha(1); continue; } |