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

Commit cb18db8e authored by Adam Powell's avatar Adam Powell Committed by Android (Google) Code Review
Browse files

Merge "Fix bug 5312352 - ListView modal multi-select mode bugs"

parents c924fbd6 1e83b3e6

core/java/android/widget/AbsListView.java

+3 −5
Original line number Diff line number Diff line
@@ -2576,13 +2576,11 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te 
            final int longPressPosition, final long longPressId) {

        // CHOICE_MODE_MULTIPLE_MODAL takes over long press.

        if (mChoiceMode == CHOICE_MODE_MULTIPLE_MODAL) {

            if (mChoiceActionMode == null) {

                mChoiceActionMode = startActionMode(mMultiChoiceModeCallback);

            if (mChoiceActionMode == null &&

                    (mChoiceActionMode = startActionMode(mMultiChoiceModeCallback)) != null) {

                setItemChecked(longPressPosition, true);

            }

            // TODO Should we select the long pressed item if we were already in

            // selection mode? (i.e. treat it like an item click?)

                performHapticFeedback(HapticFeedbackConstants.LONG_PRESS);

            }

            return true;

        }