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

Commit ffa30075 authored by Randy Pfohl's avatar Randy Pfohl Committed by Automerger Merge Worker
Browse files

Merge "Aligning the intialization process with groupedtaskview to set content... 

Merge "Aligning the intialization process with groupedtaskview to set content description Test: built locally, tested against tablet with bluetooth keyboard." into udc-dev am: 6ec21cbe

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23699415



Change-Id: Id29e58e97afa9bbd7b23bbeb26d9e1ce8584fae7
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b4d635f6 6ec21cbe

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

+0 −4
Original line number Diff line number Diff line
@@ -280,10 +280,6 @@ public final class DigitalWellBeingToast { 
        }

    }



    public String getContentDescription() {

            return getContentDescriptionForTask(mTask, mAppUsageLimitTimeMs, mAppRemainingTimeMs);

    }



    private String getContentDescriptionForTask(

            Task task, long appUsageLimitTimeMs, long appRemainingTimeMs) {

        return appUsageLimitTimeMs >= 0 && appRemainingTimeMs >= 0 ?

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

+4 −2
Original line number Diff line number Diff line
@@ -1020,7 +1020,10 @@ public class TaskView extends FrameLayout implements Reusable { 
            }

            if (needsUpdate(changes, FLAG_UPDATE_ICON)) {

                mIconLoadRequest = iconCache.updateIconInBackground(mTask,

                        (task) -> setIcon(mIconView, task.icon));

                        (task) -> {

                            setIcon(mIconView, task.icon);

                            mDigitalWellBeingToast.initialize(task);

                        });

            }

        } else {

            if (needsUpdate(changes, FLAG_UPDATE_THUMBNAIL)) {
@@ -1342,7 +1345,6 @@ public class TaskView extends FrameLayout implements Reusable { 


    protected void refreshTaskThumbnailSplash() {

        mSnapshotView.refreshSplashView();

        setContentDescription(mDigitalWellBeingToast.getContentDescription());

    }



    private void setSplitSelectTranslationX(float x) {