Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am d8400333: am 2f87014e: Merge "Enabling accessibility focus only if explore by touch is on." into jb-dev

Browse Source 
* commit 'd84003333c0394ddb7c4353dae077156618551b0':
  Enabling accessibility focus only if explore by touch is on.
This commit is contained in:
Svetoslav Ganov
2012-04-30 12:46:21 -07:00
committed by Android Git Automerger
parent f561083437 d84003333c
commit 8fabe634d9
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/view/View.java
View File

@@ -5960,7 +5960,8 @@ public class View implements Drawable.Callback, Drawable.Callback2, KeyEvent.Cal
* @hide
*/
public boolean requestAccessibilityFocus() {
if (!AccessibilityManager.getInstance(mContext).isEnabled()) {
AccessibilityManager manager = AccessibilityManager.getInstance(mContext);
if (!manager.isEnabled() || !manager.isTouchExplorationEnabled()) {
return false;
}
if ((mViewFlags & VISIBILITY_MASK) != VISIBLE) {

3
core/java/android/view/ViewRootImpl.java
View File

@@ -2318,7 +2318,8 @@ public final class ViewRootImpl implements ViewParent,
* @param canvas The canvas on which to draw.
*/
private void drawAccessibilityFocusedDrawableIfNeeded(Canvas canvas) {
if (!AccessibilityManager.getInstance(mView.mContext).isEnabled()) {
AccessibilityManager manager = AccessibilityManager.getInstance(mView.mContext);
if (!manager.isEnabled() || !manager.isTouchExplorationEnabled()) {
return;
}
if (mAccessibilityFocusedHost == null || mAccessibilityFocusedHost.mAttachInfo == null) {