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

Commit 37e4df17 authored by Jonathan Miranda's avatar Jonathan Miranda Committed by Android (Google) Code Review
Browse files

Merge "Don't add focusables when getDescendantFocusability is... 

Merge "Don't add focusables when getDescendantFocusability is FOCUS_BLOCK_DESCENDANTS." into ub-launcher3-master
parents ed38a3c5 6a85817d

src/com/android/launcher3/PagedView.java

+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);