Not allowing applying dot state to override "disabled" description

Disabled apps were always accessibility-marked like "Disabled Messenger"

With introduction of dots, this degraded, the the "Disabled" part was
never added.

Restoring the old behavior here.

Bug: 129036789
Change-Id: Icb97ea9a190643449d90f558a78039df30c53cbf
This commit is contained in:
vadimt
2019-05-21 13:24:23 -07:00
parent a1a417c994
commit da6dad5101

View File

@@ -51,7 +51,6 @@ import com.android.launcher3.graphics.PreloadIconDrawable;
import com.android.launcher3.icons.DotRenderer;
import com.android.launcher3.icons.IconCache.IconLoadRequest;
import com.android.launcher3.icons.IconCache.ItemInfoUpdateReceiver;
import com.android.launcher3.icons.LauncherIcons;
import com.android.launcher3.model.PackageItemInfo;
import com.android.launcher3.views.ActivityContext;
@@ -561,7 +560,10 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver,
}
}
if (itemInfo.contentDescription != null) {
if (hasDot()) {
if (itemInfo.isDisabled()) {
setContentDescription(getContext().getString(R.string.disabled_app_label,
itemInfo.contentDescription));
} else if (hasDot()) {
int count = mDotInfo.getNotificationCount();
setContentDescription(getContext().getResources().getQuantityString(
R.plurals.dotted_app_label, count, itemInfo.contentDescription, count));