commit a2adac6a91859b394fdb9025cc842945bb183077
author Vadim Tryshev <vadimt@google.com> Mon Apr 16 15:43:24 2018 -0700
committer Sunny Goyal <sunnygoyal@google.com> Tue Apr 17 19:52:18 2018 +0000
tree 094c392d75be5a8d1fb0a8f0d08c9027b71d14ec
parent 3483c52e6bd81b7c37eb0089940e90a6f3e6d80c

Removing accessibility description from page indicators

The current page is announced upon switching to it.
Is should be done this way for all future page implementations with
indicators.

Bug: 77827828
Change-Id: I8ba3bd9d068954df51d6de45da79133ede12c96d
Test: Manual
Merged-In: I8f2f163a261dd7098939674d39e014236fc66d5d

src/com/android/launcher3/PagedView.java

diff --git a/src/com/android/launcher3/PagedView.java b/src/com/android/launcher3/PagedView.java
index 9da5cf0..fe953fe 100644
--- a/src/com/android/launcher3/PagedView.java
+++ b/src/com/android/launcher3/PagedView.java
@@ -203,7 +203,6 @@
         if (mPageIndicatorViewId > -1) {
             mPageIndicator = parent.findViewById(mPageIndicatorViewId);
             mPageIndicator.setMarkersCount(getChildCount());
-            mPageIndicator.setPageDescription(getPageIndicatorDescription());
         }
     }
 
@@ -310,7 +309,6 @@
 
     private void updatePageIndicator() {
         if (mPageIndicator != null) {
-            mPageIndicator.setPageDescription(getPageIndicatorDescription());
             mPageIndicator.setActiveMarker(getNextPage());
         }
     }
@@ -1541,10 +1539,6 @@
         return false;
     }
 
-    protected String getPageIndicatorDescription() {
-        return getCurrentPageDescription();
-    }
-
     protected boolean canAnnouncePageDescription() {
         return true;
     }

src/com/android/launcher3/allapps/PersonalWorkSlidingTabStrip.java

diff --git a/src/com/android/launcher3/allapps/PersonalWorkSlidingTabStrip.java b/src/com/android/launcher3/allapps/PersonalWorkSlidingTabStrip.java
index a069d5d..18a9f82 100644
--- a/src/com/android/launcher3/allapps/PersonalWorkSlidingTabStrip.java
+++ b/src/com/android/launcher3/allapps/PersonalWorkSlidingTabStrip.java
@@ -25,6 +25,7 @@
 import android.view.View;
 import android.widget.Button;
 import android.widget.LinearLayout;
+
 import com.android.launcher3.Launcher;
 import com.android.launcher3.R;
 import com.android.launcher3.Utilities;
@@ -167,10 +168,4 @@
 
     @Override
     public void setMarkersCount(int numMarkers) { }
-
-    @Override
-    public void setPageDescription(CharSequence description) {
-        // We don't want custom page description as the tab-bar already has two tabs with their
-        // own descriptions.
-    }
 }

src/com/android/launcher3/pageindicators/PageIndicator.java

diff --git a/src/com/android/launcher3/pageindicators/PageIndicator.java b/src/com/android/launcher3/pageindicators/PageIndicator.java
index 3ce7291..8fafb6f 100644
--- a/src/com/android/launcher3/pageindicators/PageIndicator.java
+++ b/src/com/android/launcher3/pageindicators/PageIndicator.java
@@ -25,6 +25,4 @@
     void setActiveMarker(int activePage);
 
     void setMarkersCount(int numMarkers);
-
-    void setPageDescription(CharSequence description);
 }

src/com/android/launcher3/pageindicators/PageIndicatorDots.java

diff --git a/src/com/android/launcher3/pageindicators/PageIndicatorDots.java b/src/com/android/launcher3/pageindicators/PageIndicatorDots.java
index 524ec3c..709975f 100644
--- a/src/com/android/launcher3/pageindicators/PageIndicatorDots.java
+++ b/src/com/android/launcher3/pageindicators/PageIndicatorDots.java
@@ -228,11 +228,6 @@
     }
 
     @Override
-    public void setPageDescription(CharSequence description) {
-        setContentDescription(description);
-    }
-
-    @Override
     protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
         // Add extra spacing of mDotRadius on all sides so than entry animation could be run.
         int width = MeasureSpec.getMode(widthMeasureSpec) == MeasureSpec.EXACTLY ?

src/com/android/launcher3/pageindicators/WorkspacePageIndicator.java

diff --git a/src/com/android/launcher3/pageindicators/WorkspacePageIndicator.java b/src/com/android/launcher3/pageindicators/WorkspacePageIndicator.java
index 4ad7feb..3c16cde 100644
--- a/src/com/android/launcher3/pageindicators/WorkspacePageIndicator.java
+++ b/src/com/android/launcher3/pageindicators/WorkspacePageIndicator.java
@@ -186,11 +186,6 @@
         }
     }
 
-    @Override
-    public void setPageDescription(CharSequence description) {
-        setContentDescription(description);
-    }
-
     public void setShouldAutoHide(boolean shouldAutoHide) {
         mShouldAutoHide = shouldAutoHide;
         if (shouldAutoHide && mLinePaint.getAlpha() > 0) {