aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-03-01 00:06:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Updating content description of taskview after latest update" into udc-dev

Browse Source
This commit is contained in:
Randy Pfohl
2023-06-09 22:06:41 +00:00
committed by Android (Google) Code Review
parent 5e9203e737 62eb722726
commit 5e1ccf2e96
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
quickstep/src/com/android/quickstep/views/DigitalWellBeingToast.java
View File

@@ -92,6 +92,8 @@ public final class DigitalWellBeingToast {
private Task mTask;
private boolean mHasLimit;
private long mAppUsageLimitTimeMs;
private long mAppRemainingTimeMs;
@Nullable
private View mBanner;
@@ -113,10 +115,12 @@ public final class DigitalWellBeingToast {
mHasLimit = false;
mTaskView.setContentDescription(mTask.titleDescription);
replaceBanner(null);
mAppRemainingTimeMs = 0;
mAppUsageLimitTimeMs = -1;
mAppRemainingTimeMs = -1;
}
private void setLimit(long appUsageLimitTimeMs, long appRemainingTimeMs) {
mAppUsageLimitTimeMs = appUsageLimitTimeMs;
mAppRemainingTimeMs = appRemainingTimeMs;
mHasLimit = true;
TextView toast = mActivity.getViewCache().getView(R.layout.digital_wellbeing_toast,
@@ -138,11 +142,12 @@ public final class DigitalWellBeingToast {
}
public void initialize(Task task) {
mAppUsageLimitTimeMs = mAppRemainingTimeMs = -1;
mTask = task;
THREAD_POOL_EXECUTOR.execute(() -> {
final AppUsageLimit usageLimit = mLauncherApps.getAppUsageLimit(
task.getTopComponent().getPackageName(),
UserHandle.of(task.key.userId));
mTask.getTopComponent().getPackageName(),
UserHandle.of(mTask.key.userId));
final long appUsageLimitTimeMs =
usageLimit != null ? usageLimit.getTotalUsageLimit() : -1;
@@ -275,6 +280,10 @@ 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 ?

1
quickstep/src/com/android/quickstep/views/TaskView.java
View File

@@ -1342,6 +1342,7 @@ public class TaskView extends FrameLayout implements Reusable {
protected void refreshTaskThumbnailSplash() {
mSnapshotView.refreshSplashView();
setContentDescription(mDigitalWellBeingToast.getContentDescription());
}
private void setSplitSelectTranslationX(float x) {