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

Commit 0c9698ac authored by Svetoslav Ganov's avatar Svetoslav Ganov Committed by Android (Google) Code Review
Browse files

Merge changes I67d080ab,Ia3d7a5ad 

* changes:
  AdapterView does not set setCurrentItemIndex in accessibility event.
  AdapterView#isScrollableForAccessibility does not handle null adapter.
parents 384bf04a b2a9e216

core/java/android/widget/AdapterView.java

+8 −3
Original line number Diff line number Diff line
@@ -922,16 +922,21 @@ public abstract class AdapterView<T extends Adapter> extends ViewGroup { 
        if (selectedView != null) {

            event.setEnabled(selectedView.isEnabled());

        }

        event.setCurrentItemIndex(getSelectedItemPosition());

        event.setFromIndex(getFirstVisiblePosition());

        event.setToIndex(getLastVisiblePosition());

        event.setItemCount(getAdapter().getCount());

    }



    private boolean isScrollableForAccessibility() {

        final int itemCount = getAdapter().getCount();

        T adapter = getAdapter();

        if (adapter != null) {

            final int itemCount = adapter.getCount();

            return itemCount > 0

                && (getFirstVisiblePosition() > 0 || getLastVisiblePosition() < itemCount - 1);

        }

        return false;

    }



    @Override

    protected boolean canAnimate() {