From 693fbc7f1737d89f11f9ab81558c109f0883ab0e Mon Sep 17 00:00:00 2001 From: Mihail Dumitrescu Date: Fri, 3 Jan 2014 12:40:22 +0000 Subject: 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 --- src/com/android/launcher3/DragLayer.java | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'src') diff --git a/src/com/android/launcher3/DragLayer.java b/src/com/android/launcher3/DragLayer.java index 56886a19c..8726f30c1 100644 --- a/src/com/android/launcher3/DragLayer.java +++ b/src/com/android/launcher3/DragLayer.java @@ -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; } } } -- cgit v1.2.3