summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher3/Hotseat.java
diff options
context:
space:
mode:
authorAdam Cohen <adamcohen@google.com>2014-07-09 23:53:15 -0700
committerAdam Cohen <adamcohen@google.com>2014-07-18 17:56:42 -0700
commit6c5891a9fce95eee3d87823d11d21889743e9c68 (patch)
tree3373b4ee43895f19ae90f472a3b42d12b1ab3634 /src/com/android/launcher3/Hotseat.java
parentcc83d8dbfe2d99d95d9cf651c9559093d3c89c1e (diff)
downloadandroid_packages_apps_Trebuchet-6c5891a9fce95eee3d87823d11d21889743e9c68.tar.gz
android_packages_apps_Trebuchet-6c5891a9fce95eee3d87823d11d21889743e9c68.tar.bz2
android_packages_apps_Trebuchet-6c5891a9fce95eee3d87823d11d21889743e9c68.zip
Preliminary work on Material Transitions
-> Early exploration of AllApps Hero transition with circular reveal -> Stripping a bunch of dead code from AppsCustomizeTabHost -> Moved background scrim to DragLayer -> Removed "SMALL" state from workspace: replaced with NORMAL_HIDDEN and OVERVIEW_HIDDEN. This is mainly to reduce the overall usage of the z-space model between allapps/widgets and workspace. There are vestigial remains of this model, mainly due to the overview mode, and a bit for spring-loaded. Change-Id: If2302a24394f0ec66621f01ffa2fc4934aa10c3f
Diffstat (limited to 'src/com/android/launcher3/Hotseat.java')
-rw-r--r--src/com/android/launcher3/Hotseat.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/launcher3/Hotseat.java b/src/com/android/launcher3/Hotseat.java
index 2d171238f..9934f6665 100644
--- a/src/com/android/launcher3/Hotseat.java
+++ b/src/com/android/launcher3/Hotseat.java
@@ -175,7 +175,7 @@ public class Hotseat extends FrameLayout {
public boolean onInterceptTouchEvent(MotionEvent ev) {
// We don't want any clicks to go through to the hotseat unless the workspace is in
// the normal state.
- if (mLauncher.getWorkspace().isSmall()) {
+ if (mLauncher.getWorkspace().workspaceInModalState()) {
return true;
}
return false;