diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/DigitalWellBeingToast.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/views/DigitalWellBeingToast.java index 19e9cb4ff6..446fb39055 100644 --- a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/DigitalWellBeingToast.java +++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/views/DigitalWellBeingToast.java @@ -24,7 +24,6 @@ import android.content.Context; import android.content.Intent; import android.content.pm.LauncherApps; import android.content.pm.LauncherApps.AppUsageLimit; -import android.content.res.Resources; import android.icu.text.MeasureFormat; import android.icu.text.MeasureFormat.FormatWidth; import android.icu.util.Measure; @@ -54,7 +53,7 @@ public final class DigitalWellBeingToast extends LinearLayout { private final LauncherApps mLauncherApps; public interface InitializeCallback { - void call(float saturation, String contentDescription); + void call(String contentDescription); } private static final String TAG = DigitalWellBeingToast.class.getSimpleName(); @@ -84,7 +83,7 @@ public final class DigitalWellBeingToast extends LinearLayout { if (task.key.userId != UserHandle.myUserId()) { setVisibility(GONE); - callback.call(1, task.titleDescription); + callback.call(task.titleDescription); return; } @@ -99,7 +98,7 @@ public final class DigitalWellBeingToast extends LinearLayout { usageLimit != null ? usageLimit.getUsageRemaining() : -1; post(() -> { - if (appUsageLimitTimeMs < 0) { + if (appUsageLimitTimeMs < 0 || appRemainingTimeMs < 0) { setVisibility(GONE); } else { setVisibility(VISIBLE); @@ -108,10 +107,8 @@ public final class DigitalWellBeingToast extends LinearLayout { R.drawable.hourglass_top : R.drawable.hourglass_bottom); } - callback.call( - appUsageLimitTimeMs >= 0 && appRemainingTimeMs <= 0 ? 0 : 1, - getContentDescriptionForTask( - task, appUsageLimitTimeMs, appRemainingTimeMs)); + callback.call(getContentDescriptionForTask( + task, appUsageLimitTimeMs, appRemainingTimeMs)); }); }); } @@ -180,12 +177,9 @@ public final class DigitalWellBeingToast extends LinearLayout { } private String getText(long remainingTime) { - final Resources resources = getResources(); - return (remainingTime <= 0) ? - resources.getString(R.string.app_in_grayscale) : - resources.getString( - R.string.time_left_for_app, - getRoundedUpToMinuteReadableDuration(remainingTime)); + return getResources().getString( + R.string.time_left_for_app, + getRoundedUpToMinuteReadableDuration(remainingTime)); } public void openAppUsageSettings() { @@ -209,7 +203,7 @@ public final class DigitalWellBeingToast extends LinearLayout { private String getContentDescriptionForTask( Task task, long appUsageLimitTimeMs, long appRemainingTimeMs) { - return appUsageLimitTimeMs >= 0 ? + return appUsageLimitTimeMs >= 0 && appRemainingTimeMs >= 0 ? getResources().getString( R.string.task_contents_description_with_remaining_time, task.titleDescription, diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/TaskView.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/views/TaskView.java index 38aaac5596..eb17e3e820 100644 --- a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/TaskView.java +++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/views/TaskView.java @@ -322,9 +322,8 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable { } mDigitalWellBeingToast.initialize( mTask, - (saturation, contentDescription) -> { + contentDescription -> { setContentDescription(contentDescription); - mSnapshotView.setSaturation(saturation); if (mDigitalWellBeingToast.getVisibility() == VISIBLE) { getRecentsView().onDigitalWellbeingToastShown(); } diff --git a/quickstep/res/values/strings.xml b/quickstep/res/values/strings.xml index f5e8fa825c..81565a5720 100644 --- a/quickstep/res/values/strings.xml +++ b/quickstep/res/values/strings.xml @@ -55,10 +55,6 @@ escaped form of '<'). [CHAR LIMIT=15] --> < 1 minute - - App in grayscale - %1$s left today