summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHyunyoung Song <hyunyoungs@google.com>2016-09-15 23:31:37 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-09-15 23:31:37 +0000
commitc1c6126745f0bcba3db703643f97204d4f446a7a (patch)
treec10d1ef6b9516a41e8e77b4e2208eb7da9d432af
parent488d8adeb822a5aa88be46edb8a5e779b540b972 (diff)
parentc5afad6eb994bfbac051d5fa1191fda279a21828 (diff)
downloadandroid_packages_apps_Trebuchet-c1c6126745f0bcba3db703643f97204d4f446a7a.tar.gz
android_packages_apps_Trebuchet-c1c6126745f0bcba3db703643f97204d4f446a7a.tar.bz2
android_packages_apps_Trebuchet-c1c6126745f0bcba3db703643f97204d4f446a7a.zip
Merge "Set contentDescription on caret" into ub-launcher3-calgary-polish
-rw-r--r--src/com/android/launcher3/pageindicators/PageIndicatorLineCaret.java5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/com/android/launcher3/pageindicators/PageIndicatorLineCaret.java b/src/com/android/launcher3/pageindicators/PageIndicatorLineCaret.java
index ca3a2dd09..350bc8a9b 100644
--- a/src/com/android/launcher3/pageindicators/PageIndicatorLineCaret.java
+++ b/src/com/android/launcher3/pageindicators/PageIndicatorLineCaret.java
@@ -159,6 +159,11 @@ public class PageIndicatorLineCaret extends PageIndicator {
}
@Override
+ public void setContentDescription(CharSequence contentDescription) {
+ mAllAppsHandle.setContentDescription(contentDescription);
+ }
+
+ @Override
public void setScroll(int currentScroll, int totalScroll) {
if (getAlpha() == 0) {
return;