summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher3/Workspace.java
diff options
context:
space:
mode:
authorJason Monk <jmonk@google.com>2014-04-24 16:33:06 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-04-24 16:33:07 +0000
commit031d0ff4ad4baeb548c4272a08af4e8844cb5fbe (patch)
tree73d09b3a7c7b5e6407a216d91b74882dffa39b15 /src/com/android/launcher3/Workspace.java
parent94904606f6961816429fa4f5a15ac3ba3785a4f8 (diff)
parented05f09aa1f83fc7ed02c8c40fa473a7f1a3a1e0 (diff)
downloadandroid_packages_apps_Trebuchet-031d0ff4ad4baeb548c4272a08af4e8844cb5fbe.tar.gz
android_packages_apps_Trebuchet-031d0ff4ad4baeb548c4272a08af4e8844cb5fbe.tar.bz2
android_packages_apps_Trebuchet-031d0ff4ad4baeb548c4272a08af4e8844cb5fbe.zip
Merge "Fix accessibility announce on apps page" into ub-now-nova
Diffstat (limited to 'src/com/android/launcher3/Workspace.java')
-rw-r--r--src/com/android/launcher3/Workspace.java8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index 9800cf376..2c57422c5 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -1466,6 +1466,14 @@ public class Workspace extends SmoothPagedView
mWallpaperOffset.syncWithScroll();
}
+ @Override
+ public void announceForAccessibility(CharSequence text) {
+ // Don't announce if apps is on top of us.
+ if (!mLauncher.isAllAppsVisible()) {
+ super.announceForAccessibility(text);
+ }
+ }
+
void showOutlines() {
if (!isSmall() && !mIsSwitchingState) {
if (mChildrenOutlineFadeOutAnimation != null) mChildrenOutlineFadeOutAnimation.cancel();