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

Commit da6dad51 authored by vadimt's avatar vadimt
Browse files

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
parent a1a417c9

src/com/android/launcher3/BubbleTextView.java

+4 −2
Original line number Diff line number Diff line
@@ -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));