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

Commit aec4a8a3 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Update language to comply with Android's inclusive language guidance"

parents 6f115a88 8b56a38e

core/java/android/widget/AbsListView.java

+2 −1
Original line number Diff line number Diff line
@@ -1514,7 +1514,8 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te 
        if (mOnScrollListener != null) {

            mOnScrollListener.onScroll(this, mFirstPosition, getChildCount(), mItemCount);

        }

        onScrollChanged(0, 0, 0, 0); // dummy values, View's implementation does not use these.

        // placeholder values, View's implementation does not use these.

        onScrollChanged(0, 0, 0, 0);

    }



    /**

core/java/android/widget/Gallery.java

+2 −1
Original line number Diff line number Diff line
@@ -431,7 +431,8 @@ public class Gallery extends AbsSpinner implements GestureDetector.OnGestureList 
            mSelectedCenterOffset = childLeft + childCenter - galleryCenter;

        }



        onScrollChanged(0, 0, 0, 0); // dummy values, View's implementation does not use these.

        // placeholder values, View's implementation does not use these.

        onScrollChanged(0, 0, 0, 0);



        invalidate();

    }

core/java/android/widget/RemoteViewsAdapter.java

+2 −2
Original line number Diff line number Diff line
@@ -505,7 +505,7 @@ public class RemoteViewsAdapter extends BaseAdapter implements Handler.Callback 
        public void reset() {

            count = 0;



            // by default there is at least one dummy view type

            // by default there is at least one placeholder view type

            viewTypeCount = 1;

            hasStableIds = true;

            loadingTemplate = null;
@@ -948,7 +948,7 @@ public class RemoteViewsAdapter extends BaseAdapter implements Handler.Callback 
    private void updateTemporaryMetaData(IRemoteViewsFactory factory) {

        try {

            // get the properties/first view (so that we can use it to

            // measure our dummy views)

            // measure our placeholder views)

            boolean hasStableIds = factory.hasStableIds();

            int viewTypeCount = factory.getViewTypeCount();

            int count = factory.getCount();

core/java/android/widget/SearchView.java

+1 −1
Original line number Diff line number Diff line
@@ -1789,7 +1789,7 @@ public class SearchView extends LinearLayout implements CollapsibleActionView { 
            return createIntent(action, dataUri, extraData, query, actionKey, actionMsg);

        } catch (RuntimeException e ) {

            int rowNum;

            try {                       // be really paranoid now

            try {                       // be really defensive now

                rowNum = c.getPosition();

            } catch (RuntimeException e2 ) {

                rowNum = -1;