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

Commit 04dcce83 authored by Pat Manning's avatar Pat Manning
Browse files

Add flag guarding around setText in TaskView. 

Bug: 303266975
Test: Forrest runs & Crystalball performance metrics.
Flag: enableOverviewIconMenu
Change-Id: I79e325f9d3377bc078634232c53fd3587d05acc4
parent 879efc7b

quickstep/src/com/android/quickstep/views/GroupedTaskView.java

+6 −2
Original line number Diff line number Diff line
@@ -169,7 +169,9 @@ public class GroupedTaskView extends TaskView { 
                mIconLoadRequest2 = iconCache.updateIconInBackground(mSecondaryTask,

                        (task) -> {

                            setIcon(mIconView2, task.icon);

                            if (enableOverviewIconMenu()) {

                                setText(mIconView2, TaskUtils.getTitle(getContext(), task));

                            }

                            mDigitalWellBeingToast2.initialize(mSecondaryTask);

                            mDigitalWellBeingToast2.setSplitConfiguration(mSplitBoundsConfig);

                            mDigitalWellBeingToast.setSplitConfiguration(mSplitBoundsConfig);
@@ -184,10 +186,12 @@ public class GroupedTaskView extends TaskView { 
            }

            if (needsUpdate(changes, FLAG_UPDATE_ICON)) {

                setIcon(mIconView2, null);

                if (enableOverviewIconMenu()) {

                    setText(mIconView2, null);

                }

            }

        }

    }



    public void updateSplitBoundsConfig(SplitBounds splitBounds) {

        mSplitBoundsConfig = splitBounds;

quickstep/src/com/android/quickstep/views/TaskView.java

+6 −2
Original line number Diff line number Diff line
@@ -1081,7 +1081,9 @@ public class TaskView extends FrameLayout implements Reusable { 
                mIconLoadRequest = iconCache.updateIconInBackground(mTask,

                        (task) -> {

                            setIcon(mIconView, task.icon);

                            if (enableOverviewIconMenu()) {

                                setText(mIconView, TaskUtils.getTitle(getContext(), task));

                            }

                            mDigitalWellBeingToast.initialize(task);

                        });

            }
@@ -1097,10 +1099,12 @@ public class TaskView extends FrameLayout implements Reusable { 
            }

            if (needsUpdate(changes, FLAG_UPDATE_ICON)) {

                setIcon(mIconView, null);

                if (enableOverviewIconMenu()) {

                    setText(mIconView, null);

                }

            }

        }

    }



    protected boolean needsUpdate(@TaskDataChanges int dataChange, @TaskDataChanges int flag) {

        return (dataChange & flag) == flag;