diff options
| author | Hyunyoung Song <hyunyoungs@google.com> | 2020-07-18 08:32:23 -0700 |
|---|---|---|
| committer | Hyunyoung Song <hyunyoungs@google.com> | 2020-07-24 13:57:16 -0700 |
| commit | d25dabb466554fb15cd5bbe712318fb39197f96c (patch) | |
| tree | 2d9ce53f83390d2dea55a78cc7e241572fd5c9b7 /src/com/android/launcher3/touch/AbstractStateChangeTouchController.java | |
| parent | 37c01dc58ad3100f057338763d50414e74810ece (diff) | |
Add InsetTransitionController to device search
Also removed plugin support as if both the feature flag and
the plugin is turned on, there are object/resource contention
Bug: 161594550
Change-Id: I2cb98e83c46c7e47db96b90fa8d7cb9620643221
Diffstat (limited to 'src/com/android/launcher3/touch/AbstractStateChangeTouchController.java')
| -rw-r--r-- | src/com/android/launcher3/touch/AbstractStateChangeTouchController.java | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java b/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java index 3c78b08960..66dbf6a73d 100644 --- a/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java +++ b/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java @@ -37,6 +37,8 @@ import android.util.Log; import android.view.HapticFeedbackConstants; import android.view.MotionEvent; +import androidx.core.os.BuildCompat; + import com.android.launcher3.Launcher; import com.android.launcher3.LauncherAnimUtils; import com.android.launcher3.LauncherState; @@ -44,6 +46,7 @@ import com.android.launcher3.Utilities; import com.android.launcher3.anim.AnimationSuccessListener; import com.android.launcher3.anim.AnimatorPlaybackController; import com.android.launcher3.anim.PendingAnimation; +import com.android.launcher3.config.FeatureFlags; import com.android.launcher3.logger.LauncherAtom; import com.android.launcher3.logging.StatsLogManager; import com.android.launcher3.states.StateAnimationConfig; @@ -265,8 +268,10 @@ public abstract class AbstractStateChangeTouchController mCanBlockFling = mFromState == NORMAL; mFlingBlockCheck.unblockFling(); // Must be called after all the animation controllers have been paused - if (mToState == ALL_APPS || mToState == NORMAL) { - mLauncher.getAllAppsController().onDragStart(mToState == ALL_APPS); + if (FeatureFlags.ENABLE_DEVICE_SEARCH.get() && BuildCompat.isAtLeastR() + && (mToState == ALL_APPS || mToState == NORMAL)) { + mLauncher.getAllAppsController().getInsetController().onDragStart( + mToState == ALL_APPS ? 0 : 1); } } |