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

Commit 6b9773ef authored by Tomasz Mikolajewski's avatar Tomasz Mikolajewski Committed by android-build-merger
Browse files

Merge "Do not crash when trying to select unselectable items with keyboard." into nyc-dev 

am: 566c595

* commit '566c595d4d283f10d4d26b6c4ee2805abb7fa2df':
  Do not crash when trying to select unselectable items with keyboard.

Change-Id: I0cb26f34ef69bc8dc9ee02502a8f6b1b1a8a731f
parents c991ce90 a29a8e2a

src/com/android/documentsui/dirlist/DirectoryFragment.java

+17 −4
Original line number Diff line number Diff line
@@ -1411,7 +1411,7 @@ public class DirectoryFragment extends Fragment 
                // Handle range selection adjustments. Extending the selection will adjust the

                // bounds of the in-progress range selection. Each time an unshifted navigation

                // event is received, the range selection is restarted.

                if (shouldExtendSelection(event)) {

                if (shouldExtendSelection(doc, event)) {

                    if (!mSelectionManager.isRangeSelectionActive()) {

                        // Start a range selection if one isn't active

                        mSelectionManager.startRangeSelection(doc.getAdapterPosition());
@@ -1448,9 +1448,22 @@ public class DirectoryFragment extends Fragment 
            return false;

        }



        private boolean shouldExtendSelection(KeyEvent event) {

            return Events.isNavigationKeyCode(event.getKeyCode()) &&

                    event.isShiftPressed();

        private boolean shouldExtendSelection(DocumentHolder doc, KeyEvent event) {

            if (!Events.isNavigationKeyCode(event.getKeyCode()) || !event.isShiftPressed()) {

                return false;

            }



            // TODO: Combine this method with onBeforeItemStateChange, as both of them are almost

            // the same, and responsible for the same thing (whether to select or not).

            final Cursor cursor = mModel.getItem(doc.modelId);

            if (cursor == null) {

                Log.w(TAG, "Couldn't obtain cursor for modelId: " + doc.modelId);

                return false;

            }



            final String docMimeType = getCursorString(cursor, Document.COLUMN_MIME_TYPE);

            final int docFlags = getCursorInt(cursor, Document.COLUMN_FLAGS);

            return mTuner.canSelectType(docMimeType, docFlags);

        }

    }

src/com/android/documentsui/dirlist/MultiSelectManager.java

+2 −2

File changed.

Contains only whitespace changes.