diff options
| author | Sunny Goyal <sunnygoyal@google.com> | 2015-03-05 04:30:21 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-03-05 04:30:22 +0000 |
| commit | 0b0d9d40ee055e166235e0e68141a3c06f8d0e94 (patch) | |
| tree | 36416e06863b85e3511fd1db51bb957b50569176 /src/com/android/launcher3/FocusHelper.java | |
| parent | bd6fde13dfa46b723d7a0560d40aa0d977e8cf6a (diff) | |
| parent | c3a609f950a713d995f1968574d8ed7b4449f415 (diff) | |
| download | android_packages_apps_Trebuchet-0b0d9d40ee055e166235e0e68141a3c06f8d0e94.tar.gz android_packages_apps_Trebuchet-0b0d9d40ee055e166235e0e68141a3c06f8d0e94.tar.bz2 android_packages_apps_Trebuchet-0b0d9d40ee055e166235e0e68141a3c06f8d0e94.zip | |
Merge "Refactoring folder content" into ub-launcher3-burnaby
Diffstat (limited to 'src/com/android/launcher3/FocusHelper.java')
| -rw-r--r-- | src/com/android/launcher3/FocusHelper.java | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/com/android/launcher3/FocusHelper.java b/src/com/android/launcher3/FocusHelper.java index c16e45b31..737f6cca7 100644 --- a/src/com/android/launcher3/FocusHelper.java +++ b/src/com/android/launcher3/FocusHelper.java @@ -22,7 +22,6 @@ import android.view.KeyEvent; import android.view.SoundEffectConstants; import android.view.View; import android.view.ViewGroup; -import android.widget.ScrollView; import com.android.launcher3.util.FocusLogic; @@ -398,8 +397,7 @@ public class FocusHelper { // Initialize the variables. ShortcutAndWidgetContainer parent = (ShortcutAndWidgetContainer) v.getParent(); final CellLayout layout = (CellLayout) parent.getParent(); - final ScrollView scrollView = (ScrollView) layout.getParent(); - final Folder folder = (Folder) scrollView.getParent(); + final Folder folder = (Folder) layout.getParent().getParent(); View title = folder.mFolderName; Workspace workspace = (Workspace) v.getRootView().findViewById(R.id.workspace); final int countX = layout.getCountX(); |