diff options
| author | Sunny Goyal <sunnygoyal@google.com> | 2017-10-18 10:55:56 -0700 |
|---|---|---|
| committer | Sunny Goyal <sunnygoyal@google.com> | 2017-10-18 15:04:22 -0700 |
| commit | f9403d92fa872a9f9f487540dc989df7b80db8b8 (patch) | |
| tree | 3a6c36a863802a344e969df853f47190e764fc09 /src/com/android/launcher3/CellLayout.java | |
| parent | 4c7f215651a282ce75dec5e570a6e593be476cc5 (diff) | |
| download | android_packages_apps_Trebuchet-f9403d92fa872a9f9f487540dc989df7b80db8b8.tar.gz android_packages_apps_Trebuchet-f9403d92fa872a9f9f487540dc989df7b80db8b8.tar.bz2 android_packages_apps_Trebuchet-f9403d92fa872a9f9f487540dc989df7b80db8b8.zip | |
Removing state definition from Launcher
State is only maintained is workspace and is used for all the UI
Bug: 67678570
Change-Id: Ie3cce5a1f4ada3913d0480f7918c27460dacbd34
Diffstat (limited to 'src/com/android/launcher3/CellLayout.java')
| -rw-r--r-- | src/com/android/launcher3/CellLayout.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/com/android/launcher3/CellLayout.java b/src/com/android/launcher3/CellLayout.java index 3643971a4..2ab08b2eb 100644 --- a/src/com/android/launcher3/CellLayout.java +++ b/src/com/android/launcher3/CellLayout.java @@ -52,7 +52,6 @@ import com.android.launcher3.accessibility.FolderAccessibilityHelper; import com.android.launcher3.accessibility.WorkspaceAccessibilityHelper; import com.android.launcher3.anim.PropertyListBuilder; import com.android.launcher3.config.FeatureFlags; -import com.android.launcher3.folder.FolderIcon; import com.android.launcher3.folder.PreviewBackground; import com.android.launcher3.graphics.DragPreviewProvider; import com.android.launcher3.util.CellAndSpan; @@ -342,7 +341,7 @@ public class CellLayout extends ViewGroup implements BubbleTextShadowHandler { // the home screen mode, however, once in overview mode stylus button press should be // enabled to allow rearranging the different home screens. So check what mode // the workspace is in, and only perform stylus button presses while in overview mode. - if (mLauncher.mWorkspace.isInOverviewMode() + if (mLauncher.isInState(LauncherState.OVERVIEW) && mStylusEventHelper.onMotionEvent(ev)) { return true; } |