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

Commit 6a85817d authored by Jon Miranda's avatar Jon Miranda
Browse files

Don't add focusables when getDescendantFocusability is FOCUS_BLOCK_DESCENDANTS.

Bug: 32315286
Change-Id: I6fc6600fc9cbf83f720d9e6e878735076cd52cf1
parent 9ccafbff
Loading
Loading
Loading
Loading
+4 −0
Original line number Diff line number Diff line
@@ -1068,6 +1068,10 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc

    @Override
    public void addFocusables(ArrayList<View> views, int direction, int focusableMode) {
        if (getDescendantFocusability() == FOCUS_BLOCK_DESCENDANTS) {
            return;
        }

        // XXX-RTL: This will be fixed in a future CL
        if (mCurrentPage >= 0 && mCurrentPage < getPageCount()) {
            getPageAt(mCurrentPage).addFocusables(views, direction, focusableMode);