am e4c398d3: am 29e619c8: Merge "Remove a non-obvious fall through in a switch statement." into jb-ub-now-kermit

* commit 'e4c398d36907da10ac0239f53c43763f91f15790':
  Remove a non-obvious fall through in a switch statement.
This commit is contained in:
Mihail Dumitrescu authored and Android Git Automerger committed 2014-02-14 20:54:49 +00:00
commit bd8d3e665a
1 file changed
+4 -7
+4 -7
View File
@@ -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;
}
}
}