summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2018-01-25 23:38:11 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2018-01-25 23:38:11 +0000
commit2269258438d6d10ec978338c8b2d968f0df1772e (patch)
tree3051cdbf479cbc122d1b8a73475237248cb601b8
parent426345bfc432ddcbb558d08239ec70a36cd40388 (diff)
parentf34cadea3b0913c255b9a42526109236ad875718 (diff)
downloadandroid_packages_apps_Trebuchet-2269258438d6d10ec978338c8b2d968f0df1772e.tar.gz
android_packages_apps_Trebuchet-2269258438d6d10ec978338c8b2d968f0df1772e.tar.bz2
android_packages_apps_Trebuchet-2269258438d6d10ec978338c8b2d968f0df1772e.zip
Merge "Temporary accesibility fix for opening all apps." into ub-launcher3-master
-rw-r--r--src/com/android/launcher3/pageindicators/WorkspacePageIndicator.java6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/com/android/launcher3/pageindicators/WorkspacePageIndicator.java b/src/com/android/launcher3/pageindicators/WorkspacePageIndicator.java
index f3b0d6126..4cbf6736c 100644
--- a/src/com/android/launcher3/pageindicators/WorkspacePageIndicator.java
+++ b/src/com/android/launcher3/pageindicators/WorkspacePageIndicator.java
@@ -22,6 +22,7 @@ import android.view.Gravity;
import android.view.View;
import android.view.View.OnClickListener;
import android.view.ViewConfiguration;
+import android.view.accessibility.AccessibilityManager;
import android.widget.FrameLayout;
import com.android.launcher3.DeviceProfile;
@@ -55,6 +56,7 @@ public class WorkspacePageIndicator extends PageIndicator implements Insettable,
private final Handler mDelayedLineFadeHandler = new Handler(Looper.getMainLooper());
private final Launcher mLauncher;
+ private final AccessibilityManager mAccessibilityManager;
private boolean mShouldAutoHide = true;
@@ -136,6 +138,8 @@ public class WorkspacePageIndicator extends PageIndicator implements Insettable,
boolean darkText = WallpaperColorInfo.getInstance(context).supportsDarkText();
mActiveAlpha = darkText ? BLACK_ALPHA : WHITE_ALPHA;
mLinePaint.setColor(darkText ? Color.BLACK : Color.WHITE);
+ mAccessibilityManager = (AccessibilityManager)
+ getContext().getSystemService(Context.ACCESSIBILITY_SERVICE);
}
@Override
@@ -274,7 +278,7 @@ public class WorkspacePageIndicator extends PageIndicator implements Insettable,
setBackgroundResource(0);
setOnFocusChangeListener(null);
- setOnClickListener(null);
+ setOnClickListener(mAccessibilityManager.isTouchExplorationEnabled() ? this : null);
}
setLayoutParams(lp);