diff --git a/app/src/main/kotlin/com/simplemobiletools/launcher/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/launcher/activities/MainActivity.kt index 28150c0..415d2f4 100644 --- a/app/src/main/kotlin/com/simplemobiletools/launcher/activities/MainActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/launcher/activities/MainActivity.kt @@ -244,7 +244,7 @@ class MainActivity : SimpleActivity(), FlingListener { } } - private fun isAllAppsFragmentExpanded() = all_apps_fragment.y != mScreenHeight.toFloat() + fun isAllAppsFragmentExpanded() = all_apps_fragment.y != mScreenHeight.toFloat() private fun isWidgetsFragmentExpanded() = widgets_fragment.y != mScreenHeight.toFloat() @@ -309,6 +309,10 @@ class MainActivity : SimpleActivity(), FlingListener { } fun showHomeIconMenu(x: Float, y: Float, gridItem: HomeScreenGridItem, isOnAllAppsFragment: Boolean) { + if (isAllAppsFragmentExpanded()) { + return + } + home_screen_grid.hideResizeLines() mLongPressedIcon = gridItem val anchorY = if (isOnAllAppsFragment || gridItem.type == ITEM_TYPE_WIDGET) { diff --git a/app/src/main/kotlin/com/simplemobiletools/launcher/views/HomeScreenGrid.kt b/app/src/main/kotlin/com/simplemobiletools/launcher/views/HomeScreenGrid.kt index 5304dc6..ebb7c80 100644 --- a/app/src/main/kotlin/com/simplemobiletools/launcher/views/HomeScreenGrid.kt +++ b/app/src/main/kotlin/com/simplemobiletools/launcher/views/HomeScreenGrid.kt @@ -399,7 +399,11 @@ class HomeScreenGrid(context: Context, attrs: AttributeSet, defStyle: Int) : Rel widgetView.tag = appWidgetId widgetView.setAppWidget(appWidgetId, appWidgetProviderInfo) widgetView.longPressListener = { x, y -> - (context as? MainActivity)?.showHomeIconMenu(x, widgetView.y, item, false) + val activity = context as? MainActivity + if (activity?.isAllAppsFragmentExpanded() == false) { + activity.showHomeIconMenu(x, widgetView.y, item, false) + performHapticFeedback() + } } widgetView.onIgnoreInterceptedListener = { diff --git a/app/src/main/kotlin/com/simplemobiletools/launcher/views/MyAppWidgetHostView.kt b/app/src/main/kotlin/com/simplemobiletools/launcher/views/MyAppWidgetHostView.kt index c9c3611..cd9ecc6 100644 --- a/app/src/main/kotlin/com/simplemobiletools/launcher/views/MyAppWidgetHostView.kt +++ b/app/src/main/kotlin/com/simplemobiletools/launcher/views/MyAppWidgetHostView.kt @@ -64,7 +64,6 @@ class MyAppWidgetHostView(context: Context) : AppWidgetHostView(context) { longPressHandler.removeCallbacksAndMessages(null) hasLongPressed = true longPressListener?.invoke(actionDownCoords.x, actionDownCoords.y) - performHapticFeedback() } } }