diff options
| author | Mihail Dumitrescu <mdumitrescu@google.com> | 2014-01-07 19:39:17 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-01-07 19:39:17 +0000 |
| commit | 29e619c8545dcc898846f6d2a58adda14c9da03a (patch) | |
| tree | 1c2947d6a979307dbf6e81db4be19b1c91aeeaa9 | |
| parent | 83b0da1aed13b20562039ea00d68791beb46a090 (diff) | |
| parent | 693fbc7f1737d89f11f9ab81558c109f0883ab0e (diff) | |
| download | android_packages_apps_Trebuchet-29e619c8545dcc898846f6d2a58adda14c9da03a.tar.gz android_packages_apps_Trebuchet-29e619c8545dcc898846f6d2a58adda14c9da03a.tar.bz2 android_packages_apps_Trebuchet-29e619c8545dcc898846f6d2a58adda14c9da03a.zip | |
Merge "Remove a non-obvious fall through in a switch statement." into jb-ub-now-kermit
| -rw-r--r-- | src/com/android/launcher3/DragLayer.java | 11 |
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; } } } |