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

Commit 5f7f4cb3 authored by Schneider Victor-tulias's avatar Schneider Victor-tulias
Browse files

State download information in content description whether or not there was an update. 

Talkback wasn't announcing the incremental download/install progress if the progress wasn't updated. Updated BubbleTextView to update the content description with the incremental download/install info if the progress bar should be shown.

Fixes: 149444435

Test: manual
Change-Id: I3efe6e31cec389da4119a2179a341aedd074a0b7
parent b4ed522e

res/values/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -232,6 +232,8 @@ 
    <string name="abandoned_promise_explanation">The app for this icon isn\'t installed.

        You can remove it, or search for the app and install it manually.

    </string>

    <!-- Title for an app which is being installed. -->

    <string name="app_installing_title"><xliff:g id="name" example="Messenger">%1$s</xliff:g> installing, <xliff:g id="progress" example="30%">%2$s</xliff:g> complete</string>

    <!-- Title for an app which is being downloaded. -->

    <string name="app_downloading_title"><xliff:g id="name" example="Messenger">%1$s</xliff:g> downloading, <xliff:g id="progress" example="30%">%2$s</xliff:g> complete</string>

    <!-- Title for an app whose download has been started. -->

src/com/android/launcher3/BubbleTextView.java

+23 −3
Original line number Diff line number Diff line
@@ -289,6 +289,7 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver, 
        setTag(info);

        applyLoadingState(promiseStateChanged);

        applyDotState(info, false /* animate */);

        setDownloadStateContentDescription(info, info.getProgressLevel());

    }



    public void applyFromApplicationInfo(AppInfo info) {
@@ -304,6 +305,7 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver, 
            applyProgressLevel();

        }

        applyDotState(info, false /* animate */);

        setDownloadStateContentDescription(info, info.getProgressLevel());

    }



    /**
@@ -316,6 +318,8 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver, 


        // Verify high res immediately

        verifyHighRes();



        setDownloadStateContentDescription(info, info.getProgressLevel());

    }



    /**
@@ -635,9 +639,7 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver, 
            setContentDescription(info.contentDescription != null

                    ? info.contentDescription : "");

        } else if (progressLevel > 0) {

            setContentDescription(getContext()

                    .getString(R.string.app_downloading_title, info.title,

                            NumberFormat.getPercentInstance().format(progressLevel * 0.01)));

            setDownloadStateContentDescription(info, progressLevel);

        } else {

            setContentDescription(getContext()

                    .getString(R.string.app_waiting_download_title, info.title));
@@ -713,6 +715,24 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver, 
        }

    }



    private void setDownloadStateContentDescription(ItemInfoWithIcon info, int progressLevel) {

        if ((info.runtimeStatusFlags & ItemInfoWithIcon.FLAG_SHOW_DOWNLOAD_PROGRESS_MASK)

                != 0) {

            String percentageString = NumberFormat.getPercentInstance()

                    .format(progressLevel * 0.01);

            if ((info.runtimeStatusFlags & ItemInfoWithIcon.FLAG_INSTALL_SESSION_ACTIVE) != 0) {

                setContentDescription(getContext()

                        .getString(

                            R.string.app_installing_title, info.title, percentageString));

            } else if ((info.runtimeStatusFlags

                    & ItemInfoWithIcon.FLAG_INCREMENTAL_DOWNLOAD_ACTIVE) != 0) {

                setContentDescription(getContext()

                        .getString(

                            R.string.app_downloading_title, info.title, percentageString));

            }

        }

    }



    /**

     * Sets the icon for this view based on the layout direction.

     */