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

Commit 95966b8f authored by Ben Lin's avatar Ben Lin
Browse files

Fix context menu for empty directory/root view. 

Since it's not always true that there is a doc/directory given the (x,
y) of the right click, I've changed the signature of right click to take
in a MotionEvent object as a parameter, and make a MotionInputEvent
inside the function as a check whether it's on a file/doc or on
empty/blank pane.

Bug: 29538570
Change-Id: I7ee960c9f556752bf314ab8cc2d94fda28194c0a
parent 47e58bbc

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

+43 −33
Original line number Diff line number Diff line
@@ -417,10 +417,12 @@ public class DirectoryFragment extends Fragment 
        return false;

    }



    protected boolean onRightClick(MotionInputEvent e) {

    protected boolean onRightClick(MotionEvent e) {

        // First get target to see if it's a blank window or a file/doc

        DocumentHolder holder = getTarget(e);

        if (holder != null) {

        final MotionInputEvent event = MotionInputEvent.obtain(e, mRecView);

        try {

            if (event.getItemPosition() != RecyclerView.NO_POSITION) {

                final DocumentHolder holder = getTarget(event);

                String modelId = getModelId(holder.itemView);

                if (!mSelectionManager.getSelection().contains(modelId)) {

                    mSelectionManager.clearSelection();
@@ -436,7 +438,8 @@ public class DirectoryFragment extends Fragment 
                        e.getX() - holder.itemView.getLeft(), e.getY() - holder.itemView.getTop());

                unregisterForContextMenu(holder.itemView);

            }

        // If there was no holder item, that means user right-clicked on the blank pane

            // If there was no corresponding item pos, that means user right-clicked on the blank

            // pane

            // We would want to show different options then, and not select any item

            // The blank pane could be the recyclerView or the emptyView, so we need to register

            // according to whichever one is visible
@@ -444,11 +447,15 @@ public class DirectoryFragment extends Fragment 
                registerForContextMenu(mEmptyView);

                mEmptyView.showContextMenu(e.getX(), e.getY());

                unregisterForContextMenu(mEmptyView);

                return true;

            } else {

                registerForContextMenu(mRecView);

                mRecView.showContextMenu(e.getX(), e.getY());

                unregisterForContextMenu(mRecView);

            }

        } finally {

            event.recycle();

        }

        return true;

    }
@@ -1638,7 +1645,7 @@ public class DirectoryFragment extends Fragment 
        @Override

        public boolean onTouch(View v, MotionEvent event) {

            if (event.getButtonState() == MotionEvent.BUTTON_SECONDARY) {

                return mGestureListener.onSingleTapConfirmed(event);

                return mGestureListener.onRightClick(event);

            }

            return false;

        }
@@ -1671,8 +1678,7 @@ public class DirectoryFragment extends Fragment 
            // events. Otherwise, tap events are routed to the target DocumentHolder.

            if (Events.isMouseEvent(e) && mLastButtonState == MotionEvent.BUTTON_SECONDARY) {

                mLastButtonState = -1;

                final MotionInputEvent event = MotionInputEvent.obtain(e, mRecView);

                return DirectoryFragment.this.onRightClick(event);

                return onRightClick(e);

            }



            final MotionInputEvent event = MotionInputEvent.obtain(e, mRecView);
@@ -1714,6 +1720,10 @@ public class DirectoryFragment extends Fragment 
            final MotionInputEvent event = MotionInputEvent.obtain(e, mRecView);

            return DirectoryFragment.this.onDoubleTap(event);

        }



        public boolean onRightClick(MotionEvent e) {

            return DirectoryFragment.this.onRightClick(e);

        }

    }



    public static void showDirectory(