Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 525ae207 authored by Svetoslav Ganov's avatar Svetoslav Ganov
Browse files

Accessibility focus and input focus do not sync - part 2 

1. This patch has somecode that syncs input and accessibility
   focus or tries to put accessibility focus on the top most
   container that was missed by the previous patch.

Change-Id: I08f21670b1c6e9f363d5714b1976fb52d84baae4
parent f76a83cf

core/java/android/view/View.java

+0 −9
Original line number Diff line number Diff line
@@ -6212,15 +6212,6 @@ public class View implements Drawable.Callback, Drawable.Callback2, KeyEvent.Cal 














            // Clear the text navigation state.















            setAccessibilityCursorPosition(-1);

























            // Try to move accessibility focus to the input focus.













            View rootView = getRootView();













            if (rootView != null) {













                View inputFocus = rootView.findFocus();













                if (inputFocus != null) {













                    inputFocus.requestAccessibilityFocus();













                }













            }















        }















    }















































core/java/android/view/ViewRootImpl.java



+0
−14




























Original line number
Diff line number
Diff line








@@ -2993,20 +2993,6 @@ public final class ViewRootImpl implements ViewParent,













                        if (hasWindowFocus) {















                            mView.sendAccessibilityEvent(















                                    AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED);













                            // Give accessibility focus to the view that has input













                            // focus if such, otherwise to the first one.













                            if (mView instanceof ViewGroup) {













                                ViewGroup viewGroup = (ViewGroup) mView;













                                View focused = viewGroup.findFocus();













                                if (focused != null) {













                                    focused.requestAccessibilityFocus();













                                }













                            }













                            // There is no accessibility focus, despite our effort













                            // above, now just give it to the first view.













                            if (mAccessibilityFocusedHost == null) {













                                mView.requestAccessibilityFocus();













                            }















                        }















                    }















                }