diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2017-10-27 11:05:26 -0700 |
---|---|---|
committer | Sunny Goyal <sunnygoyal@google.com> | 2017-10-31 15:29:02 -0700 |
commit | 031022029b1cc5731d85327f5bd4e183a72cfb3c (patch) | |
tree | 949b1bf1e59d828618273533be1874f217a991e6 /src/com/android/launcher3/dragndrop/DragLayer.java | |
parent | 9d341964a0527391daa07dc112c5579b55edbb96 (diff) | |
download | packages_apps_Trebuchet-031022029b1cc5731d85327f5bd4e183a72cfb3c.tar.gz packages_apps_Trebuchet-031022029b1cc5731d85327f5bd4e183a72cfb3c.tar.bz2 packages_apps_Trebuchet-031022029b1cc5731d85327f5bd4e183a72cfb3c.zip |
Using state animation to control all-apps transition
> Separating all-apps transtions control and vertical shift touch handling
> Creating separate spring handler for search box (to avoid adding and removing spring)
> Driving all-apps vertical shift using state AnimatorSet
Bug: 67678570
Change-Id: I3b6a4d1f43275a5f485b399444742b6b9a8c4bb9
Diffstat (limited to 'src/com/android/launcher3/dragndrop/DragLayer.java')
-rw-r--r-- | src/com/android/launcher3/dragndrop/DragLayer.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/com/android/launcher3/dragndrop/DragLayer.java b/src/com/android/launcher3/dragndrop/DragLayer.java index 5b1a4dc6c..0f0b20d2b 100644 --- a/src/com/android/launcher3/dragndrop/DragLayer.java +++ b/src/com/android/launcher3/dragndrop/DragLayer.java @@ -46,6 +46,7 @@ import com.android.launcher3.PinchToOverviewListener; import com.android.launcher3.R; import com.android.launcher3.ShortcutAndWidgetContainer; import com.android.launcher3.Utilities; +import com.android.launcher3.VerticalSwipeController; import com.android.launcher3.allapps.AllAppsTransitionController; import com.android.launcher3.anim.Interpolators; import com.android.launcher3.config.FeatureFlags; @@ -96,6 +97,7 @@ public class DragLayer extends InsettableFrameLayout { // Handles all apps pull up interaction private AllAppsTransitionController mAllAppsController; + private VerticalSwipeController mVerticalSwipeController; private TouchController mActiveController; /** @@ -121,6 +123,7 @@ public class DragLayer extends InsettableFrameLayout { mLauncher = launcher; mDragController = dragController; mAllAppsController = allAppsTransitionController; + mVerticalSwipeController = new VerticalSwipeController(mLauncher); boolean isAccessibilityEnabled = ((AccessibilityManager) mLauncher.getSystemService( Context.ACCESSIBILITY_SERVICE)).isEnabled(); @@ -191,8 +194,8 @@ public class DragLayer extends InsettableFrameLayout { return true; } - if (mAllAppsController.onControllerInterceptTouchEvent(ev)) { - mActiveController = mAllAppsController; + if (mVerticalSwipeController.onControllerInterceptTouchEvent(ev)) { + mActiveController = mVerticalSwipeController; return true; } |