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

Commit 693fbc7f authored by Mihail Dumitrescu's avatar Mihail Dumitrescu
Browse files

Remove a non-obvious fall through in a switch statement. 

This CL does not modify the result of calling onInterceptHoverEvent()
assuming isEventOverFolder() has no side effects. The only change is
that isEventOverFolder will now be called once rather than twice when
action == MotionEvent.ACTION_HOVER_ENTER and isOverFolder == true.

Change-Id: Icc28ab880cf5094e49f51d72035891e924cb2031
parent 579c8433

src/com/android/launcher3/DragLayer.java

+4 −7
Original line number Diff line number Diff line
@@ -224,22 +224,19 @@ public class DragLayer extends FrameLayout implements ViewGroup.OnHierarchyChang 
                            sendTapOutsideFolderAccessibilityEvent(currentFolder.isEditingName());

                            mHoverPointClosesFolder = true;

                            return true;

                        } else if (isOverFolder) {

                            mHoverPointClosesFolder = false;

                        } else {

                            return true;

                        }

                        mHoverPointClosesFolder = false;

                        break;

                    case MotionEvent.ACTION_HOVER_MOVE:

                        isOverFolder = isEventOverFolder(currentFolder, ev);

                        if (!isOverFolder && !mHoverPointClosesFolder) {

                            sendTapOutsideFolderAccessibilityEvent(currentFolder.isEditingName());

                            mHoverPointClosesFolder = true;

                            return true;

                        } else if (isOverFolder) {

                            mHoverPointClosesFolder = false;

                        } else {

                        } else if (!isOverFolder) {

                            return true;

                        }

                        mHoverPointClosesFolder = false;

                }

            }

        }