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

Commit b82efcc9 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 10342804 from 6ec21cbe to udc-release 

Change-Id: I0e3ef34f932460de6a630295ab104793ee5546f1
parents 8f24c681 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) {

tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java

+0 −3
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ import static org.junit.Assume.assumeTrue; 
import android.content.Intent;

import android.graphics.Point;

import android.os.SystemClock;

import android.platform.test.annotations.IwTest;

import android.platform.test.annotations.PlatinumTest;

import android.util.Log;
@@ -239,7 +238,6 @@ public class TaplTestsLauncher3 extends AbstractLauncherUiTest { 
    }



    @PlatinumTest(focusArea = "launcher")

    @IwTest(focusArea = "launcher")

    @Test

    @ScreenRecord // b/202433017

    public void testWorkspace() throws Exception {
@@ -374,7 +372,6 @@ public class TaplTestsLauncher3 extends AbstractLauncherUiTest { 
    }



    @PlatinumTest(focusArea = "launcher")

    @IwTest(focusArea = "launcher")

    @Test

    @PortraitLandscape

    @ScreenRecord // b/256898879

tests/src/com/android/launcher3/ui/widget/AddWidgetTest.java

+0 −2
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ import static com.android.launcher3.ui.TaplTestsLauncher3.getAppPackageName; 
import static org.junit.Assert.assertNotNull;

import static org.junit.Assert.assertTrue;



import android.platform.test.annotations.IwTest;

import android.platform.test.annotations.PlatinumTest;



import androidx.test.filters.LargeTest;
@@ -50,7 +49,6 @@ public class AddWidgetTest extends AbstractLauncherUiTest { 
    public ShellCommandRule mGrantWidgetRule = ShellCommandRule.grantWidgetBind();



    @PlatinumTest(focusArea = "launcher")

    @IwTest(focusArea="launcher")

    @Test

    @PortraitLandscape

    public void testDragIcon() throws Throwable {