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

Commit 53fe1f26 authored by Sunny Goyal's avatar Sunny Goyal
Browse files

Updating page indicator content description to indicate click target 

for apps list

Bug: 29777235
Change-Id: Ia3dc20db7ec06455429389de5752b9bcfff15555
parent e49a97ab

res/values/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ 
    <string name="hotseat_out_of_space">No more room in the Favorites tray</string>



    <!-- All applications label -->

    <string name="all_apps_button_label">Apps</string>

    <string name="all_apps_button_label">Apps list</string>

    <!-- Label for button in all applications label to go back home (to the workspace / desktop)

         for accessibilty (spoken when the button gets focus). -->

    <string name="all_apps_home_button_label">Home</string>

src/com/android/launcher3/PagedView.java

+6 −2
Original line number Diff line number Diff line
@@ -251,7 +251,7 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc 
        if (mPageIndicatorViewId > -1) {

            mPageIndicator = (PageIndicator) parent.findViewById(mPageIndicatorViewId);

            mPageIndicator.setMarkersCount(getChildCount());

            mPageIndicator.setContentDescription(getCurrentPageDescription());

            mPageIndicator.setContentDescription(getPageIndicatorDescription());

        }

    }
@@ -442,7 +442,7 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc 
    private void updatePageIndicator() {

        // Update the page indicator (when we aren't reordering)

        if (mPageIndicator != null) {

            mPageIndicator.setContentDescription(getCurrentPageDescription());

            mPageIndicator.setContentDescription(getPageIndicatorDescription());

            if (!isReordering(false)) {

                mPageIndicator.setActiveMarker(getNextPage());

            }
@@ -2276,6 +2276,10 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc 
        return false;

    }



    protected String getPageIndicatorDescription() {

        return getCurrentPageDescription();

    }



    protected String getCurrentPageDescription() {

        return getContext().getString(R.string.default_scroll_format,

                getNextPage() + 1, getChildCount());

src/com/android/launcher3/Workspace.java

+5 −0
Original line number Diff line number Diff line
@@ -4409,6 +4409,11 @@ public class Workspace extends PagedView 
        exitWidgetResizeMode();

    }



    @Override

    protected String getPageIndicatorDescription() {

        return getResources().getString(R.string.all_apps_button_label);

    }



    @Override

    protected String getCurrentPageDescription() {

        if (hasCustomContent() && getNextPage() == 0) {