PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Updating content description of taskview after latest update" into udc-dev am: 5e1ccf2e96

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

Change-Id: I690d8cf3cbed8b507dba828ea118fe020d176377
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Randy Pfohl
2023-06-09 22:40:51 +00:00
committed by Automerger Merge Worker
parent 1f54b59263 5e1ccf2e96
commit ffa5a7daf2
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
quickstep/src/com/android/quickstep/views/DigitalWellBeingToast.java
+12 -3
View File
@@ -92,6 +92,8 @@ public final class DigitalWellBeingToast {
private Task mTask; private Task mTask;
private boolean mHasLimit; private boolean mHasLimit;
private long mAppUsageLimitTimeMs;
private long mAppRemainingTimeMs; private long mAppRemainingTimeMs;
@Nullable @Nullable
private View mBanner; private View mBanner;
@@ -113,10 +115,12 @@ public final class DigitalWellBeingToast {
mHasLimit = false; mHasLimit = false;
mTaskView.setContentDescription(mTask.titleDescription); mTaskView.setContentDescription(mTask.titleDescription);
replaceBanner(null); replaceBanner(null);
mAppRemainingTimeMs = 0; mAppUsageLimitTimeMs = -1;
mAppRemainingTimeMs = -1;
} }
private void setLimit(long appUsageLimitTimeMs, long appRemainingTimeMs) { private void setLimit(long appUsageLimitTimeMs, long appRemainingTimeMs) {
mAppUsageLimitTimeMs = appUsageLimitTimeMs;
mAppRemainingTimeMs = appRemainingTimeMs; mAppRemainingTimeMs = appRemainingTimeMs;
mHasLimit = true; mHasLimit = true;
TextView toast = mActivity.getViewCache().getView(R.layout.digital_wellbeing_toast, TextView toast = mActivity.getViewCache().getView(R.layout.digital_wellbeing_toast,
@@ -138,11 +142,12 @@ public final class DigitalWellBeingToast {
} }
public void initialize(Task task) { public void initialize(Task task) {
mAppUsageLimitTimeMs = mAppRemainingTimeMs = -1;
mTask = task; mTask = task;
THREAD_POOL_EXECUTOR.execute(() -> { THREAD_POOL_EXECUTOR.execute(() -> {
final AppUsageLimit usageLimit = mLauncherApps.getAppUsageLimit( final AppUsageLimit usageLimit = mLauncherApps.getAppUsageLimit(
task.getTopComponent().getPackageName(), mTask.getTopComponent().getPackageName(),
UserHandle.of(task.key.userId)); UserHandle.of(mTask.key.userId));
final long appUsageLimitTimeMs = final long appUsageLimitTimeMs =
usageLimit != null ? usageLimit.getTotalUsageLimit() : -1; usageLimit != null ? usageLimit.getTotalUsageLimit() : -1;
@@ -275,6 +280,10 @@ public final class DigitalWellBeingToast {
} }
} }
public String getContentDescription() {
return getContentDescriptionForTask(mTask, mAppUsageLimitTimeMs, mAppRemainingTimeMs);
}
private String getContentDescriptionForTask( private String getContentDescriptionForTask(
Task task, long appUsageLimitTimeMs, long appRemainingTimeMs) { Task task, long appUsageLimitTimeMs, long appRemainingTimeMs) {
return appUsageLimitTimeMs >= 0 && appRemainingTimeMs >= 0 ? return appUsageLimitTimeMs >= 0 && appRemainingTimeMs >= 0 ?
quickstep/src/com/android/quickstep/views/TaskView.java
+1
View File
@@ -1342,6 +1342,7 @@ public class TaskView extends FrameLayout implements Reusable {
protected void refreshTaskThumbnailSplash() { protected void refreshTaskThumbnailSplash() {
mSnapshotView.refreshSplashView(); mSnapshotView.refreshSplashView();
setContentDescription(mDigitalWellBeingToast.getContentDescription());
} }
private void setSplitSelectTranslationX(float x) { private void setSplitSelectTranslationX(float x) {