summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMihail Dumitrescu <mdumitrescu@google.com>2014-01-03 12:40:22 +0000
committerMihail Dumitrescu <mdumitrescu@google.com>2014-01-07 18:49:46 +0000
commit693fbc7f1737d89f11f9ab81558c109f0883ab0e (patch)
tree551441e1ff83a24d366d43636b0f0f88858878a1 /src
parent579c8433f968fd8235527865797f8d58c20487da (diff)
downloadandroid_packages_apps_Trebuchet-693fbc7f1737d89f11f9ab81558c109f0883ab0e.tar.gz
android_packages_apps_Trebuchet-693fbc7f1737d89f11f9ab81558c109f0883ab0e.tar.bz2
android_packages_apps_Trebuchet-693fbc7f1737d89f11f9ab81558c109f0883ab0e.zip
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
Diffstat (limited to 'src')
-rw-r--r--src/com/android/launcher3/DragLayer.java11
1 files changed, 4 insertions, 7 deletions
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;
}
}
}