Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 441cdeb0 authored by Andy Wickham's avatar Andy Wickham Committed by Android Build Coastguard Worker
Browse files

Differentiate between app row and shortcut icons. 

This is a simplified version of ag/20118087. It fixes the bug
with rows of shortcuts being in the search results (e.g. Gmail
and WhatsApp conversations), but it will not handle cases where
there are multiple rows of app icons. Currently I do not know of
any cases where that would happen.

Test: Manual with and without inject_web_top (which moves app row)
for WhatsApp and Gmail with AiAi fishfood.
Bug: 239927522

Change-Id: Ie9c62c0ee81086801942328c8770f37d5bf622c3
(cherry picked from commit 0d3c3d8f)
Merged-In: Ie9c62c0ee81086801942328c8770f37d5bf622c3
parent b1646165

src/com/android/launcher3/allapps/SearchTransitionController.java

+7 −1
Original line number Diff line number Diff line
@@ -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;

            }