diff --git a/lawnchair/src/app/lawnchair/nexuslauncher/SmartSpaceHostView.kt b/lawnchair/src/app/lawnchair/nexuslauncher/SmartSpaceHostView.kt index a461b2cd83..ac085bd05e 100644 --- a/lawnchair/src/app/lawnchair/nexuslauncher/SmartSpaceHostView.kt +++ b/lawnchair/src/app/lawnchair/nexuslauncher/SmartSpaceHostView.kt @@ -5,11 +5,11 @@ import android.content.Context import android.content.Intent import android.graphics.Rect import android.graphics.RectF -import android.view.HapticFeedbackConstants import android.view.MotionEvent import android.view.View import android.view.View.OnLongClickListener import android.view.ViewGroup +import androidx.core.view.HapticFeedbackConstantsCompat import app.lawnchair.LawnchairLauncher import app.lawnchair.util.unsafeLazy import com.android.launcher3.CheckLongPressHelper @@ -38,7 +38,7 @@ sealed class SmartSpaceHostView(context: Context) : if (!hasSettings(view.context)) { return false } - performHapticFeedback(HapticFeedbackConstants.LONG_PRESS) + performHapticFeedback(HapticFeedbackConstantsCompat.LONG_PRESS) val pos = Rect() mLauncher.dragLayer.getDescendantRectRelativeToSelf(this, pos) val centerPos = RectF() diff --git a/lawnchair/src/app/lawnchair/ui/preferences/components/reorderable/ReorderablePreference.kt b/lawnchair/src/app/lawnchair/ui/preferences/components/reorderable/ReorderablePreference.kt index fb9cb5c6f6..888298c6cd 100644 --- a/lawnchair/src/app/lawnchair/ui/preferences/components/reorderable/ReorderablePreference.kt +++ b/lawnchair/src/app/lawnchair/ui/preferences/components/reorderable/ReorderablePreference.kt @@ -1,6 +1,5 @@ package app.lawnchair.ui.preferences.components.reorderable -import android.view.HapticFeedbackConstants import androidx.compose.animation.AnimatedVisibility import androidx.compose.animation.animateColorAsState import androidx.compose.foundation.layout.Column @@ -22,6 +21,7 @@ import androidx.compose.ui.semantics.CustomAccessibilityAction import androidx.compose.ui.semantics.customActions import androidx.compose.ui.semantics.semantics import androidx.compose.ui.unit.dp +import androidx.core.view.HapticFeedbackConstantsCompat import app.lawnchair.ui.preferences.components.controls.ClickablePreference import app.lawnchair.ui.preferences.components.layout.ExpandAndShrink import app.lawnchair.ui.preferences.components.layout.PreferenceGroup @@ -95,7 +95,7 @@ fun ReorderablePreferenceGroup( onMove = { isAnyDragging = true if (Utilities.ATLEAST_U) { - view.performHapticFeedback(HapticFeedbackConstants.SEGMENT_FREQUENT_TICK) + view.performHapticFeedback(HapticFeedbackConstantsCompat.SEGMENT_FREQUENT_TICK) } }, ) { index, item, isDragging -> diff --git a/src/com/android/launcher3/allapps/AllAppsFastScrollHelper.java b/src/com/android/launcher3/allapps/AllAppsFastScrollHelper.java index 77a0fe331d..8d04729168 100644 --- a/src/com/android/launcher3/allapps/AllAppsFastScrollHelper.java +++ b/src/com/android/launcher3/allapps/AllAppsFastScrollHelper.java @@ -15,7 +15,7 @@ */ package com.android.launcher3.allapps; -import static android.view.HapticFeedbackConstants.CLOCK_TICK; +import static androidx.core.view.HapticFeedbackConstantsCompat.CLOCK_TICK; import androidx.recyclerview.widget.LinearSmoothScroller; import androidx.recyclerview.widget.RecyclerView.ViewHolder; diff --git a/src/com/android/launcher3/views/RecyclerViewFastScroller.java b/src/com/android/launcher3/views/RecyclerViewFastScroller.java index e5f395775a..89c85d0164 100644 --- a/src/com/android/launcher3/views/RecyclerViewFastScroller.java +++ b/src/com/android/launcher3/views/RecyclerViewFastScroller.java @@ -16,7 +16,7 @@ package com.android.launcher3.views; -import static android.view.HapticFeedbackConstants.CLOCK_TICK; +import static androidx.core.view.HapticFeedbackConstantsCompat.CLOCK_TICK; import static androidx.recyclerview.widget.RecyclerView.SCROLL_STATE_IDLE;